generator-jhipster 7.7.0 → 7.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -3
- package/cli/environment-builder.js +3 -1
- package/cli/import-jdl.js +61 -35
- package/cli/jdl.js +5 -4
- package/cli/jhipster-command.js +1 -1
- package/cli/jhipster.js +0 -0
- package/cli/program.js +5 -3
- package/generators/app/index.js +21 -0
- package/generators/app/prompts.js +60 -12
- package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs +3 -3
- package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs +3 -3
- package/generators/bootstrap/index.js +1 -0
- package/generators/bootstrap-application/generator.mjs +1 -0
- package/generators/ci-cd/index.js +1 -1
- package/generators/ci-cd/templates/.gitlab-ci.yml.ejs +2 -3
- package/generators/ci-cd/templates/github-actions.yml.ejs +4 -4
- package/generators/client/files-angular.js +72 -89
- package/generators/client/files-common.js +1 -2
- package/generators/client/files-react.js +83 -71
- package/generators/client/files-vue.js +8 -54
- package/generators/client/index.js +19 -12
- package/generators/client/needle-api/needle-client-angular.js +1 -4
- package/generators/client/needle-api/needle-client-react.js +11 -8
- package/generators/client/prompts.js +1 -0
- package/generators/client/templates/angular/.eslintrc.json.ejs +10 -1
- package/generators/client/templates/angular/angular.json.ejs +1 -10
- package/generators/client/templates/angular/jest.conf.js.ejs +4 -2
- package/generators/client/templates/angular/package.json +33 -34
- package/generators/client/templates/angular/package.json.ejs +24 -23
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs +15 -15
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.ejs +17 -11
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +16 -16
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +14 -9
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +9 -9
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs +27 -27
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs +28 -13
- package/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.html.ejs +7 -7
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs +19 -19
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +7 -7
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs +6 -6
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs +0 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +3 -3
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +10 -10
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +10 -10
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +9 -9
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +8 -8
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +14 -14
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +16 -16
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +3 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +133 -138
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +22 -24
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +40 -49
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs +0 -1
- package/generators/client/templates/angular/src/main/webapp/app/config/navigation.constants.ts.ejs +23 -0
- package/generators/client/templates/angular/src/main/webapp/app/config/pagination.constants.ts.ejs +2 -3
- package/generators/client/templates/angular/src/main/webapp/app/core/request/request-util.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.model.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.service.ts.ejs +7 -3
- package/generators/client/templates/angular/src/main/webapp/app/home/home.component.html.ejs +14 -14
- package/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +21 -21
- package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs +9 -9
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.ts.ejs +16 -27
- package/generators/client/templates/angular/src/main/webapp/app/shared/filter/filter.component.html.ejs +10 -0
- package/generators/client/templates/angular/src/main/webapp/app/shared/filter/filter.component.ts.ejs +23 -0
- package/generators/client/templates/angular/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs +40 -0
- package/generators/client/templates/angular/src/main/webapp/app/shared/filter/filter.model.ts.ejs +95 -0
- package/generators/client/templates/angular/src/main/webapp/app/shared/pagination/item-count.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs +3 -0
- package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.service.ts.ejs +31 -0
- package/generators/client/templates/angular/src/main/webapp/declarations.d.ts.ejs +3 -8
- package/generators/client/templates/angular/tsconfig.json.ejs +6 -0
- package/generators/client/templates/angular/tsconfig.spec.json.ejs +1 -1
- package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +17 -2
- package/generators/client/templates/angular/webpack/webpack.microfrontend.js.ejs +1 -1
- package/generators/client/templates/common/package.json +8 -7
- package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +2 -0
- package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +2 -3
- package/generators/client/templates/react/.eslintrc.json.ejs +10 -1
- package/generators/client/templates/react/jest.conf.js.ejs +4 -2
- package/generators/client/templates/react/package.json +58 -59
- package/generators/client/templates/react/package.json.ejs +4 -3
- package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/app.tsx.ejs +3 -3
- package/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs +53 -6
- package/generators/client/templates/react/src/main/webapp/app/config/translation-middleware.ts.ejs +58 -0
- package/generators/client/templates/react/src/main/webapp/app/entities/menu.tsx.ejs +45 -0
- package/generators/client/templates/react/src/main/webapp/app/entities/reducers.ts.ejs +25 -0
- package/generators/client/templates/react/src/main/webapp/app/entities/routes.tsx.ejs +49 -0
- package/generators/client/templates/react/src/main/webapp/app/index.tsx.ejs +7 -7
- package/generators/client/templates/react/src/main/webapp/app/main.tsx.ejs +19 -0
- package/generators/client/templates/react/src/main/webapp/app/modules/account/activate/activate.tsx.ejs +8 -4
- package/generators/client/templates/react/src/main/webapp/app/modules/account/index.tsx.ejs +9 -6
- package/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +1 -0
- package/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs +8 -5
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs +6 -7
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs +3 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health.tsx.ejs +4 -4
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/index.tsx.ejs +14 -11
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +8 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/index.tsx.ejs +13 -13
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs +7 -4
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs +5 -3
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs +10 -6
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +20 -27
- package/generators/client/templates/react/src/main/webapp/app/modules/login/login-modal.tsx.ejs +5 -1
- package/generators/client/templates/react/src/main/webapp/app/modules/login/login-redirect.tsx.ejs +6 -3
- package/generators/client/templates/react/src/main/webapp/app/modules/login/login.tsx.ejs +6 -5
- package/generators/client/templates/react/src/main/webapp/app/routes.tsx.ejs +70 -25
- package/generators/client/templates/react/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs +30 -27
- package/generators/client/templates/react/src/main/webapp/app/shared/auth/private-route.tsx.ejs +35 -34
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx.ejs +55 -0
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-routes.tsx.ejs +21 -0
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary.spec.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-loading.tsx.ejs +13 -0
- package/generators/client/templates/react/src/main/webapp/app/shared/error/page-not-found.tsx.ejs +9 -13
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +3 -5
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs +5 -8
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/entities.tsx.ejs +35 -7
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-item.tsx.ejs +12 -11
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs +9 -2
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.spec.ts.ejs +9 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs +21 -5
- package/generators/client/templates/react/src/main/webapp/app/typings.d.ts.ejs +15 -0
- package/generators/client/templates/react/src/main/webapp/microfrontends/entities-menu.tsx.ejs +3 -0
- package/generators/client/templates/react/src/main/webapp/microfrontends/entities-routes.tsx.ejs +3 -0
- package/generators/client/templates/react/tsconfig.json.ejs +5 -7
- package/generators/client/templates/react/tsconfig.test.json.ejs +10 -1
- package/generators/client/templates/react/webpack/webpack.common.js.ejs +12 -15
- package/generators/client/templates/react/webpack/webpack.dev.js.ejs +7 -8
- package/generators/client/templates/react/webpack/webpack.microfrontend.js.jhi.react.ejs +99 -0
- package/generators/client/templates/react/webpack/webpack.prod.js.ejs +31 -21
- package/generators/client/templates/vue/.eslintrc.js.ejs +10 -1
- package/generators/client/templates/vue/package.json +42 -42
- package/generators/client/templates/vue/package.json.ejs +4 -4
- package/generators/client/templates/vue/src/main/webapp/app/account/login-form/login-form.component.ts.ejs +2 -2
- package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.vue.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +2 -2
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +6 -3
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +2 -2
- package/generators/client/templates/vue/src/main/webapp/app/shared/alert/alert.service.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/shared/date/filters.ts.ejs +0 -6
- package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +7 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs +1 -1
- package/generators/client/templates/vue/tsconfig.json.ejs +1 -4
- package/generators/client/templates/vue/tsconfig.spec.json.ejs +2 -2
- package/generators/client/templates/vue/webpack/webpack.common.js.ejs +6 -2
- package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +4 -0
- package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +8 -1
- package/generators/client/transform-angular.cjs +117 -0
- package/generators/client/transform-react.cjs +126 -0
- package/generators/client/transform-vue.cjs +42 -0
- package/generators/common/files.js +2 -9
- package/generators/common/templates/.husky/pre-commit.ejs +0 -0
- package/generators/common/templates/README.md.jhi.ejs +21 -5
- package/generators/common/templates/package.json +3 -3
- package/generators/cypress/files.js +34 -22
- package/generators/cypress/index.js +42 -19
- package/generators/cypress/templates/cypress-audits.config.ts.ejs +28 -0
- package/generators/cypress/templates/cypress.config.ts.ejs +57 -0
- package/generators/cypress/templates/src/test/javascript/cypress/{integration/account/login-page.spec.ts.ejs → e2e/account/login-page.cy.ts.ejs} +0 -0
- package/generators/cypress/templates/src/test/javascript/cypress/{integration/account/password-page.spec.ts.ejs → e2e/account/password-page.cy.ts.ejs} +0 -0
- package/generators/cypress/templates/src/test/javascript/cypress/{integration/account/register-page.spec.ts.ejs → e2e/account/register-page.cy.ts.ejs} +0 -0
- package/generators/cypress/templates/src/test/javascript/cypress/{integration/account/reset-password-page.spec.ts.ejs → e2e/account/reset-password-page.cy.ts.ejs} +0 -0
- package/generators/cypress/templates/src/test/javascript/cypress/{integration/account/settings-page.spec.ts.ejs → e2e/account/settings-page.cy.ts.ejs} +0 -0
- package/generators/cypress/templates/src/test/javascript/cypress/{integration/administration/administration.spec.ts.ejs → e2e/administration/administration.cy.ts.ejs} +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/{integration → e2e}/lighthouse.audits.ts.ejs +0 -0
- package/generators/cypress/templates/src/test/javascript/cypress/plugins/global.d.ts.ejs +25 -0
- package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +13 -14
- package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +8 -8
- package/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs +8 -5
- package/generators/database-changelog-liquibase/files.js +1 -1
- package/generators/database-changelog-liquibase/index.js +3 -0
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs +1 -1
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs +1 -1
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs +1 -1
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +2 -2
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_migrate.xml.ejs +1 -1
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs +2 -2
- package/generators/docker-base.js +6 -3
- package/generators/docker-compose/files.js +5 -2
- package/generators/docker-compose/index.js +18 -25
- package/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs +1 -1
- package/generators/docker-compose/templates/docker-compose.yml.ejs +10 -8
- package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +62 -4
- package/generators/docker-prompts.js +1 -2
- package/generators/docker-utils.js +0 -1
- package/generators/entity/index.js +39 -34
- package/generators/entity/prompts.js +1 -52
- package/generators/entity-client/files-angular.cjs +169 -0
- package/generators/entity-client/files-cypress.cjs +52 -0
- package/generators/entity-client/files-react.cjs +113 -0
- package/generators/entity-client/files-vue.cjs +140 -0
- package/generators/entity-client/files.js +10 -381
- package/generators/entity-client/index.js +126 -17
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs +4 -5
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.ejs +2 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +12 -11
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +0 -5
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.ejs +18 -25
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.test-samples.ts.ejs +45 -0
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +45 -37
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +47 -28
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +292 -94
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs +5 -106
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs +2 -82
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +5 -5
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.ts.ejs +5 -5
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +2 -3
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs +89 -175
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.ts.ejs +69 -44
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-form.service.spec.ts.ejs +111 -0
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-form.service.ts.ejs +263 -0
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +99 -120
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +47 -71
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +79 -195
- package/generators/entity-client/templates/{common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs → cypress/src/test/javascript/cypress/e2e/entity/entity.cy.ts.ejs} +27 -17
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +12 -7
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs +10 -7
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +29 -23
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs +2 -2
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +32 -30
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/index.tsx.ejs +13 -13
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs +25 -32
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +2 -2
- package/generators/entity-i18n/templates/i18n/entity_fr.json.ejs +1 -1
- package/generators/entity-server/cleanup.js +41 -0
- package/generators/entity-server/files.js +148 -63
- package/generators/entity-server/index.js +30 -25
- package/generators/entity-server/templates/couchbase/src/main/java/package/domain/Entity.java.jhi.spring_data_couchbase.ejs +1 -1
- package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +31 -8
- package/generators/entity-server/templates/partials/save_template.ejs +1 -1
- package/generators/entity-server/templates/partials/update_template.ejs +77 -0
- package/generators/entity-server/templates/reactive/partials/save_template.ejs +1 -1
- package/generators/entity-server/templates/reactive/partials/update_template.ejs +41 -0
- package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +13 -7
- package/generators/entity-server/templates/src/main/java/package/common/get_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +13 -4
- package/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +2 -1
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.elastic_search.ejs +17 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_lifecycle_events.ejs +31 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_cassandra.ejs +3 -1
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_persistable.ejs +54 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_reactive.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/domain/EntityCallback.java.ejs +43 -0
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +12 -7
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +23 -27
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationships.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationshipsImpl.java.ejs +17 -9
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +18 -26
- package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +50 -26
- package/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +10 -2
- package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +22 -6
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +61 -90
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +8 -9
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +165 -144
- package/generators/gae/index.js +1 -1
- package/generators/generate-blueprint/constants.mjs +22 -2
- package/generators/generate-blueprint/esm.mjs +0 -0
- package/generators/generate-blueprint/generator.mjs +25 -6
- package/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs +5 -3
- package/generators/generate-blueprint/templates/cli/cli.mjs.ejs +0 -0
- package/generators/generate-blueprint/templates/cli/commands.cjs.ejs +2 -1
- package/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs +6 -5
- package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +10 -1
- package/generators/generate-blueprint/templates/generators/generator/templates/template-file.ejs +0 -0
- package/generators/generator-base-blueprint.js +19 -20
- package/generators/generator-base-private.js +117 -65
- package/generators/generator-base.js +270 -91
- package/generators/generator-constants.js +119 -67
- package/generators/generator-defaults.js +1 -0
- package/generators/generator-transforms.js +0 -1
- package/generators/gradle/constants.cjs +1 -1
- package/generators/heroku/index.js +5 -4
- package/generators/heroku/templates/application-heroku.yml.ejs +1 -2
- package/generators/heroku/templates/heroku.gradle.ejs +28 -1
- package/generators/heroku/templates/pom-profile.xml.ejs +29 -0
- package/generators/init/templates/.husky/pre-commit +0 -0
- package/generators/java/index.cjs +2 -2
- package/generators/kubernetes/templates/db/couchbase.yml.ejs +1 -2
- package/generators/kubernetes/templates/db/mongodb.yml.ejs +1 -2
- package/generators/kubernetes/templates/ingress.yml.ejs +11 -4
- package/generators/kubernetes/templates/kubectl-apply.sh.ejs +0 -0
- package/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs +6 -2
- package/generators/kubernetes/templates/registry/consul.yml.ejs +1 -2
- package/generators/kubernetes/templates/registry/jhipster-registry.yml.ejs +1 -2
- package/generators/kubernetes-knative/templates/kubectl-apply.sh.ejs +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/al/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/bg/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/bn/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/by/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ca/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/cs/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/da/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/de/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/el/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/en/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/en/health.json.ejs +3 -0
- package/generators/languages/templates/src/main/webapp/i18n/es/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/hr/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/it/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ja/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/pa/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/si/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs +7 -1
- package/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs +7 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_al.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ar_LY.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_bg.properties.ejs +1 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_bn.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_by.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ca.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_cs.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_da.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_de.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_el.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_es.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_et.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_fa.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_fi.properties.ejs +1 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_gl.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_hi.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_hr.properties.ejs +1 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_hu.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_hy.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_in.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_it.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ja.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ko.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_mr.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_my.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_nl.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_pa.properties.ejs +1 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_pl.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_pt_BR.properties.ejs +1 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_pt_PT.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ro.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ru.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_si.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_sk.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_sr.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_sv.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ta.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_te.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_th.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_tr.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_ua.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_uz_Cyrl_UZ.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_uz_Latn_UZ.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_vi.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_zh_CN.properties.ejs +4 -1
- package/generators/languages/templates/src/test/resources/i18n/messages_zh_TW.properties.ejs +4 -1
- package/generators/maven/files.cjs +0 -1
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +18 -2
- package/generators/maven/templates/mvnw +13 -7
- package/generators/maven/templates/mvnw.cmd +19 -13
- package/generators/maven/templates/pom.xml.jhi.ejs +2 -2
- package/generators/openapi-client/files.js +2 -8
- package/generators/openapi-client/index.js +2 -0
- package/generators/openshift/templates/registry/consul.yml.ejs +1 -2
- package/generators/openshift/templates/registry/jhipster-registry.yml.ejs +1 -2
- package/generators/project-name/index.cjs +8 -5
- package/generators/server/cleanup-angular.js +37 -0
- package/generators/server/cleanup-cache-provider.js +46 -0
- package/generators/server/cleanup-cassandra.js +49 -0
- package/generators/server/cleanup-cucumber.js +40 -0
- package/generators/server/cleanup-elasticsearch.js +48 -0
- package/generators/server/cleanup-gradle.js +40 -0
- package/generators/server/cleanup-kafka.js +41 -0
- package/generators/server/cleanup-maven.js +37 -0
- package/generators/server/cleanup-mongodb.js +40 -0
- package/generators/server/cleanup-oauth2.js +43 -0
- package/generators/server/cleanup-reactive.js +38 -0
- package/generators/server/cleanup-sql.js +48 -0
- package/generators/server/cleanup.js +89 -39
- package/generators/server/esm.mjs +1 -0
- package/generators/server/files-couchbase.js +11 -10
- package/generators/server/files-sql.js +197 -4
- package/generators/server/files.js +239 -248
- package/generators/server/index.js +38 -86
- package/generators/server/needle-api/needle-server-gradle.js +38 -0
- package/generators/server/needles.cjs +79 -0
- package/generators/server/templates/.mvn/jvm.config +1 -0
- package/generators/server/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
- package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties +18 -2
- package/generators/server/templates/.npmrc.ejs +1 -0
- package/generators/server/templates/build.gradle.ejs +126 -229
- package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs +24 -1
- package/generators/server/templates/couchbase/src/test/java/package/config/CouchbaseTestContainer.java.ejs +67 -0
- package/generators/server/templates/couchbase/src/test/java/package/config/EmbeddedCouchbase.java.ejs +30 -0
- package/generators/server/templates/devcontainer/Dockerfile.ejs +25 -0
- package/generators/server/templates/devcontainer/devcontainer.json.ejs +64 -0
- package/generators/server/templates/gradle/docker.gradle.ejs +6 -0
- package/generators/server/templates/gradle/profile_dev.gradle.ejs +95 -3
- package/generators/server/templates/gradle/profile_prod.gradle.ejs +80 -4
- package/generators/server/templates/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/generators/server/templates/gradle.properties.ejs +17 -13
- package/generators/server/templates/gradlew +0 -0
- package/generators/server/templates/mvnw +13 -7
- package/generators/server/templates/mvnw.cmd +19 -13
- package/generators/server/templates/npmw +0 -0
- package/generators/server/templates/pom.xml.ejs +287 -236
- package/generators/server/templates/settings.gradle.ejs +8 -5
- package/generators/server/templates/sql/common/src/main/docker/config/mariadb/my.cnf +49 -0
- package/generators/server/templates/sql/common/src/main/docker/config/mysql/my.cnf +82 -0
- package/generators/server/templates/{src → sql/common/src}/main/docker/mariadb.yml.ejs +2 -0
- package/generators/server/templates/{src → sql/common/src}/main/docker/mssql.yml.ejs +0 -0
- package/generators/server/templates/{src → sql/common/src}/main/docker/mysql.yml.ejs +2 -1
- package/generators/server/templates/{src → sql/common/src}/main/docker/postgresql.yml.ejs +0 -0
- package/generators/server/templates/{src → sql/common/src}/main/java/package/config/LiquibaseConfiguration.java.ejs +0 -0
- package/generators/server/templates/{src → sql/common/src}/main/resources/h2.server.properties.ejs +0 -0
- package/generators/server/templates/sql/common/src/test/java/package/config/EmbeddedSQL.java.ejs +30 -0
- package/generators/server/templates/sql/common/src/test/java/package/config/MariadbTestContainer.java.ejs +60 -0
- package/generators/server/templates/sql/common/src/test/java/package/config/MsSqlTestContainer.java.ejs +59 -0
- package/generators/server/templates/sql/common/src/test/java/package/config/MysqlTestContainer.java.ejs +69 -0
- package/generators/server/templates/sql/common/src/test/java/package/config/PostgreSqlTestContainer.java.ejs +59 -0
- package/generators/server/templates/sql/common/src/test/java/package/config/SqlTestContainer.java.ejs +28 -0
- package/generators/server/templates/{src → sql/common/src}/test/java/package/config/timezone/HibernateTimeZoneIT.java.ejs +0 -0
- package/generators/server/templates/{src → sql/common/src}/test/java/package/repository/timezone/DateTimeWrapper.java.ejs +0 -0
- package/generators/server/templates/{src → sql/common/src}/test/java/package/repository/timezone/DateTimeWrapperRepository.java.ejs +0 -0
- package/generators/server/templates/sql/common/src/test/resources/config/application-testdev.yml.ejs +93 -0
- package/generators/server/templates/{src/test/resources/config/application-testcontainers.yml.ejs → sql/common/src/test/resources/config/application-testprod.yml.ejs} +17 -33
- package/generators/server/templates/sql/common/src/test/resources/testcontainers/mariadb/my.cnf +49 -0
- package/generators/server/templates/sql/common/src/test/resources/testcontainers/mysql/my.cnf +83 -0
- package/generators/server/templates/{src → sql/reactive/src}/main/java/package/repository/EntityManager.java.ejs +48 -38
- package/generators/server/templates/{src → sql/reactive/src}/main/java/package/repository/rowmapper/ColumnConverter.java.ejs +0 -0
- package/generators/server/templates/{src → sql/reactive/src}/main/java/package/repository/rowmapper/UserRowMapper.java.ejs +0 -0
- package/generators/server/templates/src/main/docker/app.yml.ejs +18 -20
- package/generators/server/templates/src/main/docker/cassandra-migration.yml.ejs +1 -0
- package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +64 -7
- package/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs +1 -1
- package/generators/server/templates/src/main/docker/jhipster-registry.yml.ejs +1 -1
- package/generators/server/templates/src/main/docker/jib/entrypoint.sh.ejs +36 -1
- package/generators/server/templates/src/main/docker/keycloak.yml.ejs +8 -6
- package/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs +3 -0
- package/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs +2 -0
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +1 -1
- package/generators/{client/templates/react/src/main/webapp/app/entities/index.tsx.ejs → server/templates/src/main/java/package/config/KafkaSseConsumer.java.ejs} +8 -14
- package/generators/server/templates/src/main/java/package/config/KafkaSseProducer.java.ejs +30 -0
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +21 -33
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +108 -15
- package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +6 -0
- package/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs +6 -3
- package/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +10 -3
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +12 -2
- package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs +60 -108
- package/generators/server/templates/src/main/java/package/web/rest/KafkaResource_reactive.java.ejs +74 -0
- package/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs +1 -5
- package/generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs +1 -5
- package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs +3 -4
- package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +4 -3
- package/generators/server/templates/src/main/resources/config/application.yml.ejs +27 -23
- package/generators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/liquibase/master.xml.ejs +54 -24
- package/generators/server/templates/src/main/resources/swagger/api.yml.ejs +3 -3
- package/generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs +3 -4
- package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +40 -21
- package/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs +0 -3
- package/generators/server/templates/src/test/java/package/{repository/search/UserSearchRepositoryMockConfiguration.java.ejs → config/AsyncSyncConfiguration.java.ejs} +12 -10
- package/generators/server/templates/src/test/java/package/config/CassandraTestContainer.java.ejs +141 -0
- package/generators/{entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs → server/templates/src/test/java/package/config/ElasticsearchReactiveTestConfiguration.java.ejs} +14 -11
- package/generators/server/templates/src/test/java/package/config/ElasticsearchTestContainer.java.ejs +68 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedCassandra.java.ejs +30 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedElasticsearch.java.ejs +30 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedKafka.java.ejs +30 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedMongo.java.ejs +30 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedNeo4j.java.ejs +29 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedRedis.java.ejs +30 -0
- package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +11 -2
- package/generators/server/templates/src/test/java/package/config/KafkaTestContainer.java.ejs +56 -0
- package/generators/server/templates/src/test/java/package/config/MongoDbTestContainer.java.ejs +67 -0
- package/generators/server/templates/src/test/java/package/config/Neo4jTestContainer.java.ejs +66 -0
- package/generators/server/templates/src/test/java/package/config/RedisTestContainer.java.ejs +57 -0
- package/generators/server/templates/src/test/java/package/config/{NoOpMailConfiguration.java.ejs → SpringBootTestClassOrderer.java.ejs} +16 -16
- package/generators/server/templates/src/test/java/package/config/TestContainersSpringContextCustomizerFactory.java.ejs +250 -0
- package/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs +0 -23
- package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +3 -10
- package/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs +6 -7
- package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +5 -5
- package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +9 -19
- package/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs +9 -15
- package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +20 -74
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs +1 -12
- package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs +52 -123
- package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT_reactive.java.ejs +99 -0
- package/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs +7 -10
- package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +13 -10
- package/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +78 -56
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +1 -4
- package/generators/server/templates/src/test/resources/META-INF/spring.factories.ejs +1 -1
- package/generators/server/templates/src/test/resources/config/application.yml.ejs +33 -81
- package/generators/server/templates/src/test/resources/junit-platform.properties.ejs +1 -0
- package/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs +19 -0
- package/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs +19 -0
- package/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs +21 -0
- package/generators/server/templates/src/test/resources/testcontainers.properties.ejs +1 -0
- package/generators/spring-controller/index.js +16 -1
- package/generators/sql-constants.js +85 -0
- package/generators/statistics.js +6 -5
- package/generators/upgrade/index.js +1 -1
- package/generators/utils.js +32 -30
- package/generators/workspaces/index.js +32 -28
- package/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +2 -3
- package/jdl/converters/json-to-jdl-converter.js +23 -6
- package/jdl/exporters/applications/jhipster-application-formatter.js +7 -0
- package/jdl/jhipster/application-options.js +8 -0
- package/jdl/jhipster/default-application-options.js +2 -2
- package/jdl/parsing/lexer/application-tokens.js +6 -0
- package/jdl/parsing/validator.js +7 -0
- package/jdl/validators/application-validator.js +3 -1
- package/jdl/validators/jdl-with-application-validator.js +1 -0
- package/jdl/validators/jdl-without-application-validator.js +3 -2
- package/lib/support/base.cjs +43 -0
- package/lib/support/needles.cjs +221 -0
- package/lib/support/shared-data.cjs +2 -2
- package/package.json +34 -32
- package/utils/blueprint.js +1 -1
- package/utils/entity.js +11 -1
- package/utils/field.js +26 -6
- package/utils/liquibase.js +5 -8
- package/utils/relationship.js +13 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-route.spec.tsx.ejs +0 -33
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-route.tsx.ejs +0 -17
- package/generators/cypress/templates/cypress-audits.json.ejs +0 -32
- package/generators/cypress/templates/cypress.json.ejs +0 -46
- package/generators/docker-compose/templates/realm-config/jhipster-users-0.json.ejs +0 -61
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs +0 -81
- package/generators/entity-server/templates/src/main/java/package/repository/search/SortToSortBuilderListConverter.java.ejs +0 -25
- package/generators/maven/templates/.mvn/wrapper/MavenWrapperDownloader.java +0 -117
- package/generators/server/templates/.mvn/wrapper/MavenWrapperDownloader.java +0 -117
- package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs +0 -56
- package/generators/server/templates/src/main/docker/config/realm-config/jhipster-users-0.json.ejs +0 -61
- package/generators/server/templates/src/main/java/package/config/KafkaProperties.java.ejs +0 -68
- package/generators/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs +0 -125
- package/generators/server/templates/src/test/java/package/AbstractNeo4jIT.java.ejs +0 -44
- package/generators/server/templates/src/test/java/package/MongoDbTestContainerExtension.java.ejs +0 -37
- package/generators/server/templates/src/test/java/package/ReactiveSqlTestContainerExtension.java.ejs +0 -79
- package/generators/server/templates/src/test/java/package/RedisTestContainerExtension.java.ejs +0 -44
- package/generators/server/templates/src/test/java/package/TestContainersSpringContextCustomizerFactory.java.ejs +0 -24
- package/generators/server/templates/src/test/resources/testcontainers/mariadb/my.cnf +0 -2
|
@@ -17,10 +17,12 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.web.rest;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
<%_
|
|
21
|
+
let saveMethod = 'save';
|
|
22
|
+
if (!reactive && databaseTypeSql) {
|
|
23
|
+
saveMethod = 'saveAndFlush';
|
|
24
|
+
}
|
|
25
|
+
_%>
|
|
24
26
|
import <%= packageName %>.IntegrationTest;
|
|
25
27
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
26
28
|
import <%= packageName %>.config.Constants;
|
|
@@ -38,7 +40,6 @@ import <%= packageName %>.repository.search.UserSearchRepository;
|
|
|
38
40
|
<%_ } _%>
|
|
39
41
|
import <%= packageName %>.security.AuthoritiesConstants;
|
|
40
42
|
import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
|
|
41
|
-
import <%= packageName %>.service.dto.<%= asDto('User') %>;
|
|
42
43
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
43
44
|
import <%= packageName %>.repository.EntityManager;
|
|
44
45
|
<%_ } _%>
|
|
@@ -99,9 +100,6 @@ import static org.mockito.Mockito.*;
|
|
|
99
100
|
<%_ if (reactive && testsNeedCsrf) { _%>
|
|
100
101
|
import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
|
|
101
102
|
<%_ } else if (!reactive) { _%>
|
|
102
|
-
<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
|
|
103
|
-
import static org.hamcrest.Matchers.hasItems;
|
|
104
|
-
<%_ } _%>
|
|
105
103
|
import static org.hamcrest.Matchers.hasItem;
|
|
106
104
|
<%_ if (testsNeedCsrf) { _%>
|
|
107
105
|
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
|
|
@@ -120,7 +118,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|
|
120
118
|
<%_ } _%>
|
|
121
119
|
@WithMockUser(authorities = AuthoritiesConstants.ADMIN)
|
|
122
120
|
@IntegrationTest
|
|
123
|
-
class UserResourceIT
|
|
121
|
+
class UserResourceIT {
|
|
124
122
|
|
|
125
123
|
private static final String DEFAULT_LOGIN = "johndoe";
|
|
126
124
|
<%_ if (!authenticationTypeOauth2) { _%>
|
|
@@ -174,13 +172,8 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
174
172
|
<%_ } _%>
|
|
175
173
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
176
174
|
|
|
177
|
-
/**
|
|
178
|
-
* This repository is mocked in the <%= packageName %>.repository.search test package.
|
|
179
|
-
*
|
|
180
|
-
* @see <%= packageName %>.repository.search.UserSearchRepositoryMockConfiguration
|
|
181
|
-
*/
|
|
182
175
|
@Autowired
|
|
183
|
-
private UserSearchRepository
|
|
176
|
+
private UserSearchRepository userSearchRepository;
|
|
184
177
|
<%_ } _%>
|
|
185
178
|
|
|
186
179
|
@Autowired
|
|
@@ -233,7 +226,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
233
226
|
<%_ } _%>
|
|
234
227
|
user.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
|
|
235
228
|
<%_ if (!authenticationTypeOauth2) { _%>
|
|
236
|
-
user.setPassword(RandomStringUtils.
|
|
229
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
237
230
|
<%_ } _%>
|
|
238
231
|
user.setActivated(true);
|
|
239
232
|
user.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
|
|
@@ -270,9 +263,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
270
263
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
271
264
|
userRepository.deleteAllUserAuthorities().block();
|
|
272
265
|
<%_ } _%>
|
|
273
|
-
<%_ if (!databaseTypeSql || reactive) { _%>
|
|
274
266
|
userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
|
|
275
|
-
<%_ } _%>
|
|
276
267
|
<%= asEntity('User') %> user = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
|
|
277
268
|
<%_ if (databaseTypeSql) { _%>
|
|
278
269
|
user.setLogin(DEFAULT_LOGIN);
|
|
@@ -294,11 +285,6 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
294
285
|
void createUser() throws Exception {
|
|
295
286
|
int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
|
|
296
287
|
.collectList().block()<% } %>.size();
|
|
297
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
298
|
-
// Configure the mock search repository
|
|
299
|
-
when(mockUserSearchRepository.save(any()))
|
|
300
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
301
|
-
<%_ } _%>
|
|
302
288
|
|
|
303
289
|
// Create the User
|
|
304
290
|
ManagedUserVM managedUserVM = new ManagedUserVM();
|
|
@@ -341,6 +327,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
341
327
|
<%_ } _%>
|
|
342
328
|
assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
|
|
343
329
|
});
|
|
330
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
331
|
+
userRepository.deleteAll();
|
|
332
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
333
|
+
userSearchRepository.deleteAll();
|
|
334
|
+
<%_ } _%>
|
|
344
335
|
}
|
|
345
336
|
|
|
346
337
|
@Test
|
|
@@ -388,6 +379,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
388
379
|
|
|
389
380
|
// Validate the User in the database
|
|
390
381
|
assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
|
|
382
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
383
|
+
userRepository.deleteAll();
|
|
384
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
385
|
+
userSearchRepository.deleteAll();
|
|
386
|
+
<%_ } _%>
|
|
391
387
|
}
|
|
392
388
|
|
|
393
389
|
@Test
|
|
@@ -396,9 +392,9 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
396
392
|
<%_ } _%>
|
|
397
393
|
void createUserWithExistingLogin() throws Exception {
|
|
398
394
|
// Initialize the database
|
|
399
|
-
userRepository
|
|
395
|
+
userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
400
396
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
401
|
-
|
|
397
|
+
userSearchRepository.save(user)<% if (reactive) { %>.block()<% } %>;
|
|
402
398
|
<%_ } _%>
|
|
403
399
|
int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
|
|
404
400
|
.collectList().block()<% } %>.size();
|
|
@@ -433,6 +429,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
433
429
|
|
|
434
430
|
// Validate the User in the database
|
|
435
431
|
assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
|
|
432
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
433
|
+
userRepository.deleteAll();
|
|
434
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
435
|
+
userSearchRepository.deleteAll();
|
|
436
|
+
<%_ } _%>
|
|
436
437
|
}
|
|
437
438
|
|
|
438
439
|
@Test
|
|
@@ -441,9 +442,9 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
441
442
|
<%_ } _%>
|
|
442
443
|
void createUserWithExistingEmail() throws Exception {
|
|
443
444
|
// Initialize the database
|
|
444
|
-
userRepository
|
|
445
|
+
userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
445
446
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
446
|
-
|
|
447
|
+
userSearchRepository.save(user)<% if (reactive) { %>.block()<% } %>;
|
|
447
448
|
<%_ } _%>
|
|
448
449
|
int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
|
|
449
450
|
.collectList().block()<% } %>.size();
|
|
@@ -478,6 +479,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
478
479
|
|
|
479
480
|
// Validate the User in the database
|
|
480
481
|
assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
|
|
482
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
483
|
+
userRepository.deleteAll();
|
|
484
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
485
|
+
userSearchRepository.deleteAll();
|
|
486
|
+
<%_ } _%>
|
|
481
487
|
}
|
|
482
488
|
|
|
483
489
|
@Test
|
|
@@ -486,7 +492,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
486
492
|
<%_ } _%>
|
|
487
493
|
void getAllUsers()<% if (!reactive) { %> throws Exception<% } %> {
|
|
488
494
|
// Initialize the database
|
|
489
|
-
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else {
|
|
495
|
+
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %><%= saveMethod %><% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
490
496
|
<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
|
|
491
497
|
authorityRepository
|
|
492
498
|
.findById(AuthoritiesConstants.USER)
|
|
@@ -496,7 +502,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
496
502
|
|
|
497
503
|
// Get all the users
|
|
498
504
|
<%_ if (reactive) { _%>
|
|
499
|
-
<%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,
|
|
505
|
+
<%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,desc")
|
|
500
506
|
.accept(MediaType.APPLICATION_JSON)
|
|
501
507
|
.exchange()
|
|
502
508
|
.expectStatus().isOk()
|
|
@@ -527,6 +533,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
527
533
|
.andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
|
|
528
534
|
<%_ } _%>
|
|
529
535
|
.andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
|
|
536
|
+
<%_ } _%>
|
|
537
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
538
|
+
userRepository.deleteAll();
|
|
539
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
540
|
+
userSearchRepository.deleteAll();
|
|
530
541
|
<%_ } _%>
|
|
531
542
|
}
|
|
532
543
|
|
|
@@ -536,7 +547,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
536
547
|
<%_ } _%>
|
|
537
548
|
void getUser()<% if (!reactive) { %> throws Exception<% } %> {
|
|
538
549
|
// Initialize the database
|
|
539
|
-
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else {
|
|
550
|
+
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %><%= saveMethod %><% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
540
551
|
<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
|
|
541
552
|
authorityRepository
|
|
542
553
|
.findById(AuthoritiesConstants.USER)
|
|
@@ -545,7 +556,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
545
556
|
<%_ } _%>
|
|
546
557
|
|
|
547
558
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
548
|
-
|
|
559
|
+
userSearchRepository.save(user);
|
|
549
560
|
<%_ } _%>
|
|
550
561
|
<%_ if (cacheManagerIsAvailable) { _%>
|
|
551
562
|
|
|
@@ -592,6 +603,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
592
603
|
}
|
|
593
604
|
<%_ } else if (cacheManagerIsAvailable) { _%>
|
|
594
605
|
assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
|
|
606
|
+
<%_ } _%>
|
|
607
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
608
|
+
userRepository.deleteAll();
|
|
609
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
610
|
+
userSearchRepository.deleteAll();
|
|
595
611
|
<%_ } _%>
|
|
596
612
|
}
|
|
597
613
|
|
|
@@ -616,12 +632,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
616
632
|
<%_ } _%>
|
|
617
633
|
void updateUser() throws Exception {
|
|
618
634
|
// Initialize the database
|
|
619
|
-
userRepository
|
|
620
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
621
|
-
// Configure the mock search repository
|
|
622
|
-
when(mockUserSearchRepository.save(any()))
|
|
623
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
624
|
-
<%_ } _%>
|
|
635
|
+
userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
625
636
|
int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
|
|
626
637
|
.collectList().block()<% } %>.size();
|
|
627
638
|
|
|
@@ -674,6 +685,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
674
685
|
<%_ } _%>
|
|
675
686
|
assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
|
|
676
687
|
});
|
|
688
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
689
|
+
userRepository.deleteAll();
|
|
690
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
691
|
+
userSearchRepository.deleteAll();
|
|
692
|
+
<%_ } _%>
|
|
677
693
|
}
|
|
678
694
|
|
|
679
695
|
@Test
|
|
@@ -682,12 +698,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
682
698
|
<%_ } _%>
|
|
683
699
|
void updateUserLogin() throws Exception {
|
|
684
700
|
// Initialize the database
|
|
685
|
-
userRepository
|
|
686
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
687
|
-
// Configure the mock search repository
|
|
688
|
-
when(mockUserSearchRepository.save(any()))
|
|
689
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
690
|
-
<%_ } _%>
|
|
701
|
+
userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
691
702
|
int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
|
|
692
703
|
.collectList().block()<% } %>.size();
|
|
693
704
|
|
|
@@ -741,6 +752,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
741
752
|
<%_ } _%>
|
|
742
753
|
assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
|
|
743
754
|
});
|
|
755
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
756
|
+
userRepository.deleteAll();
|
|
757
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
758
|
+
userSearchRepository.deleteAll();
|
|
759
|
+
<%_ } _%>
|
|
744
760
|
}
|
|
745
761
|
|
|
746
762
|
@Test
|
|
@@ -749,9 +765,9 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
749
765
|
<%_ } _%>
|
|
750
766
|
void updateUserExistingEmail() throws Exception {
|
|
751
767
|
// Initialize the database with 2 users
|
|
752
|
-
userRepository
|
|
768
|
+
userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
753
769
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
754
|
-
|
|
770
|
+
userSearchRepository.save(user);
|
|
755
771
|
<%_ } _%>
|
|
756
772
|
|
|
757
773
|
<%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
|
|
@@ -759,7 +775,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
759
775
|
anotherUser.setId(UUID.randomUUID().toString());
|
|
760
776
|
<%_ } _%>
|
|
761
777
|
anotherUser.setLogin("jhipster");
|
|
762
|
-
anotherUser.setPassword(RandomStringUtils.
|
|
778
|
+
anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
763
779
|
anotherUser.setActivated(true);
|
|
764
780
|
anotherUser.setEmail("jhipster@localhost");
|
|
765
781
|
anotherUser.setFirstName("java");
|
|
@@ -773,7 +789,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
773
789
|
<%_ } _%>
|
|
774
790
|
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
|
|
775
791
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
776
|
-
|
|
792
|
+
userSearchRepository.save(anotherUser);
|
|
777
793
|
<%_ } _%>
|
|
778
794
|
|
|
779
795
|
// Update the user
|
|
@@ -811,6 +827,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
811
827
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
812
828
|
.with(csrf())<% } %>)
|
|
813
829
|
.andExpect(status().isBadRequest());
|
|
830
|
+
<%_ } _%>
|
|
831
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
832
|
+
userRepository.deleteAll();
|
|
833
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
834
|
+
userSearchRepository.deleteAll();
|
|
814
835
|
<%_ } _%>
|
|
815
836
|
}
|
|
816
837
|
|
|
@@ -820,9 +841,9 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
820
841
|
<%_ } _%>
|
|
821
842
|
void updateUserExistingLogin() throws Exception {
|
|
822
843
|
// Initialize the database
|
|
823
|
-
userRepository
|
|
844
|
+
userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
824
845
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
825
|
-
|
|
846
|
+
userSearchRepository.save(user);
|
|
826
847
|
<%_ } _%>
|
|
827
848
|
|
|
828
849
|
<%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
|
|
@@ -830,7 +851,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
830
851
|
anotherUser.setId(UUID.randomUUID().toString());
|
|
831
852
|
<%_ } _%>
|
|
832
853
|
anotherUser.setLogin("jhipster");
|
|
833
|
-
anotherUser.setPassword(RandomStringUtils.
|
|
854
|
+
anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
834
855
|
anotherUser.setActivated(true);
|
|
835
856
|
anotherUser.setEmail("jhipster@localhost");
|
|
836
857
|
anotherUser.setFirstName("java");
|
|
@@ -844,7 +865,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
844
865
|
<%_ } _%>
|
|
845
866
|
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
|
|
846
867
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
847
|
-
|
|
868
|
+
userSearchRepository.save(anotherUser);
|
|
848
869
|
<%_ } _%>
|
|
849
870
|
|
|
850
871
|
// Update the user
|
|
@@ -882,6 +903,11 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
882
903
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
883
904
|
.with(csrf())<% } %>)
|
|
884
905
|
.andExpect(status().isBadRequest());
|
|
906
|
+
<%_ } _%>
|
|
907
|
+
<%_ if (!databaseTypeSql) {_%>
|
|
908
|
+
userRepository.deleteAll();
|
|
909
|
+
<% } else if (searchEngineElasticsearch) { %>
|
|
910
|
+
userSearchRepository.deleteAll();
|
|
885
911
|
<%_ } _%>
|
|
886
912
|
}
|
|
887
913
|
|
|
@@ -891,11 +917,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
|
|
|
891
917
|
<%_ } _%>
|
|
892
918
|
void deleteUser()<% if (!reactive) { %> throws Exception<% } %> {
|
|
893
919
|
// Initialize the database
|
|
894
|
-
userRepository
|
|
895
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
896
|
-
// Configure the mock search repository
|
|
897
|
-
when(mockUserSearchRepository.delete(any())).thenReturn(Mono.empty());
|
|
898
|
-
<%_ } _%>
|
|
920
|
+
userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
899
921
|
int databaseSizeBeforeDelete = userRepository.findAll()<% if (reactive) { %>
|
|
900
922
|
.collectList().block()<% } %>.size();
|
|
901
923
|
|
|
@@ -18,9 +18,6 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.web.rest.errors;
|
|
20
20
|
|
|
21
|
-
<%_ if (databaseTypeCassandra) { _%>
|
|
22
|
-
import <%= packageName %>.AbstractCassandraTest;
|
|
23
|
-
<%_ } _%>
|
|
24
21
|
import <%= packageName %>.IntegrationTest;
|
|
25
22
|
import org.junit.jupiter.api.Test;
|
|
26
23
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -46,7 +43,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|
|
46
43
|
@WithMockUser
|
|
47
44
|
@AutoConfigureMockMvc
|
|
48
45
|
@IntegrationTest
|
|
49
|
-
class ExceptionTranslatorIT
|
|
46
|
+
class ExceptionTranslatorIT {
|
|
50
47
|
|
|
51
48
|
@Autowired
|
|
52
49
|
private MockMvc mockMvc;
|
|
@@ -18,9 +18,6 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.web.rest.errors;
|
|
20
20
|
|
|
21
|
-
<%_ if (databaseTypeCassandra) { _%>
|
|
22
|
-
import <%= packageName %>.AbstractCassandraTest;
|
|
23
|
-
<%_ } _%>
|
|
24
21
|
import <%= packageName %>.IntegrationTest;
|
|
25
22
|
import org.junit.jupiter.api.Test;
|
|
26
23
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -45,7 +42,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
|
|
|
45
42
|
@WithMockUser
|
|
46
43
|
@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
|
|
47
44
|
@IntegrationTest
|
|
48
|
-
class ExceptionTranslatorIT
|
|
45
|
+
class ExceptionTranslatorIT {
|
|
49
46
|
|
|
50
47
|
@Autowired
|
|
51
48
|
private WebTestClient webTestClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
org.springframework.test.context.ContextCustomizerFactory = <%= packageName %>.TestContainersSpringContextCustomizerFactory
|
|
1
|
+
org.springframework.test.context.ContextCustomizerFactory = <%= packageName %>.config.TestContainersSpringContextCustomizerFactory
|
|
@@ -60,11 +60,6 @@ mongock:
|
|
|
60
60
|
|
|
61
61
|
<%_ } _%>
|
|
62
62
|
spring:
|
|
63
|
-
<%_ if (databaseTypeSql && devDatabaseTypeH2Any) { _%>
|
|
64
|
-
profiles:
|
|
65
|
-
# Uncomment the following line to enable tests against production database type rather than H2, using Testcontainers
|
|
66
|
-
#active: testcontainers
|
|
67
|
-
<%_ } _%>
|
|
68
63
|
application:
|
|
69
64
|
name: <%= baseName %>
|
|
70
65
|
<%_ if (applicationTypeGateway && reactive) { _%>
|
|
@@ -72,13 +67,14 @@ spring:
|
|
|
72
67
|
exclude:
|
|
73
68
|
- org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration
|
|
74
69
|
<%_ } _%>
|
|
75
|
-
<%_ if (serviceDiscoveryEureka) { _%>
|
|
70
|
+
<%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul || messageBrokerKafka) { _%>
|
|
76
71
|
cloud:
|
|
72
|
+
<%_ } _%>
|
|
73
|
+
<%_ if (serviceDiscoveryEureka) { _%>
|
|
77
74
|
config:
|
|
78
75
|
enabled: false
|
|
79
76
|
<%_ } _%>
|
|
80
77
|
<%_ if (serviceDiscoveryConsul) { _%>
|
|
81
|
-
cloud:
|
|
82
78
|
consul:
|
|
83
79
|
discovery:
|
|
84
80
|
enabled: false
|
|
@@ -87,66 +83,39 @@ spring:
|
|
|
87
83
|
enabled: false
|
|
88
84
|
enabled: false
|
|
89
85
|
<%_ } _%>
|
|
90
|
-
<%_ if (
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
86
|
+
<%_ if (messageBrokerKafka) { _%>
|
|
87
|
+
stream:
|
|
88
|
+
kafka:
|
|
89
|
+
binder:
|
|
90
|
+
replicationFactor: 1
|
|
91
|
+
auto-create-topics: true
|
|
92
|
+
bindings:
|
|
93
|
+
binding-in-sse:
|
|
94
|
+
destination: sse-topic
|
|
95
|
+
content-type: text/plain
|
|
96
|
+
group: <%= dasherizedBaseName %>
|
|
97
|
+
binding-out-sse:
|
|
98
|
+
destination: sse-topic
|
|
99
|
+
content-type: text/plain
|
|
100
|
+
group: <%= dasherizedBaseName %>
|
|
101
|
+
<%_ } _%>
|
|
102
|
+
<%_ if (databaseTypeSql) { _%>
|
|
103
|
+
# Replace by 'prod, faker' to add the faker context and have sample data loaded in production
|
|
104
|
+
liquibase:
|
|
105
|
+
contexts: test
|
|
99
106
|
<%_ } _%>
|
|
100
107
|
jackson:
|
|
101
108
|
serialization:
|
|
102
109
|
write-durations-as-timestamps: false
|
|
103
|
-
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
104
|
-
jpa:
|
|
105
|
-
database-platform: tech.jhipster.domain.util.FixedH2Dialect
|
|
106
|
-
open-in-view: false
|
|
107
|
-
hibernate:
|
|
108
|
-
ddl-auto: none
|
|
109
|
-
naming:
|
|
110
|
-
physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
|
|
111
|
-
implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
|
|
112
|
-
properties:
|
|
113
|
-
hibernate.id.new_generator_mappings: true
|
|
114
|
-
hibernate.connection.provider_disables_autocommit: true
|
|
115
|
-
hibernate.cache.use_second_level_cache: false
|
|
116
|
-
hibernate.cache.use_query_cache: false
|
|
117
|
-
hibernate.generate_statistics: false
|
|
118
|
-
hibernate.hbm2ddl.auto: validate
|
|
119
|
-
hibernate.jdbc.time_zone: UTC
|
|
120
|
-
hibernate.query.fail_on_pagination_over_collection_fetch: true
|
|
121
|
-
<%_ } _%>
|
|
122
|
-
<%_ if (databaseTypeMongodb || databaseTypeCassandra) { _%>
|
|
123
|
-
data:
|
|
124
|
-
<%_ } _%>
|
|
125
110
|
<%_ if (databaseTypeCassandra) { _%>
|
|
111
|
+
data:
|
|
126
112
|
cassandra:
|
|
127
|
-
contact-points: localhost
|
|
128
113
|
compression: NONE
|
|
129
|
-
keyspace-name: cassandra_unit_keyspace
|
|
130
|
-
local-datacenter: datacenter1
|
|
131
|
-
<%_ } _%>
|
|
132
|
-
<%_ if (databaseTypeCouchbase) { _%>
|
|
133
|
-
couchbase:
|
|
134
|
-
bucket:
|
|
135
|
-
name: jhipster
|
|
136
|
-
password: password
|
|
137
|
-
<%_ } _%>
|
|
138
|
-
<%_ if (databaseTypeSql) { _%>
|
|
139
|
-
liquibase:
|
|
140
|
-
contexts: test
|
|
141
|
-
<%_ if (reactive) { _%>
|
|
142
|
-
url: <%- getJDBCUrl('h2Memory', { databaseName: lowercaseBaseName }) %>
|
|
143
|
-
<%_ } _%>
|
|
144
114
|
<%_ } _%>
|
|
145
115
|
mail:
|
|
146
116
|
host: localhost
|
|
147
117
|
main:
|
|
148
118
|
allow-bean-definition-overriding: true
|
|
149
|
-
allow-circular-references: true
|
|
150
119
|
<%_ if (!reactive) { _%>
|
|
151
120
|
mvc:
|
|
152
121
|
pathmatch:
|
|
@@ -154,12 +123,6 @@ spring:
|
|
|
154
123
|
<%_ } _%>
|
|
155
124
|
messages:
|
|
156
125
|
basename: i18n/messages
|
|
157
|
-
<%_ if (databaseTypeSql && reactive) { _%>
|
|
158
|
-
r2dbc:
|
|
159
|
-
url: <%- getR2DBCUrl('h2Memory', { databaseName: lowercaseBaseName }) %>
|
|
160
|
-
username: r2dbc
|
|
161
|
-
password:
|
|
162
|
-
<%_ } _%>
|
|
163
126
|
<%_ if (skipUserManagement && (applicationTypeMonolith || applicationTypeGateway) && authenticationTypeJwt) { _%>
|
|
164
127
|
security:
|
|
165
128
|
user:
|
|
@@ -176,7 +139,7 @@ spring:
|
|
|
176
139
|
scheduling:
|
|
177
140
|
thread-name-prefix: <%= dasherizedBaseName %>-scheduling-
|
|
178
141
|
pool:
|
|
179
|
-
size:
|
|
142
|
+
size: 20
|
|
180
143
|
thymeleaf:
|
|
181
144
|
mode: HTML
|
|
182
145
|
<%_ if (authenticationTypeOauth2) { _%>
|
|
@@ -186,7 +149,7 @@ spring:
|
|
|
186
149
|
client:
|
|
187
150
|
provider:
|
|
188
151
|
oidc:
|
|
189
|
-
issuer-uri: http://DO_NOT_CALL:9080/
|
|
152
|
+
issuer-uri: http://DO_NOT_CALL:9080/realms/jhipster
|
|
190
153
|
<%_ } _%>
|
|
191
154
|
|
|
192
155
|
server:
|
|
@@ -198,10 +161,12 @@ server:
|
|
|
198
161
|
#
|
|
199
162
|
# Full reference is available at: https://www.jhipster.tech/common-application-properties/
|
|
200
163
|
# ===================================================================
|
|
201
|
-
|
|
202
164
|
jhipster:
|
|
203
165
|
clientApp:
|
|
204
166
|
name: "<%= frontendAppName %>"
|
|
167
|
+
mail:
|
|
168
|
+
from: <%= baseName %>@localhost.com
|
|
169
|
+
base-url: http://127.0.0.1:8080
|
|
205
170
|
logging:
|
|
206
171
|
# To test json console appender
|
|
207
172
|
use-json-format: false
|
|
@@ -210,11 +175,6 @@ jhipster:
|
|
|
210
175
|
host: localhost
|
|
211
176
|
port: 5000
|
|
212
177
|
queue-size: 512
|
|
213
|
-
<%_ if (!skipUserManagement || authenticationTypeOauth2) { _%>
|
|
214
|
-
mail:
|
|
215
|
-
from: test@localhost
|
|
216
|
-
base-url: http://127.0.0.1:8080
|
|
217
|
-
<%_ } _%>
|
|
218
178
|
<%_ if (authenticationTypeJwt) { _%>
|
|
219
179
|
security:
|
|
220
180
|
authentication:
|
|
@@ -230,18 +190,6 @@ jhipster:
|
|
|
230
190
|
# security key (this key should be unique for your application, and kept secret)
|
|
231
191
|
key: <%= rememberMeKey %>
|
|
232
192
|
<%_ } _%>
|
|
233
|
-
<%_ if (messageBrokerKafka) { _%>
|
|
234
|
-
kafka:
|
|
235
|
-
bootstrap-servers: localhost:9092
|
|
236
|
-
consumer:
|
|
237
|
-
key.deserializer: org.apache.kafka.common.serialization.StringDeserializer
|
|
238
|
-
value.deserializer: org.apache.kafka.common.serialization.StringDeserializer
|
|
239
|
-
group.id: <%= dasherizedBaseName %>
|
|
240
|
-
auto.offset.reset: earliest
|
|
241
|
-
producer:
|
|
242
|
-
key.serializer: org.apache.kafka.common.serialization.StringSerializer
|
|
243
|
-
value.serializer: org.apache.kafka.common.serialization.StringSerializer
|
|
244
|
-
<%_ } _%>
|
|
245
193
|
|
|
246
194
|
# ===================================================================
|
|
247
195
|
# Application specific properties
|
|
@@ -253,3 +201,7 @@ kafka:
|
|
|
253
201
|
# ===================================================================
|
|
254
202
|
|
|
255
203
|
# application:
|
|
204
|
+
management:
|
|
205
|
+
health:
|
|
206
|
+
mail:
|
|
207
|
+
enabled: false
|
|
@@ -10,3 +10,4 @@ junit.jupiter.execution.timeout.beforeall.method.default = 60 s
|
|
|
10
10
|
cucumber.publish.enabled=true
|
|
11
11
|
cucumber.plugin=pretty, html:target/cucumber-reports/Cucumber.html
|
|
12
12
|
<%_ } _%>
|
|
13
|
+
junit.jupiter.testclass.order.default=<%= packageName %>.config.SpringBootTestClassOrderer
|
package/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
<!DOCTYPE html>
|
|
2
|
+
<html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
|
|
3
|
+
<head>
|
|
4
|
+
<title th:text="#{email.activation.title}">JHipster activation</title>
|
|
5
|
+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
6
|
+
</head>
|
|
7
|
+
<body>
|
|
8
|
+
<p th:text="#{email.activation.greeting(${user.login})}">Dear</p>
|
|
9
|
+
<p th:text="#{email.activation.text1}">Your JHipster account has been created, please click on the URL below to activate it:</p>
|
|
10
|
+
<p>
|
|
11
|
+
<a th:with="url=(@{|${baseUrl}/account/activate?key=${user.activationKey}|})" th:href="${url}" th:text="${url}">Activation link</a>
|
|
12
|
+
</p>
|
|
13
|
+
<p>
|
|
14
|
+
<span th:text="#{email.activation.text2}">Regards, </span>
|
|
15
|
+
<br />
|
|
16
|
+
<em th:text="#{email.signature}">JHipster.</em>
|
|
17
|
+
</p>
|
|
18
|
+
</body>
|
|
19
|
+
</html>
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
<!DOCTYPE html>
|
|
2
|
+
<html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
|
|
3
|
+
<head>
|
|
4
|
+
<title th:text="#{email.activation.title}">JHipster creation</title>
|
|
5
|
+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
6
|
+
</head>
|
|
7
|
+
<body>
|
|
8
|
+
<p th:text="#{email.activation.greeting(${user.login})}">Dear</p>
|
|
9
|
+
<p th:text="#{email.creation.text1}">Your JHipster account has been created, please click on the URL below to access it:</p>
|
|
10
|
+
<p>
|
|
11
|
+
<a th:with="url=(@{|${baseUrl}/account/reset/finish?key=${user.resetKey}|})" th:href="${url}" th:text="${url}">Login link</a>
|
|
12
|
+
</p>
|
|
13
|
+
<p>
|
|
14
|
+
<span th:text="#{email.activation.text2}">Regards, </span>
|
|
15
|
+
<br />
|
|
16
|
+
<em th:text="#{email.signature}">JHipster.</em>
|
|
17
|
+
</p>
|
|
18
|
+
</body>
|
|
19
|
+
</html>
|
package/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
<!DOCTYPE html>
|
|
2
|
+
<html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
|
|
3
|
+
<head>
|
|
4
|
+
<title th:text="#{email.reset.title}">JHipster password reset</title>
|
|
5
|
+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
6
|
+
</head>
|
|
7
|
+
<body>
|
|
8
|
+
<p th:text="#{email.reset.greeting(${user.login})}">Dear</p>
|
|
9
|
+
<p th:text="#{email.reset.text1}">
|
|
10
|
+
For your JHipster account a password reset was requested, please click on the URL below to reset it:
|
|
11
|
+
</p>
|
|
12
|
+
<p>
|
|
13
|
+
<a th:with="url=(@{|${baseUrl}/account/reset/finish?key=${user.resetKey}|})" th:href="${url}" th:text="${url}">Login link</a>
|
|
14
|
+
</p>
|
|
15
|
+
<p>
|
|
16
|
+
<span th:text="#{email.reset.text2}">Regards, </span>
|
|
17
|
+
<br />
|
|
18
|
+
<em th:text="#{email.signature}">JHipster.</em>
|
|
19
|
+
</p>
|
|
20
|
+
</body>
|
|
21
|
+
</html>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
testcontainers.reuse.enable=true
|