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
|
@@ -19,8 +19,6 @@
|
|
|
19
19
|
package <%= packageName %>.service;
|
|
20
20
|
|
|
21
21
|
import <%= packageName %>.config.Constants;
|
|
22
|
-
<% if (databaseTypeCassandra) { %>
|
|
23
|
-
import <%= packageName %>.AbstractCassandraTest;<% } %>
|
|
24
22
|
import <%= packageName %>.IntegrationTest;
|
|
25
23
|
import <%= packageName %>.domain.<%= asEntity('User') %>;
|
|
26
24
|
import tech.jhipster.config.JHipsterProperties;
|
|
@@ -28,15 +26,12 @@ import org.junit.jupiter.api.BeforeEach;
|
|
|
28
26
|
import org.junit.jupiter.api.Test;
|
|
29
27
|
import org.mockito.ArgumentCaptor;
|
|
30
28
|
import org.mockito.Captor;
|
|
31
|
-
import org.mockito.MockitoAnnotations;
|
|
32
|
-
import org.mockito.Spy;
|
|
33
29
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
34
|
-
import org.springframework.context.MessageSource;
|
|
35
30
|
import org.springframework.mail.MailSendException;
|
|
36
|
-
import org.springframework.mail.javamail.
|
|
37
|
-
import org.thymeleaf.spring5.SpringTemplateEngine;
|
|
31
|
+
import org.springframework.mail.javamail.JavaMailSender;
|
|
38
32
|
|
|
39
33
|
import javax.mail.Multipart;
|
|
34
|
+
import javax.mail.Session;
|
|
40
35
|
import javax.mail.internet.MimeBodyPart;
|
|
41
36
|
import javax.mail.internet.MimeMessage;
|
|
42
37
|
import javax.mail.internet.MimeMultipart;
|
|
@@ -50,6 +45,7 @@ import java.nio.charset.Charset;
|
|
|
50
45
|
import java.util.Properties;
|
|
51
46
|
import java.util.regex.Matcher;
|
|
52
47
|
import java.util.regex.Pattern;
|
|
48
|
+
import org.springframework.boot.test.mock.mockito.MockBean;
|
|
53
49
|
|
|
54
50
|
import static org.assertj.core.api.Assertions.*;
|
|
55
51
|
import static org.mockito.ArgumentMatchers.any;
|
|
@@ -59,7 +55,7 @@ import static org.mockito.Mockito.*;
|
|
|
59
55
|
* Integration tests for {@link MailService}.
|
|
60
56
|
*/
|
|
61
57
|
@IntegrationTest
|
|
62
|
-
class MailServiceIT
|
|
58
|
+
class MailServiceIT {
|
|
63
59
|
|
|
64
60
|
private static final String[] languages = {
|
|
65
61
|
// jhipster-needle-i18n-language-constant - JHipster will add/remove languages in this array
|
|
@@ -70,25 +66,19 @@ class MailServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
|
|
|
70
66
|
@Autowired
|
|
71
67
|
private JHipsterProperties jHipsterProperties;
|
|
72
68
|
|
|
73
|
-
@
|
|
74
|
-
private
|
|
75
|
-
|
|
76
|
-
@Autowired
|
|
77
|
-
private SpringTemplateEngine templateEngine;
|
|
78
|
-
|
|
79
|
-
@Spy
|
|
80
|
-
private JavaMailSenderImpl javaMailSender;
|
|
69
|
+
@MockBean
|
|
70
|
+
private JavaMailSender javaMailSender;
|
|
81
71
|
|
|
82
72
|
@Captor
|
|
83
73
|
private ArgumentCaptor<MimeMessage> messageCaptor;
|
|
84
74
|
|
|
75
|
+
@Autowired
|
|
85
76
|
private MailService mailService;
|
|
86
77
|
|
|
87
78
|
@BeforeEach
|
|
88
79
|
public void setup() {
|
|
89
|
-
MockitoAnnotations.openMocks(this);
|
|
90
80
|
doNothing().when(javaMailSender).send(any(MimeMessage.class));
|
|
91
|
-
|
|
81
|
+
when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session)null));
|
|
92
82
|
}
|
|
93
83
|
|
|
94
84
|
@Test
|
|
@@ -154,9 +144,9 @@ class MailServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
|
|
|
154
144
|
@Test
|
|
155
145
|
void testSendEmailFromTemplate() throws Exception {
|
|
156
146
|
<%= asEntity('User') %> user = new <%= asEntity('User') %>();
|
|
147
|
+
user.setLangKey(Constants.DEFAULT_LANGUAGE);
|
|
157
148
|
user.setLogin("john");
|
|
158
149
|
user.setEmail("john.doe@example.com");
|
|
159
|
-
user.setLangKey("en");
|
|
160
150
|
mailService.sendEmailFromTemplate(user, "mail/testEmail", "email.test.title");
|
|
161
151
|
verify(javaMailSender).send(messageCaptor.capture());
|
|
162
152
|
MimeMessage message = messageCaptor.getValue();
|
|
@@ -18,9 +18,6 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.service;
|
|
20
20
|
|
|
21
|
-
<%_ if (databaseTypeCassandra) { _%>
|
|
22
|
-
import <%= packageName %>.AbstractCassandraTest;
|
|
23
|
-
<%_ } _%>
|
|
24
21
|
import <%= packageName %>.IntegrationTest;
|
|
25
22
|
import <%= packageName %>.config.Constants;
|
|
26
23
|
<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
|
|
@@ -53,6 +50,9 @@ import org.apache.commons.lang3.RandomStringUtils;
|
|
|
53
50
|
import org.junit.jupiter.api.BeforeEach;
|
|
54
51
|
import org.junit.jupiter.api.Test;
|
|
55
52
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
53
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
54
|
+
import org.springframework.boot.test.mock.mockito.SpyBean;
|
|
55
|
+
<%_ } _%>
|
|
56
56
|
<%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
|
|
57
57
|
import org.springframework.boot.test.mock.mockito.MockBean;
|
|
58
58
|
import org.springframework.data.auditing.AuditingHandler;
|
|
@@ -135,7 +135,7 @@ import static org.mockito.Mockito.when;
|
|
|
135
135
|
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
136
136
|
@Transactional
|
|
137
137
|
<%_ } _%>
|
|
138
|
-
class UserServiceIT
|
|
138
|
+
class UserServiceIT {
|
|
139
139
|
|
|
140
140
|
private static final String DEFAULT_LOGIN = "johndoe";
|
|
141
141
|
|
|
@@ -170,8 +170,8 @@ class UserServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
|
|
|
170
170
|
*
|
|
171
171
|
* @see <%= packageName %>.repository.search.UserSearchRepositoryMockConfiguration
|
|
172
172
|
*/
|
|
173
|
-
@
|
|
174
|
-
private UserSearchRepository
|
|
173
|
+
@SpyBean
|
|
174
|
+
private UserSearchRepository spiedUserSearchRepository;
|
|
175
175
|
<%_ } _%>
|
|
176
176
|
<%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
|
|
177
177
|
|
|
@@ -211,7 +211,7 @@ class UserServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
|
|
|
211
211
|
<%_ } _%>
|
|
212
212
|
user.setLogin(DEFAULT_LOGIN);
|
|
213
213
|
<%_ if (!authenticationTypeOauth2) { _%>
|
|
214
|
-
user.setPassword(RandomStringUtils.
|
|
214
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
215
215
|
<%_ } _%>
|
|
216
216
|
user.setActivated(true);
|
|
217
217
|
user.setEmail(DEFAULT_EMAIL);
|
|
@@ -353,12 +353,6 @@ class UserServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
|
|
|
353
353
|
Instant now = Instant.now();
|
|
354
354
|
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
355
355
|
when(dateTimeProvider.getNow()).thenReturn(Optional.of(now.minus(4, ChronoUnit.DAYS)));
|
|
356
|
-
<%_ } _%>
|
|
357
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
358
|
-
// Configure the mock search repository
|
|
359
|
-
when(mockUserSearchRepository.save(any()))
|
|
360
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
361
|
-
when(mockUserSearchRepository.delete(any())).thenReturn(Mono.empty());
|
|
362
356
|
<%_ } _%>
|
|
363
357
|
user.setActivated(false);
|
|
364
358
|
user.setActivationKey(RandomStringUtils.random(20));
|
|
@@ -380,7 +374,7 @@ class UserServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
|
|
|
380
374
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
381
375
|
|
|
382
376
|
// Verify Elasticsearch mock
|
|
383
|
-
verify(
|
|
377
|
+
verify(spiedUserSearchRepository, times(1)).delete(user);
|
|
384
378
|
<%_ } _%>
|
|
385
379
|
}
|
|
386
380
|
|
|
@@ -411,7 +405,7 @@ class UserServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
|
|
|
411
405
|
<%_ if (searchEngineElasticsearch) { _%>
|
|
412
406
|
|
|
413
407
|
// Verify Elasticsearch mock
|
|
414
|
-
verify(
|
|
408
|
+
verify(spiedUserSearchRepository, never()).delete(user);
|
|
415
409
|
<%_ } _%>
|
|
416
410
|
}
|
|
417
411
|
<%_ } _%>
|
package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs
CHANGED
|
@@ -59,7 +59,7 @@ class UserMapperTest {
|
|
|
59
59
|
user = new <%= asEntity('User') %>();
|
|
60
60
|
user.setLogin(DEFAULT_LOGIN);
|
|
61
61
|
<%_ if (!authenticationTypeOauth2) { _%>
|
|
62
|
-
user.setPassword(RandomStringUtils.
|
|
62
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
63
63
|
<%_ } _%>
|
|
64
64
|
user.setActivated(true);
|
|
65
65
|
user.setEmail("johndoe@localhost");
|
package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs
CHANGED
|
@@ -18,9 +18,6 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.web.rest;
|
|
20
20
|
|
|
21
|
-
<%_ if (databaseTypeCassandra) { _%>
|
|
22
|
-
import <%= packageName %>.AbstractCassandraTest;
|
|
23
|
-
<%_ } _%>
|
|
24
21
|
import <%= packageName %>.IntegrationTest;
|
|
25
22
|
import <%= packageName %>.config.Constants;
|
|
26
23
|
<%_ if (authenticationTypeSession && !reactive) { _%>
|
|
@@ -113,7 +110,7 @@ import static org.springframework.security.test.web.servlet.response.SecurityMoc
|
|
|
113
110
|
<%_ } _%>
|
|
114
111
|
@WithMockUser(value = TEST_USER_LOGIN)
|
|
115
112
|
@IntegrationTest
|
|
116
|
-
class AccountResourceIT
|
|
113
|
+
class AccountResourceIT {
|
|
117
114
|
static final String TEST_USER_LOGIN = "test";
|
|
118
115
|
|
|
119
116
|
@Autowired
|
|
@@ -131,11 +128,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
131
128
|
@Autowired
|
|
132
129
|
private PersistentTokenRepository persistentTokenRepository;
|
|
133
130
|
<%_ } _%>
|
|
134
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
135
|
-
|
|
136
|
-
@Autowired
|
|
137
|
-
private UserSearchRepository mockUserSearchRepository;
|
|
138
|
-
<%_ } _%>
|
|
139
131
|
|
|
140
132
|
@Autowired
|
|
141
133
|
private PasswordEncoder passwordEncoder;
|
|
@@ -203,12 +195,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
203
195
|
|
|
204
196
|
@Test
|
|
205
197
|
void testGetExistingAccount()<% if (!reactive) { %> throws Exception<% } %> {
|
|
206
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
207
|
-
// Configure the mock search repository
|
|
208
|
-
when(mockUserSearchRepository.save(any()))
|
|
209
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
210
|
-
|
|
211
|
-
<%_ } _%>
|
|
212
198
|
Set<String> authorities = new HashSet<>();
|
|
213
199
|
authorities.add(AuthoritiesConstants.ADMIN);
|
|
214
200
|
|
|
@@ -278,12 +264,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
278
264
|
@Transactional
|
|
279
265
|
<%_ } _%>
|
|
280
266
|
void testRegisterValid() throws Exception {
|
|
281
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
282
|
-
// Configure the mock search repository
|
|
283
|
-
when(mockUserSearchRepository.save(any()))
|
|
284
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
285
|
-
|
|
286
|
-
<%_ } _%>
|
|
287
267
|
ManagedUserVM validUser = new ManagedUserVM();
|
|
288
268
|
validUser.setLogin("test-register-valid");
|
|
289
269
|
validUser.setPassword("password");
|
|
@@ -471,12 +451,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
471
451
|
@Transactional
|
|
472
452
|
<%_ } _%>
|
|
473
453
|
void testRegisterDuplicateLogin() throws Exception {
|
|
474
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
475
|
-
// Configure the mock search repository
|
|
476
|
-
when(mockUserSearchRepository.save(any()))
|
|
477
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
478
|
-
|
|
479
|
-
<%_ } _%>
|
|
480
454
|
// First registration
|
|
481
455
|
ManagedUserVM firstUser = new ManagedUserVM();
|
|
482
456
|
firstUser.setLogin("alice");
|
|
@@ -571,12 +545,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
571
545
|
@Transactional
|
|
572
546
|
<%_ } _%>
|
|
573
547
|
void testRegisterDuplicateEmail() throws Exception {
|
|
574
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
575
|
-
// Configure the mock search repository
|
|
576
|
-
when(mockUserSearchRepository.save(any()))
|
|
577
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
578
|
-
|
|
579
|
-
<%_ } _%>
|
|
580
548
|
// First user
|
|
581
549
|
ManagedUserVM firstUser = new ManagedUserVM();
|
|
582
550
|
firstUser.setLogin("test-register-duplicate-email");
|
|
@@ -716,12 +684,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
716
684
|
validUser.setLangKey(Constants.DEFAULT_LANGUAGE);
|
|
717
685
|
validUser.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
|
|
718
686
|
|
|
719
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
720
|
-
// Configure the mock search repository
|
|
721
|
-
when(mockUserSearchRepository.save(any()))
|
|
722
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
723
|
-
|
|
724
|
-
<%_ } _%>
|
|
725
687
|
<%_ if (reactive) { _%>
|
|
726
688
|
accountWebTestClient.post().uri("/api/register")
|
|
727
689
|
.contentType(MediaType.APPLICATION_JSON)
|
|
@@ -748,12 +710,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
748
710
|
@Transactional
|
|
749
711
|
<%_ } _%>
|
|
750
712
|
void testActivateAccount()<% if (!reactive) { %> throws Exception<% } %> {
|
|
751
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
752
|
-
// Configure the mock search repository
|
|
753
|
-
when(mockUserSearchRepository.save(any()))
|
|
754
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
755
|
-
|
|
756
|
-
<%_ } _%>
|
|
757
713
|
final String activationKey = "some activation key";
|
|
758
714
|
<%= asEntity('User') %> user = new <%= asEntity('User') %>();
|
|
759
715
|
<%_ if (databaseTypeCassandra) { _%>
|
|
@@ -761,7 +717,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
761
717
|
<%_ } _%>
|
|
762
718
|
user.setLogin("activate-account");
|
|
763
719
|
user.setEmail("activate-account@example.com");
|
|
764
|
-
user.setPassword(RandomStringUtils.
|
|
720
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
765
721
|
user.setActivated(false);
|
|
766
722
|
user.setActivationKey(activationKey);
|
|
767
723
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
@@ -810,19 +766,13 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
810
766
|
<%_ } _%>
|
|
811
767
|
user.setLogin("save-account");
|
|
812
768
|
user.setEmail("save-account@example.com");
|
|
813
|
-
user.setPassword(RandomStringUtils.
|
|
769
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
814
770
|
user.setActivated(true);
|
|
815
771
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
816
772
|
user.setCreatedBy(Constants.SYSTEM);
|
|
817
773
|
<%_ } _%>
|
|
818
774
|
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
819
775
|
|
|
820
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
821
|
-
// Configure the mock search repository
|
|
822
|
-
when(mockUserSearchRepository.save(any()))
|
|
823
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
824
|
-
|
|
825
|
-
<%_ } _%>
|
|
826
776
|
<%= asDto('AdminUser') %> userDTO = new <%= asDto('AdminUser') %>();
|
|
827
777
|
userDTO.setLogin("not-used");
|
|
828
778
|
userDTO.setFirstName("firstname");
|
|
@@ -875,7 +825,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
875
825
|
<%_ } _%>
|
|
876
826
|
user.setLogin("save-invalid-email");
|
|
877
827
|
user.setEmail("save-invalid-email@example.com");
|
|
878
|
-
user.setPassword(RandomStringUtils.
|
|
828
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
879
829
|
user.setActivated(true);
|
|
880
830
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
881
831
|
user.setCreatedBy(Constants.SYSTEM);
|
|
@@ -928,7 +878,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
928
878
|
<%_ } _%>
|
|
929
879
|
user.setLogin("save-existing-email");
|
|
930
880
|
user.setEmail("save-existing-email@example.com");
|
|
931
|
-
user.setPassword(RandomStringUtils.
|
|
881
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
932
882
|
user.setActivated(true);
|
|
933
883
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
934
884
|
user.setCreatedBy(Constants.SYSTEM);
|
|
@@ -941,7 +891,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
941
891
|
<%_ } _%>
|
|
942
892
|
anotherUser.setLogin("save-existing-email2");
|
|
943
893
|
anotherUser.setEmail("save-existing-email2@example.com");
|
|
944
|
-
anotherUser.setPassword(RandomStringUtils.
|
|
894
|
+
anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
945
895
|
anotherUser.setActivated(true);
|
|
946
896
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
947
897
|
anotherUser.setCreatedBy(Constants.SYSTEM);
|
|
@@ -992,19 +942,13 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
992
942
|
<%_ } _%>
|
|
993
943
|
user.setLogin("save-existing-email-and-login");
|
|
994
944
|
user.setEmail("save-existing-email-and-login@example.com");
|
|
995
|
-
user.setPassword(RandomStringUtils.
|
|
945
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
996
946
|
user.setActivated(true);
|
|
997
947
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
998
948
|
user.setCreatedBy(Constants.SYSTEM);
|
|
999
949
|
<%_ } _%>
|
|
1000
950
|
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
1001
951
|
|
|
1002
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
1003
|
-
// Configure the mock search repository
|
|
1004
|
-
when(mockUserSearchRepository.save(any()))
|
|
1005
|
-
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
1006
|
-
|
|
1007
|
-
<%_ } _%>
|
|
1008
952
|
<%= asDto('AdminUser') %> userDTO = new <%= asDto('AdminUser') %>();
|
|
1009
953
|
userDTO.setLogin("not-used");
|
|
1010
954
|
userDTO.setFirstName("firstname");
|
|
@@ -1046,7 +990,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1046
990
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1047
991
|
user.setId(UUID.randomUUID().toString());
|
|
1048
992
|
<%_ } _%>
|
|
1049
|
-
String currentPassword = RandomStringUtils.
|
|
993
|
+
String currentPassword = RandomStringUtils.randomAlphanumeric(60);
|
|
1050
994
|
user.setPassword(passwordEncoder.encode(currentPassword));
|
|
1051
995
|
user.setLogin("change-password-wrong-existing-password");
|
|
1052
996
|
user.setEmail("change-password-wrong-existing-password@example.com");
|
|
@@ -1085,7 +1029,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1085
1029
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1086
1030
|
user.setId(UUID.randomUUID().toString());
|
|
1087
1031
|
<%_ } _%>
|
|
1088
|
-
String currentPassword = RandomStringUtils.
|
|
1032
|
+
String currentPassword = RandomStringUtils.randomAlphanumeric(60);
|
|
1089
1033
|
user.setPassword(passwordEncoder.encode(currentPassword));
|
|
1090
1034
|
user.setLogin("change-password");
|
|
1091
1035
|
user.setEmail("change-password@example.com");
|
|
@@ -1123,7 +1067,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1123
1067
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1124
1068
|
user.setId(UUID.randomUUID().toString());
|
|
1125
1069
|
<%_ } _%>
|
|
1126
|
-
String currentPassword = RandomStringUtils.
|
|
1070
|
+
String currentPassword = RandomStringUtils.randomAlphanumeric(60);
|
|
1127
1071
|
user.setPassword(passwordEncoder.encode(currentPassword));
|
|
1128
1072
|
user.setLogin("change-password-too-small");
|
|
1129
1073
|
user.setEmail("change-password-too-small@example.com");
|
|
@@ -1163,7 +1107,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1163
1107
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1164
1108
|
user.setId(UUID.randomUUID().toString());
|
|
1165
1109
|
<%_ } _%>
|
|
1166
|
-
String currentPassword = RandomStringUtils.
|
|
1110
|
+
String currentPassword = RandomStringUtils.randomAlphanumeric(60);
|
|
1167
1111
|
user.setPassword(passwordEncoder.encode(currentPassword));
|
|
1168
1112
|
user.setLogin("change-password-too-long");
|
|
1169
1113
|
user.setEmail("change-password-too-long@example.com");
|
|
@@ -1203,7 +1147,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1203
1147
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1204
1148
|
user.setId(UUID.randomUUID().toString());
|
|
1205
1149
|
<%_ } _%>
|
|
1206
|
-
String currentPassword = RandomStringUtils.
|
|
1150
|
+
String currentPassword = RandomStringUtils.randomAlphanumeric(60);
|
|
1207
1151
|
user.setPassword(passwordEncoder.encode(currentPassword));
|
|
1208
1152
|
user.setLogin("change-password-empty");
|
|
1209
1153
|
user.setEmail("change-password-empty@example.com");
|
|
@@ -1242,7 +1186,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1242
1186
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1243
1187
|
user.setId(UUID.randomUUID().toString());
|
|
1244
1188
|
<%_ } _%>
|
|
1245
|
-
user.setPassword(RandomStringUtils.
|
|
1189
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
1246
1190
|
user.setLogin("current-sessions");
|
|
1247
1191
|
user.setEmail("current-sessions@example.com");
|
|
1248
1192
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
@@ -1287,7 +1231,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1287
1231
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1288
1232
|
user.setId(UUID.randomUUID().toString());
|
|
1289
1233
|
<%_ } _%>
|
|
1290
|
-
user.setPassword(RandomStringUtils.
|
|
1234
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
1291
1235
|
user.setLogin("invalidate-session");
|
|
1292
1236
|
user.setEmail("invalidate-session@example.com");
|
|
1293
1237
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
@@ -1332,10 +1276,11 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1332
1276
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1333
1277
|
user.setId(UUID.randomUUID().toString());
|
|
1334
1278
|
<%_ } _%>
|
|
1335
|
-
user.setPassword(RandomStringUtils.
|
|
1279
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
1336
1280
|
user.setActivated(true);
|
|
1337
1281
|
user.setLogin("password-reset");
|
|
1338
1282
|
user.setEmail("password-reset@example.com");
|
|
1283
|
+
user.setLangKey("en");
|
|
1339
1284
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
1340
1285
|
user.setCreatedBy(Constants.SYSTEM);
|
|
1341
1286
|
<%_ } _%>
|
|
@@ -1364,10 +1309,11 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1364
1309
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1365
1310
|
user.setId(UUID.randomUUID().toString());
|
|
1366
1311
|
<%_ } _%>
|
|
1367
|
-
user.setPassword(RandomStringUtils.
|
|
1312
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
1368
1313
|
user.setActivated(true);
|
|
1369
1314
|
user.setLogin("password-reset-upper-case");
|
|
1370
1315
|
user.setEmail("password-reset-upper-case@example.com");
|
|
1316
|
+
user.setLangKey("en");
|
|
1371
1317
|
<%_ if (databaseTypeSql && reactive) { _%>
|
|
1372
1318
|
user.setCreatedBy(Constants.SYSTEM);
|
|
1373
1319
|
<%_ } _%>
|
|
@@ -1413,7 +1359,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1413
1359
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1414
1360
|
user.setId(UUID.randomUUID().toString());
|
|
1415
1361
|
<%_ } _%>
|
|
1416
|
-
user.setPassword(RandomStringUtils.
|
|
1362
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
1417
1363
|
user.setLogin("finish-password-reset");
|
|
1418
1364
|
user.setEmail("finish-password-reset@example.com");
|
|
1419
1365
|
user.setResetDate(Instant.now().plusSeconds(60));
|
|
@@ -1455,7 +1401,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
1455
1401
|
<%_ if (databaseTypeCassandra) { _%>
|
|
1456
1402
|
user.setId(UUID.randomUUID().toString());
|
|
1457
1403
|
<%_ } _%>
|
|
1458
|
-
user.setPassword(RandomStringUtils.
|
|
1404
|
+
user.setPassword(RandomStringUtils.randomAlphanumeric(60));
|
|
1459
1405
|
user.setLogin("finish-password-reset-too-small");
|
|
1460
1406
|
user.setEmail("finish-password-reset-too-small@example.com");
|
|
1461
1407
|
user.setResetDate(Instant.now().plusSeconds(60));
|
package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs
CHANGED
|
@@ -32,9 +32,6 @@ import static org.mockito.Mockito.*;
|
|
|
32
32
|
<%_ } _%>
|
|
33
33
|
<%_ } _%>
|
|
34
34
|
|
|
35
|
-
<%_ if (databaseTypeCassandra) { _%>
|
|
36
|
-
import <%= packageName %>.AbstractCassandraTest;
|
|
37
|
-
<%_ } _%>
|
|
38
35
|
import <%= packageName %>.IntegrationTest;
|
|
39
36
|
import <%= packageName %>.security.AuthoritiesConstants;
|
|
40
37
|
|
|
@@ -77,7 +74,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
77
74
|
<%_ } _%>
|
|
78
75
|
@WithMockUser(value = TEST_USER_LOGIN)
|
|
79
76
|
@IntegrationTest
|
|
80
|
-
class AccountResourceIT
|
|
77
|
+
class AccountResourceIT {
|
|
81
78
|
|
|
82
79
|
<%_ if (reactive) { _%>
|
|
83
80
|
private Map<String, Object> claims;
|
|
@@ -18,18 +18,12 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.web.rest;
|
|
20
20
|
|
|
21
|
-
<%_ if (databaseTypeCassandra) { _%>
|
|
22
|
-
import <%= packageName %>.AbstractCassandraTest;
|
|
23
|
-
<%_ } _%>
|
|
24
21
|
import <%= packageName %>.IntegrationTest;
|
|
25
22
|
<%_ if (reactive && searchEngineElasticsearch) { _%>
|
|
26
23
|
import <%= packageName %>.repository.search.UserSearchRepository;
|
|
27
24
|
<%_ } _%>
|
|
28
25
|
import <%= packageName %>.security.AuthoritiesConstants;
|
|
29
26
|
import org.junit.jupiter.api.Test;
|
|
30
|
-
<%_ if (reactiveSqlTestContainers) { _%>
|
|
31
|
-
import <%= packageName %>.ReactiveSqlTestContainerExtension;
|
|
32
|
-
<%_ } _%>
|
|
33
27
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
34
28
|
<%_ if (reactive) { _%>
|
|
35
29
|
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
|
|
@@ -63,7 +57,7 @@ import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
|
|
|
63
57
|
<%_ } _%>
|
|
64
58
|
@WithMockUser(value = TEST_USER_LOGIN)
|
|
65
59
|
@IntegrationTest
|
|
66
|
-
class AccountResourceIT
|
|
60
|
+
class AccountResourceIT {
|
|
67
61
|
static final String TEST_USER_LOGIN = "test";
|
|
68
62
|
|
|
69
63
|
@Autowired
|
|
@@ -72,11 +66,6 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
|
|
|
72
66
|
<%_ } else { _%>
|
|
73
67
|
private MockMvc restAccountMockMvc;
|
|
74
68
|
<%_ } _%>
|
|
75
|
-
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
76
|
-
|
|
77
|
-
@Autowired
|
|
78
|
-
private UserSearchRepository mockUserSearchRepository;
|
|
79
|
-
<%_ } _%>
|
|
80
69
|
|
|
81
70
|
@Test
|
|
82
71
|
@WithMockUser(username = TEST_USER_LOGIN, authorities = AuthoritiesConstants.ADMIN)
|