generator-jhipster 7.1.0 → 7.4.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 +1 -1
- package/cli/commands.js +21 -0
- package/cli/environment-builder.js +10 -2
- package/cli/import-jdl.js +7 -10
- package/cli/jdl.js +1 -0
- package/cli/jhipster-command.js +14 -28
- package/cli/program.js +37 -29
- package/generators/add/index.cjs +78 -0
- package/generators/app/esm.mjs +21 -0
- package/generators/app/generator.spec.mjs +47 -0
- package/generators/app/index.js +38 -34
- package/generators/app/prompts.js +1 -1
- package/generators/aws/esm.mjs +21 -0
- package/generators/aws/generator.spec.mjs +47 -0
- package/generators/aws/index.js +8 -8
- package/generators/aws/lib/eb.js +1 -1
- package/generators/azure-app-service/esm.mjs +21 -0
- package/generators/azure-app-service/generator.spec.mjs +47 -0
- package/generators/azure-app-service/index.js +30 -19
- package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs +3 -3
- package/generators/azure-spring-cloud/esm.mjs +21 -0
- package/generators/azure-spring-cloud/generator.spec.mjs +47 -0
- package/generators/azure-spring-cloud/index.js +68 -46
- package/generators/azure-spring-cloud/templates/application-azure.yml.ejs +4 -4
- package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs +3 -3
- package/generators/base/esm.mjs +21 -0
- package/generators/base/generator.spec.mjs +44 -0
- package/generators/bootstrap/esm.mjs +21 -0
- package/generators/bootstrap/generator.spec.mjs +44 -0
- package/generators/bootstrap/index.js +55 -58
- package/generators/ci-cd/esm.mjs +21 -0
- package/generators/ci-cd/generator.spec.mjs +47 -0
- package/generators/ci-cd/index.js +30 -47
- package/generators/ci-cd/templates/github-actions.yml.ejs +5 -2
- package/generators/ci-cd/templates/travis.yml.ejs +9 -4
- package/generators/cleanup.js +5 -0
- package/generators/client/__workflow/devserver-angular.json +13 -0
- package/generators/client/__workflow/devserver-react.json +13 -0
- package/generators/client/__workflow/devserver-vue.json +13 -0
- package/generators/client/esm.mjs +21 -0
- package/generators/client/files-angular.js +8 -9
- package/generators/client/files-common.js +7 -3
- package/generators/client/files-react.js +11 -1
- package/generators/client/files-vue.js +56 -6
- package/generators/client/generator.spec.mjs +47 -0
- package/generators/client/index.js +127 -51
- package/generators/client/needle-api/needle-client-vue.js +5 -5
- package/generators/client/templates/angular/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/angular/README.md.jhi.client.angular.ejs +48 -0
- package/generators/client/templates/angular/angular.json.ejs +0 -1
- package/generators/client/templates/angular/package.json +28 -25
- package/generators/client/templates/angular/package.json.ejs +18 -18
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +52 -54
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +65 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +78 -80
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.spec.ts.ejs +41 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +73 -75
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +62 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +44 -46
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +61 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +116 -118
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +75 -77
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +74 -76
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +48 -50
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +50 -52
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +45 -47
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +99 -101
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs +3 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +61 -63
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +19 -21
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +28 -30
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +62 -64
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +40 -42
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +87 -89
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +3 -3
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +41 -43
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +81 -83
- package/generators/client/templates/angular/src/main/webapp/app/app.constants.ts.ejs +0 -4
- package/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +3 -1
- package/generators/client/templates/angular/src/main/webapp/app/config/error.constants.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/config/translation.config.ts.ejs +1 -2
- package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +179 -172
- package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.ejs +9 -9
- package/generators/client/templates/angular/src/main/webapp/app/core/config/application-config.service.ts.ejs +9 -0
- package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs +2 -1
- package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs +14 -22
- package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.service.spec.ts.ejs +87 -89
- package/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +93 -95
- package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +166 -168
- package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +66 -68
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +27 -29
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +112 -114
- package/generators/client/templates/angular/src/main/webapp/app/login/login.service.ts.ejs +1 -11
- package/generators/client/templates/angular/src/main/webapp/app/login/logout.model.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +132 -134
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +29 -31
- package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +24 -37
- package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +5 -3
- package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs +7 -5
- package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +7 -10
- package/generators/client/templates/angular/src/main/webapp/declarations.d.ts.ejs +8 -1
- package/generators/client/templates/angular/webpack/environment.js.ejs +2 -2
- package/generators/client/templates/angular/webpack/logo-jhipster.png +0 -0
- package/generators/client/templates/angular/webpack/proxy.conf.js.ejs +2 -3
- package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +23 -7
- package/generators/client/templates/angular/webpack/webpack.microfrontend.js.ejs +3 -3
- package/generators/client/templates/common/README.md.jhi.client.ejs +224 -0
- package/generators/client/templates/common/package.json +9 -10
- package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +56 -0
- package/generators/client/templates/react/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/react/jest.conf.js.ejs +7 -1
- package/generators/client/templates/react/package.json +61 -64
- package/generators/client/templates/react/package.json.ejs +22 -31
- package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/app.tsx.ejs +1 -2
- package/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.ts.ejs +0 -2
- package/generators/client/templates/react/src/main/webapp/app/config/constants.ts.ejs +0 -9
- package/generators/client/templates/react/src/main/webapp/app/config/error-middleware.ts.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/config/logger-middleware.ts.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/config/notification-middleware.ts.ejs +1 -3
- package/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs +1 -3
- package/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.spec.ts.ejs +0 -4
- package/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs +1 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +4 -4
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs +1 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health.tsx.ejs +3 -1
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +6 -6
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +8 -8
- package/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +5 -1
- package/generators/client/templates/react/src/main/webapp/app/modules/login/logout.tsx.ejs +1 -6
- package/generators/client/templates/react/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-route.spec.tsx.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary.spec.tsx.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary.tsx.ejs +1 -2
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +3 -5
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +3 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +7 -7
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +1 -5
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.ts.ejs +0 -2
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs +12 -12
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +0 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/util/date-utils.ts.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/typings.d.ts.ejs +6 -0
- package/generators/client/templates/react/webpack/environment.js.ejs +35 -0
- package/generators/client/templates/react/webpack/webpack.common.js.ejs +31 -37
- package/generators/client/templates/react/webpack/webpack.dev.js.ejs +21 -7
- package/generators/client/templates/react/webpack/webpack.prod.js.ejs +14 -7
- package/generators/client/templates/vue/.eslintrc.js.ejs +8 -5
- package/generators/client/templates/vue/package.json +47 -55
- package/generators/client/templates/vue/package.json.ejs +33 -40
- package/generators/client/templates/vue/src/main/webapp/app/account/account.service.ts.ejs +4 -5
- package/generators/client/templates/vue/src/main/webapp/app/account/activate/activate.component.ts.ejs +2 -2
- package/generators/client/templates/vue/src/main/webapp/app/account/change-password/change-password.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/account/reset-password/init/reset-password-init.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs +7 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.vue.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/health/health-modal.component.ts.ejs +2 -4
- package/generators/client/templates/vue/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -2
- package/generators/client/templates/vue/src/main/webapp/app/admin/health/health.service.ts.ejs +5 -9
- package/generators/client/templates/vue/src/main/webapp/app/admin/logs/logs.component.ts.ejs +2 -2
- package/generators/client/templates/vue/src/main/webapp/app/admin/logs/logs.service.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs +1 -6
- package/generators/client/templates/vue/src/main/webapp/app/admin/tracker/tracker.service.ts.ejs +5 -4
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +9 -0
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs +5 -0
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +6 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.service.ts.ejs +3 -2
- package/generators/client/templates/vue/src/main/webapp/app/constants.ts.ejs +18 -9
- package/generators/client/templates/vue/src/main/webapp/app/core/home/home.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +16 -16
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +6 -0
- package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs +41 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.component.ts.ejs +34 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.vue.ejs +13 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs +12 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.vue.ejs +5 -0
- package/generators/{common/templates/.huskyrc.ejs → client/templates/vue/src/main/webapp/app/index.ts.ejs} +1 -5
- package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs +26 -10
- package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +12 -5
- package/generators/client/templates/vue/src/main/webapp/app/router/admin.ts.ejs +4 -4
- package/generators/client/templates/vue/src/main/webapp/app/router/entities.ts.ejs +44 -1
- package/generators/client/templates/vue/src/main/webapp/app/router/index.ts.ejs +11 -0
- package/generators/client/templates/vue/src/main/webapp/app/shared/alert/alert.service.ts.ejs +61 -0
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +5 -3
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/config.ts.ejs +3 -1
- package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +13 -18
- package/generators/client/templates/vue/src/main/webapp/app/shims-vue.d.ts.ejs +18 -0
- package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +28 -8
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs +2 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs +1 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs +12 -12
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.service.spec.ts.ejs +2 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +3 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs +2 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +3 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs +52 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs +4 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs +7 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs +1 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/alert/alert.service.spec.ts.ejs +124 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs +33 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/data/data-utils.service.spec.ts.ejs +6 -6
- package/generators/client/templates/vue/tsconfig.json.ejs +5 -9
- package/generators/{server/templates/src/main/java/package/repository/search/SearchCouchbaseRepository.java.ejs → client/templates/vue/tsconfig.spec.json.ejs} +17 -21
- package/generators/client/templates/vue/webpack/config.js.ejs +50 -0
- package/generators/client/templates/vue/webpack/vue.utils.js.ejs +33 -32
- package/generators/client/templates/vue/webpack/webpack.common.js.ejs +164 -119
- package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +19 -80
- package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs +77 -0
- package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +5 -46
- package/generators/cloudfoundry/esm.mjs +21 -0
- package/generators/cloudfoundry/generator.spec.mjs +47 -0
- package/generators/cloudfoundry/index.js +38 -24
- package/generators/common/esm.mjs +21 -0
- package/generators/common/files.js +9 -2
- package/generators/common/generator.spec.mjs +47 -0
- package/generators/common/index.js +66 -11
- package/generators/common/templates/.husky/pre-commit +4 -0
- package/generators/common/templates/.prettierrc.ejs +1 -1
- package/generators/common/templates/{README.md.ejs → README.md.jhi.ejs} +85 -171
- package/generators/common/templates/package.json +5 -5
- package/generators/cypress/esm.mjs +21 -0
- package/generators/cypress/generator.spec.mjs +47 -0
- package/generators/cypress/index.js +17 -14
- package/generators/cypress/templates/cypress.json.ejs +8 -1
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/login-page.spec.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/password-page.spec.ts.ejs +2 -2
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/register-page.spec.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/reset-password-page.spec.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/integration/administration/administration.spec.ts.ejs +1 -3
- package/generators/cypress/templates/src/test/javascript/cypress/integration/lighthouse.audits.ts.ejs +3 -3
- package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +6 -44
- package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +30 -2
- package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/index.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
- 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 +104 -79
- package/generators/database-changelog/esm.mjs +21 -0
- package/generators/database-changelog/generator.spec.mjs +47 -0
- package/generators/database-changelog/index.js +35 -24
- package/generators/database-changelog-liquibase/esm.mjs +21 -0
- package/generators/database-changelog-liquibase/generator.spec.mjs +47 -0
- package/generators/database-changelog-liquibase/index.js +17 -11
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs +2 -1
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs +3 -3
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +4 -4
- package/generators/docker-base.js +3 -3
- package/generators/docker-compose/esm.mjs +21 -0
- package/generators/docker-compose/generator.spec.mjs +44 -0
- package/generators/docker-compose/index.js +23 -11
- package/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs +1 -1
- package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +113 -39
- package/generators/docker-prompts.js +3 -3
- package/generators/entities/esm.mjs +21 -0
- package/generators/entities/generator.spec.mjs +47 -0
- package/generators/entities/index.js +37 -28
- package/generators/entities-client/esm.mjs +21 -0
- package/generators/entities-client/generator.spec.mjs +47 -0
- package/generators/entities-client/index.js +12 -9
- package/generators/entity/esm.mjs +21 -0
- package/generators/entity/generator.spec.mjs +47 -0
- package/generators/entity/index.js +54 -36
- package/generators/entity-client/esm.mjs +21 -0
- package/generators/entity-client/files.js +6 -11
- package/generators/entity-client/generator.spec.mjs +47 -0
- package/generators/entity-client/index.js +77 -10
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +42 -44
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +57 -54
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +2 -2
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +2 -2
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +105 -107
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +17 -4
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs +3 -4
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs +6 -0
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +52 -54
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs +173 -175
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +2 -4
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +193 -195
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +7 -0
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +262 -110
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +5 -2
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +26 -23
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +7 -7
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-details.component.ts.ejs +5 -0
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +22 -3
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.vue.ejs +6 -9
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs +9 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs +2 -6
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs +2 -1
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs +2 -0
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs +3 -1
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +1 -1
- package/generators/entity-i18n/esm.mjs +21 -0
- package/generators/entity-i18n/files.js +61 -26
- package/generators/entity-i18n/generator.spec.mjs +47 -0
- package/generators/entity-i18n/index.js +12 -9
- package/generators/entity-i18n/templates/i18n/entity_hr.json.ejs +0 -0
- package/generators/entity-i18n/templates/i18n/entity_pa.json.ejs +69 -0
- package/generators/entity-server/esm.mjs +21 -0
- package/generators/entity-server/files-couchbase.js +73 -0
- package/generators/entity-server/files.js +102 -31
- package/generators/entity-server/generator.spec.mjs +47 -0
- package/generators/entity-server/index.js +29 -13
- package/generators/entity-server/templates/couchbase/src/main/java/package/domain/Entity.java.jhi.spring_data_couchbase.ejs +212 -0
- package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +138 -0
- package/generators/entity-server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/entity.fts.ejs +6 -3
- package/generators/entity-server/templates/partials/save_template.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +375 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.elastic_search.ejs +25 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.hibernate_cache.ejs +41 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_persistence.ejs +130 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_validation.ejs +51 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_cassandra.ejs +48 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_mongodb.ejs +82 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_neo4j.ejs +97 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_reactive.ejs +114 -0
- package/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs +11 -4
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +10 -15
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +17 -30
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +6 -9
- package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +46 -0
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +61 -10
- package/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs +12 -8
- package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +4 -4
- package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +18 -13
- package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs +8 -4
- package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +9 -9
- package/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +7 -3
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +52 -54
- package/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +36 -22
- package/generators/export-jdl/esm.mjs +21 -0
- package/generators/export-jdl/generator.spec.mjs +44 -0
- package/generators/export-jdl/index.js +2 -2
- package/generators/gae/esm.mjs +21 -0
- package/generators/gae/generator.spec.mjs +47 -0
- package/generators/gae/index.js +60 -41
- package/generators/gae/templates/dispatch.yaml.ejs +2 -2
- package/generators/generator-base-blueprint.js +35 -37
- package/generators/generator-base-docker.js +4 -24
- package/generators/generator-base-private.js +59 -116
- package/generators/generator-base.js +544 -91
- package/generators/generator-constants.js +43 -29
- package/generators/generator-defaults.js +1 -0
- package/generators/generator-list.js +27 -2
- package/generators/generator-transforms.js +31 -24
- package/generators/gradle/__snapshots__/generator.spec.cjs.snap +59 -0
- package/generators/gradle/constants.cjs +29 -0
- package/generators/gradle/files.cjs +37 -0
- package/generators/gradle/generator.spec.cjs +71 -0
- package/generators/gradle/index.cjs +136 -0
- package/generators/gradle/templates/.eslintignore.jhi.gradle.ejs +19 -0
- package/generators/gradle/templates/.gitignore.jhi.gradle.ejs +28 -0
- package/generators/gradle/templates/.prettierignore.jhi.gradle.ejs +22 -0
- package/generators/gradle/templates/build.gradle.jhi.ejs +48 -0
- package/generators/gradle/templates/gradle.properties.jhi.ejs +57 -0
- package/generators/gradle/templates/settings.gradle.jhi.ejs +20 -0
- package/generators/heroku/esm.mjs +21 -0
- package/generators/heroku/generator.spec.mjs +47 -0
- package/generators/heroku/index.js +92 -80
- package/generators/heroku/templates/Procfile.ejs +1 -1
- package/generators/heroku/templates/application-heroku.yml.ejs +9 -9
- package/generators/heroku/templates/bootstrap-heroku.yml.ejs +2 -2
- package/generators/heroku/templates/pom-profile.xml.ejs +1 -1
- package/generators/info/esm.mjs +21 -0
- package/generators/info/generator.spec.mjs +44 -0
- package/generators/info/index.js +4 -2
- package/generators/init/__snapshots__/generator.spec.cjs.snap +65 -0
- package/generators/init/config.cjs +36 -0
- package/generators/init/constants.cjs +35 -0
- package/generators/init/files.cjs +51 -0
- package/generators/init/generator.spec.cjs +112 -0
- package/generators/init/index.cjs +283 -0
- package/generators/init/mixin.cjs +76 -0
- package/generators/init/options.cjs +27 -0
- package/generators/init/templates/.editorconfig.jhi.ejs +40 -0
- package/generators/init/templates/.eslintignore.jhi.ejs +21 -0
- package/generators/init/templates/.gitattributes.jhi.ejs +170 -0
- package/generators/init/templates/.gitignore.jhi.ejs +128 -0
- package/generators/init/templates/.husky/pre-commit +4 -0
- package/generators/{client/templates/vue/webpack/utils.js.ejs → init/templates/.lintstagedrc.js.ejs} +1 -10
- package/generators/init/templates/.prettierignore.jhi.ejs +23 -0
- package/generators/init/templates/.prettierrc.yml.jhi.ejs +29 -0
- package/generators/init/templates/README.md.ejs +19 -0
- package/generators/init/templates/package.json +6 -0
- package/generators/init/templates/package.json.ejs +41 -0
- package/generators/java/__snapshots__/generator.spec.cjs.snap +118 -0
- package/generators/java/config.cjs +43 -0
- package/generators/java/constants.cjs +69 -0
- package/generators/java/files.cjs +26 -0
- package/generators/java/generator.spec.cjs +87 -0
- package/generators/java/index.cjs +226 -0
- package/generators/java/mixin.cjs +120 -0
- package/generators/java/options.cjs +32 -0
- package/generators/java/templates/.editorconfig.jhi.java.ejs +23 -0
- package/generators/java/templates/.gitignore.jhi.java.ejs +34 -0
- package/generators/java/templates/.prettierrc.yml.jhi.java.ejs +25 -0
- package/generators/kubernetes/esm.mjs +21 -0
- package/generators/kubernetes/files.js +20 -8
- package/generators/kubernetes/generator.spec.mjs +44 -0
- package/generators/kubernetes/index.js +126 -64
- package/generators/kubernetes/kubernetes-constants.js +50 -0
- package/generators/kubernetes/prompts.js +25 -16
- package/generators/kubernetes/templates/README-KUBERNETES.md.ejs +12 -13
- package/generators/kubernetes/templates/db/couchbase.yml.ejs +3 -3
- package/generators/kubernetes/templates/db/elasticsearch.yml.ejs +5 -5
- package/generators/kubernetes/templates/db/mariadb.yml.ejs +5 -5
- package/generators/kubernetes/templates/db/mongodb.yml.ejs +2 -2
- package/generators/kubernetes/templates/db/mssql.yml.ejs +5 -5
- package/generators/kubernetes/templates/db/mysql.yml.ejs +5 -5
- package/generators/kubernetes/templates/db/neo4j.yml.ejs +5 -5
- package/generators/kubernetes/templates/db/postgresql.yml.ejs +5 -5
- package/generators/kubernetes/templates/deployment.yml.ejs +61 -56
- package/generators/kubernetes/templates/ingress.yml.ejs +2 -2
- package/generators/kubernetes/templates/istio/destination-rule.yml.ejs +1 -1
- package/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +10 -8
- package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway.yml.ejs +11 -9
- package/generators/kubernetes/templates/kubectl-apply.sh.ejs +24 -23
- package/generators/kubernetes/templates/kustomize/kustomization.yml.ejs +27 -27
- package/generators/kubernetes/templates/messagebroker/kafka.yml.ejs +4 -4
- package/generators/kubernetes/templates/monitoring/jhipster-grafana-dashboard.yml.ejs +2 -2
- package/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs +6 -6
- package/generators/kubernetes/templates/monitoring/jhipster-prometheus-crd.yml.ejs +2 -2
- package/generators/kubernetes/templates/registry/application-configmap.yml.ejs +6 -6
- package/generators/kubernetes/templates/registry/consul.yml.ejs +2 -2
- package/generators/kubernetes/templates/registry/jhipster-registry.yml.ejs +4 -4
- package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs +9 -0
- package/generators/kubernetes/templates/service.yml.ejs +8 -8
- package/generators/kubernetes-base.js +44 -18
- package/generators/kubernetes-helm/esm.mjs +21 -0
- package/generators/kubernetes-helm/files.js +20 -21
- package/generators/kubernetes-helm/generator.spec.mjs +44 -0
- package/generators/kubernetes-helm/index.js +106 -46
- package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs +2 -3
- package/generators/kubernetes-helm/templates/app/Chart.yml.ejs +27 -0
- package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs +4 -15
- package/generators/kubernetes-helm/templates/app/requirements.yml.ejs +11 -6
- package/generators/kubernetes-helm/templates/app/values.yml.ejs +73 -10
- package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs +17 -0
- package/generators/kubernetes-helm/templates/csvc/helpers.tpl.ejs +1 -1
- package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs +3 -3
- package/generators/kubernetes-helm/templates/csvc/values.yml.ejs +6 -6
- package/generators/kubernetes-helm/templates/helm-apply.sh.ejs +2 -2
- package/generators/kubernetes-helm/templates/helm-upgrade.sh.ejs +1 -1
- package/generators/kubernetes-knative/esm.mjs +21 -0
- package/generators/kubernetes-knative/files.js +30 -19
- package/generators/kubernetes-knative/generator.spec.mjs +44 -0
- package/generators/kubernetes-knative/index.js +134 -72
- package/generators/kubernetes-knative/prompts.js +7 -3
- package/generators/kubernetes-knative/templates/README-KUBERNETES-KNATIVE.md.ejs +5 -5
- package/generators/kubernetes-knative/templates/helm-apply.sh.ejs +1 -1
- package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +10 -8
- package/generators/kubernetes-knative/templates/kubectl-apply.sh.ejs +24 -19
- package/generators/kubernetes-knative/templates/service.yml.ejs +32 -32
- package/generators/languages/esm.mjs +21 -0
- package/generators/languages/files.js +73 -0
- package/generators/languages/generator.spec.mjs +47 -0
- package/generators/languages/index.js +45 -22
- package/generators/languages/prompts.js +1 -1
- package/generators/languages/templates/src/main/resources/i18n/messages_hr.properties.ejs +0 -0
- package/generators/languages/templates/src/main/resources/i18n/messages_pa.properties.ejs +41 -0
- package/generators/languages/templates/src/main/webapp/i18n/al/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/al/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ar-ly/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/bg/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/bg/health.json.ejs +19 -16
- package/generators/languages/templates/src/main/webapp/i18n/bn/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/bn/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/by/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/by/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ca/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ca/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/cs/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/cs/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/da/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/da/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/de/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/de/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/el/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/el/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/en/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/en/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/es/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/es/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/et/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/fa/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/fr/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/gl/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/hi/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/hr/activate.json.ejs +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/configuration.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/error.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/gateway.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/hr/health.json.ejs +15 -13
- package/generators/languages/templates/src/main/webapp/i18n/hr/home.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/login.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/logs.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/metrics.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/password.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/register.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs +1 -2
- package/generators/languages/templates/src/main/webapp/i18n/hr/sessions.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/settings.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/tracker.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hr/user-management.json +0 -0
- package/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/hu/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/hy/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/in/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/it/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/it/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ja/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ja/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ko/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/mr/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/my/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/nl/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/pa/activate.json.ejs +27 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/configuration.json +10 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/error.json +14 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/gateway.json +15 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/global.json.ejs +162 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/health.json.ejs +71 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/home.json +19 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/login.json +19 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/logs.json +11 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/metrics.json +102 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/password.json +12 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/register.json +24 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/reset.json.ejs +44 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/sessions.json +15 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/settings.json +32 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/tracker.json +12 -0
- package/generators/languages/templates/src/main/webapp/i18n/pa/user-management.json +31 -0
- package/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/pt-br/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/pt-pt/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ro/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ru/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/si/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/si/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/sk/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/sr/health.json.ejs +16 -14
- package/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/sv/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ta/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/te/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/th/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/tr/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/ua/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/health.json.ejs +16 -14
- package/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/vi/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/zh-cn/health.json.ejs +17 -15
- package/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs +2 -2
- package/generators/languages/templates/src/main/webapp/i18n/zh-tw/health.json.ejs +17 -15
- package/generators/languages/templates/src/test/resources/i18n/messages_hr.properties.ejs +0 -0
- package/generators/languages/templates/src/test/resources/i18n/messages_pa.properties.ejs +4 -0
- package/generators/maven/__snapshots__/generator.spec.cjs.snap +53 -0
- package/generators/maven/constants.cjs +27 -0
- package/generators/maven/files.cjs +36 -0
- package/generators/maven/generator.spec.cjs +78 -0
- package/generators/maven/index.cjs +131 -0
- package/generators/maven/templates/.eslintignore.jhi.maven.ejs +19 -0
- package/generators/maven/templates/.gitignore.jhi.maven.ejs +9 -0
- package/generators/maven/templates/.mvn/wrapper/MavenWrapperDownloader.java +117 -0
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +2 -0
- package/generators/maven/templates/.prettierignore.jhi.maven.ejs +3 -0
- package/generators/maven/templates/mvnw +310 -0
- package/generators/maven/templates/mvnw.cmd +182 -0
- package/generators/maven/templates/pom.xml.jhi.ejs +98 -0
- package/generators/openapi-client/esm.mjs +21 -0
- package/generators/openapi-client/files.js +21 -15
- package/generators/openapi-client/generator.spec.mjs +47 -0
- package/generators/openapi-client/index.js +80 -28
- package/generators/openapi-client/prompts.js +6 -2
- package/generators/openshift/esm.mjs +21 -0
- package/generators/openshift/files.js +12 -5
- package/generators/openshift/generator.spec.mjs +44 -0
- package/generators/openshift/index.js +136 -64
- package/generators/openshift/prompts.js +12 -4
- package/generators/openshift/templates/apply.sh.ejs +6 -6
- package/generators/openshift/templates/db/cassandra.yml.ejs +8 -9
- package/generators/openshift/templates/db/couchbase.yml.ejs +8 -9
- package/generators/openshift/templates/db/elasticsearch.yml.ejs +8 -9
- package/generators/openshift/templates/db/mariadb.yml.ejs +8 -9
- package/generators/openshift/templates/db/mongodb.yml.ejs +8 -9
- package/generators/openshift/templates/db/mysql.yml.ejs +8 -9
- package/generators/openshift/templates/db/postgresql.yml.ejs +8 -9
- package/generators/openshift/templates/deployment.yml.ejs +46 -46
- package/generators/openshift/templates/messagebroker/kafka.yml.ejs +13 -14
- package/generators/openshift/templates/monitoring/jhipster-metrics.yml.ejs +17 -17
- package/generators/openshift/templates/registry/application-configmap.yml.ejs +6 -6
- package/generators/options.js +63 -0
- package/generators/page/esm.mjs +21 -0
- package/generators/page/generator.spec.mjs +47 -0
- package/generators/page/index.js +17 -13
- package/generators/project-name/config.cjs +40 -0
- package/generators/project-name/constants.cjs +37 -0
- package/generators/project-name/generator.spec.cjs +43 -0
- package/generators/project-name/index.cjs +194 -0
- package/generators/project-name/mixin.cjs +82 -0
- package/generators/project-name/options.cjs +33 -0
- package/generators/server/__snapshots__/generator.spec.mjs.snap +1848 -0
- package/generators/server/esm.mjs +21 -0
- package/generators/server/files-couchbase.js +155 -0
- package/generators/server/files-sql.js +52 -0
- package/generators/server/files.js +302 -286
- package/generators/server/generator.spec.mjs +52 -0
- package/generators/server/index.js +193 -97
- package/generators/server/needle-api/needle-server-cache.js +7 -8
- package/generators/server/prompts.js +104 -62
- package/generators/server/templates/.mvn/wrapper/MavenWrapperDownloader.java +1 -1
- package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/generators/server/templates/build.gradle.ejs +43 -9
- package/generators/server/templates/checkstyle.xml.ejs +2 -2
- package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase/Couchbase.Dockerfile.ejs +0 -0
- package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase/scripts/configure-node.sh.ejs +4 -4
- package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase-cluster.yml.ejs +0 -0
- package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase.yml.ejs +0 -0
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactory.java.ejs +83 -0
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java.ejs +40 -0
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryQuery.java.ejs +44 -0
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlQueryCreator.java.ejs +162 -0
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java.ejs +104 -0
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/package-info.java.ejs +25 -0
- package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs +114 -0
- package/generators/server/templates/couchbase/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs +49 -0
- package/generators/server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json.ejs +0 -0
- package/generators/server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json.ejs +0 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/user__admin.json.ejs +18 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/user__user.json.ejs +17 -0
- package/generators/server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs +3 -6
- package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs +55 -0
- package/generators/server/templates/{src/test/java/package/repository/CustomN1qlCouchbaseRepositoryTest.java.ejs → couchbase/src/test/java/package/repository/JHipsterCouchbaseRepositoryTest.java.ejs} +3 -4
- package/generators/server/templates/gradle/docker.gradle.ejs +3 -3
- package/generators/server/templates/gradle/profile_dev.gradle.ejs +36 -12
- package/generators/server/templates/gradle/profile_prod.gradle.ejs +7 -7
- package/generators/server/templates/gradle/war.gradle.ejs +4 -4
- package/generators/server/templates/gradle.properties.ejs +21 -17
- package/generators/server/templates/mvnw +1 -1
- package/generators/server/templates/mvnw.cmd +1 -1
- package/generators/server/templates/npmw +1 -1
- package/generators/server/templates/npmw.cmd +1 -1
- package/generators/server/templates/package.json.ejs +4 -8
- package/generators/server/templates/pom.xml.ejs +352 -160
- package/generators/server/templates/settings.gradle.ejs +38 -9
- package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs +48 -0
- package/generators/server/templates/src/main/docker/app.yml.ejs +80 -75
- package/generators/server/templates/src/main/docker/config/README.md.ejs +2 -2
- package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +117 -41
- package/generators/server/templates/src/main/docker/elasticsearch.yml.ejs +12 -1
- package/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs +8 -8
- package/generators/server/templates/src/main/docker/jhipster-registry.yml.ejs +3 -3
- package/generators/server/templates/src/main/docker/prometheus/prometheus.yml.ejs +1 -1
- package/generators/server/templates/src/main/java/package/Application.java.ejs +6 -5
- package/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs +94 -96
- package/generators/server/templates/src/main/java/package/config/Constants.java.ejs +8 -8
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.ejs +2 -8
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +116 -33
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_mongodb.java.ejs +4 -6
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_neo4j.java.ejs +4 -6
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.ejs +13 -13
- package/generators/server/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs +5 -4
- package/generators/server/templates/src/main/java/package/config/FeignConfiguration.java.ejs +6 -1
- package/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs +3 -3
- package/generators/server/templates/src/main/java/package/config/LiquibaseConfiguration.java.ejs +5 -5
- package/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs +1 -4
- package/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs +13 -13
- package/generators/server/templates/src/main/java/package/config/OAuth2Configuration.java.ejs +38 -0
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +99 -102
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +114 -66
- package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +31 -32
- package/generators/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs +4 -2
- package/generators/server/templates/src/main/java/package/config/apidocs/GatewaySwaggerResourcesProvider.java.ejs +5 -5
- package/generators/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs +2 -6
- package/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs +48 -36
- package/generators/server/templates/src/main/java/package/domain/Authority.java.ejs +20 -20
- package/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs +55 -55
- package/generators/server/templates/src/main/java/package/domain/User.java.ejs +185 -160
- package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs +68 -0
- package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +40 -15
- package/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs +14 -36
- package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +209 -163
- package/generators/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.java.ejs +4 -4
- package/generators/server/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs +33 -7
- package/generators/server/templates/src/main/java/package/repository/search/package-info.java.ejs +2 -2
- package/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs +11 -11
- package/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs +43 -45
- package/generators/server/templates/src/main/java/package/security/SecurityUtils.java.ejs +62 -29
- package/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs +10 -10
- package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +31 -6
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +29 -4
- package/generators/server/templates/src/main/java/package/service/MailService.java.ejs +2 -2
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +326 -304
- package/generators/server/templates/src/main/java/package/service/dto/AdminUserDTO.java.ejs +24 -24
- package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs +7 -7
- package/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs +11 -11
- package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +71 -0
- package/generators/server/templates/src/main/java/package/web/filter/OAuth2RefreshTokensWebFilter.java.ejs +103 -0
- package/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs +3 -3
- package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +77 -76
- package/generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs +3 -3
- package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs +12 -12
- package/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs +58 -22
- package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +62 -39
- package/generators/server/templates/src/main/java/package/web/rest/UserJWTController.java.ejs +3 -3
- package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs +51 -51
- package/generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs +4 -4
- package/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs +19 -19
- package/generators/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.ejs +4 -4
- package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +105 -102
- package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +78 -78
- package/generators/server/templates/src/main/resources/config/application-tls.yml.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/application.yml.ejs +42 -55
- package/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs +7 -7
- package/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs +6 -6
- package/generators/server/templates/src/main/resources/config/cql/changelog/create-tables.cql.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs +26 -34
- package/generators/server/templates/src/main/resources/config/liquibase/data/user.csv.ejs +2 -2
- package/generators/server/templates/src/main/resources/config/liquibase/data/user_authority.csv.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/liquibase/master.xml.ejs +14 -14
- package/generators/server/templates/src/main/resources/config/{couchmove/changelog/V0.1__initial_setup → neo4j/migrations}/user__admin.json.ejs +2 -2
- package/generators/server/templates/src/main/resources/config/{couchmove/changelog/V0.1__initial_setup → neo4j/migrations}/user__user.json.ejs +2 -2
- package/generators/server/templates/src/main/resources/h2.server.properties.ejs +2 -2
- package/generators/server/templates/src/main/resources/logback-spring.xml.ejs +55 -55
- package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs +1 -1
- package/generators/server/templates/src/main/resources/swagger/api.yml.ejs +6 -6
- package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +13 -7
- package/generators/server/templates/src/test/java/package/ReactiveSqlTestContainerExtension.java.ejs +9 -9
- package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +3 -0
- package/generators/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs +27 -28
- package/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs +5 -7
- package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +6 -4
- package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs +113 -0
- package/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapper.java.ejs +3 -3
- package/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs +24 -24
- package/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest.java.ejs +97 -10
- package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +23 -18
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs +198 -0
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +13 -3
- package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +16 -2
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +108 -4
- package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +4 -4
- package/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs +133 -133
- package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +17 -17
- package/generators/server/templates/src/test/java/package/test/util/OAuth2TestUtil.java.ejs +104 -0
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +397 -338
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs +67 -70
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs +20 -20
- package/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs +2 -2
- package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs +14 -14
- package/generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs +41 -34
- package/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs +59 -59
- package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +25 -55
- package/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs +35 -35
- package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +263 -261
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs +13 -13
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.ejs +3 -3
- package/generators/server/templates/src/test/resources/config/application-testcontainers.yml.ejs +17 -17
- package/generators/server/templates/src/test/resources/config/application.yml.ejs +34 -36
- package/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs +4 -4
- package/generators/server/templates/src/test/resources/logback.xml.ejs +54 -52
- package/generators/spring-boot/__snapshots__/generator.spec.cjs.snap +80 -0
- package/generators/spring-boot/config.cjs +30 -0
- package/generators/spring-boot/constants.cjs +28 -0
- package/generators/spring-boot/files.cjs +46 -0
- package/generators/spring-boot/generator.spec.cjs +64 -0
- package/generators/spring-boot/index.cjs +162 -0
- package/generators/spring-boot/mixin.cjs +82 -0
- package/generators/spring-boot/options.cjs +19 -0
- package/generators/spring-boot/templates/build.gradle.jhi.spring-boot.ejs +29 -0
- package/generators/spring-boot/templates/pom.xml.jhi.spring-boot.ejs +45 -0
- package/generators/spring-boot/templates/src/main/java/package/Application.java.jhi.ejs +31 -0
- package/generators/spring-boot/templates/src/main/resources/application.properties.jhi.ejs +19 -0
- package/generators/spring-boot/templates/src/test/java/package/ApplicationTests.java.jhi.ejs +31 -0
- package/generators/spring-controller/esm.mjs +21 -0
- package/generators/spring-controller/generator.spec.mjs +47 -0
- package/generators/spring-controller/index.js +39 -19
- package/generators/spring-controller/templates/src/main/java/package/web/rest/Resource.java.ejs +5 -5
- package/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs +2 -2
- package/generators/spring-service/esm.mjs +21 -0
- package/generators/spring-service/generator.spec.mjs +47 -0
- package/generators/spring-service/index.js +33 -13
- package/generators/spring-service/templates/src/main/java/package/service/Service.java.ejs +16 -8
- package/generators/spring-service/templates/src/main/java/package/service/impl/ServiceImpl.java.ejs +9 -5
- package/generators/statistics.js +3 -1
- package/generators/upgrade/esm.mjs +21 -0
- package/generators/upgrade/generator.spec.mjs +44 -0
- package/generators/upgrade/index.js +5 -6
- package/generators/upgrade-config/esm.mjs +21 -0
- package/generators/upgrade-config/generator.spec.mjs +44 -0
- package/generators/upgrade-config/index.js +2 -2
- package/generators/utils.js +78 -11
- package/generators/workspaces/esm.mjs +21 -0
- package/generators/workspaces/generator.spec.mjs +47 -0
- package/generators/workspaces/index.js +20 -12
- package/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +8 -0
- package/jdl/converters/json-to-jdl-entity-converter.js +1 -0
- package/jdl/jhipster/application-options.js +18 -3
- package/jdl/jhipster/default-application-options.js +13 -7
- package/jdl/jhipster/deployment-options.js +25 -12
- package/jdl/jhipster/kubernetes-platform-types.js +40 -0
- package/jdl/jhipster/message-broker-types.js +1 -0
- package/jdl/jhipster/openapi-options.js +21 -0
- package/jdl/jhipster/openshift-platform-types.js +27 -0
- package/jdl/models/jdl-enum-value.js +2 -1
- package/jdl/models/jdl-enum.js +11 -1
- package/jdl/parsing/jdl-ast-builder-visitor.js +10 -2
- package/jdl/parsing/jdl-parser.js +3 -0
- package/jdl/parsing/lexer/application-tokens.js +4 -0
- package/jdl/parsing/validator.js +7 -1
- package/jdl/validators/application-validator.js +1 -0
- package/lib/constants/generators.mjs +20 -0
- package/lib/constants/priorities.cjs +131 -0
- package/lib/constants/priorities.mjs +19 -0
- package/lib/support/index.cjs +21 -0
- package/lib/support/mixin.cjs +199 -0
- package/lib/support/shared-data.cjs +74 -0
- package/package.json +55 -36
- package/utils/entity.js +21 -4
- package/utils/field.js +27 -3
- package/utils/liquibase.js +31 -20
- package/utils/multi-step-transform/index.js +52 -0
- package/utils/multi-step-transform/template-data.js +60 -0
- package/utils/multi-step-transform/template-file-fs.js +43 -0
- package/utils/multi-step-transform/template-file.js +84 -0
- package/NOTICE +0 -4
- package/generators/client/templates/angular/.npmrc.ejs +0 -1
- package/generators/client/templates/vue/webpack/dev.env.js.ejs +0 -18
- package/generators/client/templates/vue/webpack/env.js.ejs +0 -67
- package/generators/client/templates/vue/webpack/loader.conf.js.ejs +0 -20
- package/generators/client/templates/vue/webpack/prod.env.js.ejs +0 -16
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs +0 -769
- package/generators/server/templates/src/main/java/package/config/OAuth2SsoConfiguration.java.ejs +0 -94
- package/generators/server/templates/src/main/java/package/config/OAuth2TokenServicesConfiguration.java.ejs +0 -68
- package/generators/server/templates/src/main/java/package/repository/CustomN1qlCouchbaseRepository.java.ejs +0 -135
- package/generators/server/templates/src/main/java/package/repository/CustomReactiveN1qlCouchbaseRepository.java.ejs +0 -157
- package/generators/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs +0 -46
- package/generators/server/templates/src/main/java/package/repository/ReactiveN1qlCouchbaseRepository.java.ejs +0 -47
- package/generators/server/templates/src/test/java/package/config/DatabaseConfigurationIT.java.ejs +0 -112
|
@@ -18,32 +18,32 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.web.rest;
|
|
20
20
|
|
|
21
|
-
<%_ if (
|
|
21
|
+
<%_ if (databaseTypeCassandra) { _%>
|
|
22
22
|
import <%= packageName %>.AbstractCassandraTest;
|
|
23
23
|
<%_ } _%>
|
|
24
24
|
import <%= packageName %>.IntegrationTest;
|
|
25
|
-
<%_ if (
|
|
25
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
26
26
|
import <%= packageName %>.config.Constants;
|
|
27
27
|
<%_ } _%>
|
|
28
|
-
<%_ if (
|
|
28
|
+
<%_ if (!databaseTypeCassandra && !databaseTypeCouchbase) { _%>
|
|
29
29
|
import <%= packageName %>.domain.Authority;
|
|
30
30
|
<%_ } _%>
|
|
31
31
|
import <%= packageName %>.domain.<%= asEntity('User') %>;
|
|
32
|
-
<%_ if (
|
|
32
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
33
33
|
import <%= packageName %>.repository.AuthorityRepository;
|
|
34
34
|
<%_ } _%>
|
|
35
35
|
import <%= packageName %>.repository.UserRepository;
|
|
36
|
-
<%_ if (
|
|
36
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
37
37
|
import <%= packageName %>.repository.search.UserSearchRepository;
|
|
38
38
|
<%_ } _%>
|
|
39
39
|
import <%= packageName %>.security.AuthoritiesConstants;
|
|
40
40
|
import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
|
|
41
41
|
import <%= packageName %>.service.dto.<%= asDto('User') %>;
|
|
42
|
-
<%_ if (
|
|
42
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
43
43
|
import <%= packageName %>.service.EntityManager;
|
|
44
44
|
<%_ } _%>
|
|
45
45
|
import <%= packageName %>.service.mapper.UserMapper;
|
|
46
|
-
<%_ if (
|
|
46
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
47
47
|
import <%= packageName %>.web.rest.vm.ManagedUserVM;
|
|
48
48
|
<%_ } _%>
|
|
49
49
|
import org.apache.commons.lang3.RandomStringUtils;
|
|
@@ -55,14 +55,14 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
|
|
|
55
55
|
<%_ } else { _%>
|
|
56
56
|
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
|
|
57
57
|
<%_ } _%>
|
|
58
|
-
<%_ if (cacheManagerIsAvailable
|
|
58
|
+
<%_ if (cacheManagerIsAvailable) { _%>
|
|
59
59
|
import org.springframework.cache.CacheManager;
|
|
60
60
|
<%_ } _%>
|
|
61
|
-
<%_ if (
|
|
61
|
+
<%_ if (cacheProviderMemcached) { _%>
|
|
62
62
|
import org.springframework.cache.support.NoOpCacheManager;
|
|
63
63
|
<%_ } _%>
|
|
64
64
|
import org.springframework.http.MediaType;
|
|
65
|
-
<%_ if (
|
|
65
|
+
<%_ if (databaseTypeCouchbase) { _%>
|
|
66
66
|
import org.springframework.security.core.context.SecurityContextHolder;
|
|
67
67
|
import org.springframework.security.test.context.TestSecurityContextHolder;
|
|
68
68
|
<%_ } _%>
|
|
@@ -73,32 +73,32 @@ import org.springframework.test.web.reactive.server.WebTestClient;
|
|
|
73
73
|
<%_ if (!reactive) { _%>
|
|
74
74
|
import org.springframework.test.web.servlet.MockMvc;
|
|
75
75
|
<%_ } _%>
|
|
76
|
-
<%_ if (
|
|
76
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
77
77
|
import org.springframework.transaction.annotation.Transactional;
|
|
78
78
|
<%_ } _%>
|
|
79
|
-
<%_ if (reactive &&
|
|
79
|
+
<%_ if (reactive && searchEngineElasticsearch) { _%>
|
|
80
80
|
import reactor.core.publisher.Mono;
|
|
81
81
|
<%_ } _%>
|
|
82
82
|
|
|
83
|
-
<%_ if (
|
|
83
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
84
84
|
import javax.persistence.EntityManager;
|
|
85
85
|
<%_ } _%>
|
|
86
|
-
<%_ if (
|
|
86
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
87
87
|
import java.time.Instant;
|
|
88
88
|
<%_ } _%>
|
|
89
89
|
import java.util.*;
|
|
90
90
|
import java.util.function.Consumer;
|
|
91
|
-
<%_ if (
|
|
91
|
+
<%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%>
|
|
92
92
|
import java.util.stream.Collectors;
|
|
93
93
|
import java.util.stream.Stream;
|
|
94
94
|
<%_ } _%>
|
|
95
95
|
|
|
96
96
|
import static org.assertj.core.api.Assertions.assertThat;
|
|
97
|
-
<%_ if (reactive &&
|
|
97
|
+
<%_ if (reactive && searchEngineElasticsearch) { _%>
|
|
98
98
|
import static org.mockito.Mockito.*;
|
|
99
99
|
<%_ } _%>
|
|
100
100
|
<%_ if (!reactive) { _%>
|
|
101
|
-
<%_ if (
|
|
101
|
+
<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
|
|
102
102
|
import static org.hamcrest.Matchers.hasItems;
|
|
103
103
|
<%_ } _%>
|
|
104
104
|
import static org.hamcrest.Matchers.hasItem;
|
|
@@ -121,59 +121,59 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
|
|
|
121
121
|
<%_ } _%>
|
|
122
122
|
@WithMockUser(authorities = AuthoritiesConstants.ADMIN)
|
|
123
123
|
@IntegrationTest
|
|
124
|
-
class UserResourceIT <% if (
|
|
124
|
+
class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
|
|
125
125
|
|
|
126
126
|
private static final String DEFAULT_LOGIN = "johndoe";
|
|
127
|
-
|
|
127
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
128
128
|
private static final String UPDATED_LOGIN = "jhipster";
|
|
129
|
-
|
|
129
|
+
<%_ } _%>
|
|
130
130
|
|
|
131
|
-
|
|
131
|
+
<%_ if (databaseTypeCouchbase) { _%>
|
|
132
132
|
private static final String DEFAULT_ID = <%= asEntity('User') %>.PREFIX + DEFAULT_LOGIN;
|
|
133
|
-
|
|
133
|
+
<%_ } else { _%>
|
|
134
134
|
private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- getPrimaryKeyValue(user.primaryKey.type) %>;
|
|
135
|
-
|
|
136
|
-
|
|
135
|
+
<%_ } _%>
|
|
136
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
137
137
|
|
|
138
138
|
private static final String DEFAULT_PASSWORD = "passjohndoe";
|
|
139
139
|
private static final String UPDATED_PASSWORD = "passjhipster";
|
|
140
|
-
|
|
140
|
+
<%_ } _%>
|
|
141
141
|
|
|
142
142
|
private static final String DEFAULT_EMAIL = "johndoe@localhost";
|
|
143
|
-
|
|
143
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
144
144
|
private static final String UPDATED_EMAIL = "jhipster@localhost";
|
|
145
|
-
|
|
145
|
+
<%_ } _%>
|
|
146
146
|
|
|
147
147
|
private static final String DEFAULT_FIRSTNAME = "john";
|
|
148
|
-
|
|
148
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
149
149
|
private static final String UPDATED_FIRSTNAME = "jhipsterFirstName";
|
|
150
|
-
|
|
150
|
+
<%_ } _%>
|
|
151
151
|
|
|
152
152
|
private static final String DEFAULT_LASTNAME = "doe";
|
|
153
|
-
|
|
153
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
154
154
|
private static final String UPDATED_LASTNAME = "jhipsterLastName";
|
|
155
|
-
|
|
155
|
+
<%_ } _%>
|
|
156
156
|
|
|
157
|
-
|
|
157
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
158
158
|
private static final String DEFAULT_IMAGEURL = "http://placehold.it/50x50";
|
|
159
|
-
|
|
159
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
160
160
|
private static final String UPDATED_IMAGEURL = "http://placehold.it/40x40";
|
|
161
|
-
|
|
161
|
+
<%_ } _%>
|
|
162
162
|
|
|
163
|
-
|
|
163
|
+
<%_ } _%>
|
|
164
164
|
private static final String DEFAULT_LANGKEY = "en";
|
|
165
|
-
|
|
165
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
166
166
|
private static final String UPDATED_LANGKEY = "fr";
|
|
167
|
-
|
|
167
|
+
<%_ } _%>
|
|
168
168
|
|
|
169
169
|
@Autowired
|
|
170
170
|
private UserRepository userRepository;
|
|
171
|
-
|
|
171
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
172
172
|
|
|
173
173
|
@Autowired
|
|
174
174
|
private AuthorityRepository authorityRepository;
|
|
175
|
-
|
|
176
|
-
|
|
175
|
+
<%_ } _%>
|
|
176
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
177
177
|
|
|
178
178
|
/**
|
|
179
179
|
* This repository is mocked in the <%= packageName %>.repository.search test package.
|
|
@@ -182,74 +182,74 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
182
182
|
*/
|
|
183
183
|
@Autowired
|
|
184
184
|
private UserSearchRepository mockUserSearchRepository;
|
|
185
|
-
|
|
185
|
+
<%_ } _%>
|
|
186
186
|
|
|
187
187
|
@Autowired
|
|
188
188
|
private UserMapper userMapper;
|
|
189
|
-
|
|
189
|
+
<%_ if (databaseTypeSql) { _%>
|
|
190
190
|
|
|
191
191
|
@Autowired
|
|
192
192
|
private EntityManager em;
|
|
193
|
-
|
|
194
|
-
|
|
193
|
+
<%_ } _%>
|
|
194
|
+
<%_ if (cacheManagerIsAvailable) { _%>
|
|
195
195
|
|
|
196
196
|
@Autowired
|
|
197
197
|
private CacheManager cacheManager;
|
|
198
|
-
|
|
198
|
+
<%_ } _%>
|
|
199
199
|
|
|
200
200
|
@Autowired
|
|
201
|
-
|
|
201
|
+
<%_ if (reactive) { _%>
|
|
202
202
|
private WebTestClient webTestClient;
|
|
203
|
-
|
|
203
|
+
<%_ } else { _%>
|
|
204
204
|
private MockMvc restUserMockMvc;
|
|
205
|
-
|
|
205
|
+
<%_ } _%>
|
|
206
206
|
|
|
207
207
|
private <%= asEntity('User') %> user;
|
|
208
208
|
|
|
209
|
-
|
|
209
|
+
<%_ if (cacheManagerIsAvailable) { _%>
|
|
210
210
|
@BeforeEach
|
|
211
211
|
public void setup() {
|
|
212
212
|
cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear();
|
|
213
213
|
cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE).clear();
|
|
214
214
|
}
|
|
215
215
|
|
|
216
|
-
|
|
217
|
-
|
|
216
|
+
<%_ } _%>
|
|
217
|
+
<%_ if (reactive && testsNeedCsrf) { _%>
|
|
218
218
|
@BeforeEach
|
|
219
219
|
public void setupCsrf() {
|
|
220
220
|
webTestClient = webTestClient.mutateWith(csrf());
|
|
221
221
|
}
|
|
222
222
|
|
|
223
|
-
|
|
223
|
+
<%_ } _%>
|
|
224
224
|
/**
|
|
225
225
|
* Create a User.
|
|
226
226
|
*
|
|
227
227
|
* This is a static method, as tests for other entities might also need it,
|
|
228
228
|
* if they test an entity which has a required relationship to the User entity.
|
|
229
229
|
*/
|
|
230
|
-
public static <%= asEntity('User') %> createEntity(<% if (
|
|
230
|
+
public static <%= asEntity('User') %> createEntity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
|
|
231
231
|
<%= asEntity('User') %> user = new <%= asEntity('User') %>();
|
|
232
|
-
|
|
232
|
+
<%_ if (databaseTypeCassandra || (authenticationTypeOauth2 && !databaseTypeCouchbase)) { _%>
|
|
233
233
|
user.setId(UUID.randomUUID().toString());
|
|
234
|
-
|
|
235
|
-
user.setLogin(DEFAULT_LOGIN<% if (
|
|
236
|
-
|
|
234
|
+
<%_ } _%>
|
|
235
|
+
user.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
|
|
236
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
237
237
|
user.setPassword(RandomStringUtils.random(60));
|
|
238
|
-
|
|
238
|
+
<%_ } _%>
|
|
239
239
|
user.setActivated(true);
|
|
240
|
-
user.setEmail(<% if (
|
|
240
|
+
user.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
|
|
241
241
|
user.setFirstName(DEFAULT_FIRSTNAME);
|
|
242
242
|
user.setLastName(DEFAULT_LASTNAME);
|
|
243
|
-
|
|
243
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
244
244
|
user.setImageUrl(DEFAULT_IMAGEURL);
|
|
245
|
-
|
|
245
|
+
<%_ } _%>
|
|
246
246
|
user.setLangKey(DEFAULT_LANGKEY);
|
|
247
|
-
|
|
247
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
248
248
|
user.setCreatedBy(Constants.SYSTEM);
|
|
249
|
-
|
|
249
|
+
<%_ } _%>
|
|
250
250
|
return user;
|
|
251
251
|
}
|
|
252
|
-
|
|
252
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
253
253
|
|
|
254
254
|
/**
|
|
255
255
|
* Delete all the users from the database.
|
|
@@ -262,44 +262,44 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
262
262
|
// It can fail, if other entities are still referring this - it will be removed later.
|
|
263
263
|
}
|
|
264
264
|
}
|
|
265
|
-
|
|
265
|
+
<%_ } _%>
|
|
266
266
|
|
|
267
267
|
/**
|
|
268
268
|
* Setups the database with one user.
|
|
269
269
|
*/
|
|
270
|
-
public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (
|
|
271
|
-
|
|
270
|
+
public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql ) { %>, EntityManager em<% } _%>) {
|
|
271
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
272
272
|
userRepository.deleteAllUserAuthorities().block();
|
|
273
|
-
|
|
274
|
-
|
|
273
|
+
<%_ } _%>
|
|
274
|
+
<%_ if (!databaseTypeSql || reactive) { _%>
|
|
275
275
|
userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
|
|
276
|
-
|
|
277
|
-
<%= asEntity('User') %> user = createEntity(<% if (
|
|
278
|
-
|
|
276
|
+
<%_ } _%>
|
|
277
|
+
<%= asEntity('User') %> user = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
|
|
278
|
+
<%_ if (databaseTypeSql) { _%>
|
|
279
279
|
user.setLogin(DEFAULT_LOGIN);
|
|
280
280
|
user.setEmail(DEFAULT_EMAIL);
|
|
281
|
-
|
|
281
|
+
<%_ } _%>
|
|
282
282
|
return user;
|
|
283
283
|
}
|
|
284
284
|
|
|
285
285
|
@BeforeEach
|
|
286
286
|
public void initTest() {
|
|
287
|
-
user = initTestUser(userRepository<% if (
|
|
287
|
+
user = initTestUser(userRepository<% if (databaseTypeSql) { %>, em<% } _%>);
|
|
288
288
|
}
|
|
289
|
-
<%_ if (
|
|
289
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
290
290
|
|
|
291
291
|
@Test
|
|
292
|
-
|
|
292
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
293
293
|
@Transactional
|
|
294
|
-
|
|
294
|
+
<%_ } _%>
|
|
295
295
|
void createUser() throws Exception {
|
|
296
296
|
int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
|
|
297
297
|
.collectList().block()<% } %>.size();
|
|
298
|
-
|
|
298
|
+
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
299
299
|
// Configure the mock search repository
|
|
300
300
|
when(mockUserSearchRepository.save(any()))
|
|
301
301
|
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
302
|
-
|
|
302
|
+
<%_ } _%>
|
|
303
303
|
|
|
304
304
|
// Create the User
|
|
305
305
|
ManagedUserVM managedUserVM = new ManagedUserVM();
|
|
@@ -309,25 +309,25 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
309
309
|
managedUserVM.setLastName(DEFAULT_LASTNAME);
|
|
310
310
|
managedUserVM.setEmail(DEFAULT_EMAIL);
|
|
311
311
|
managedUserVM.setActivated(true);
|
|
312
|
-
|
|
312
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
313
313
|
managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
|
|
314
|
-
|
|
314
|
+
<%_ } _%>
|
|
315
315
|
managedUserVM.setLangKey(DEFAULT_LANGKEY);
|
|
316
316
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
317
317
|
|
|
318
|
-
|
|
318
|
+
<%_ if (!reactive) { _%>
|
|
319
319
|
restUserMockMvc.perform(post("/api/admin/users")
|
|
320
320
|
.contentType(MediaType.APPLICATION_JSON)
|
|
321
321
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
322
322
|
.with(csrf())<% } %>)
|
|
323
323
|
.andExpect(status().isCreated());
|
|
324
|
-
|
|
324
|
+
<%_ } else { _%>
|
|
325
325
|
webTestClient.post().uri("/api/admin/users")
|
|
326
326
|
.contentType(MediaType.APPLICATION_JSON)
|
|
327
327
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
328
328
|
.exchange()
|
|
329
329
|
.expectStatus().isCreated();
|
|
330
|
-
|
|
330
|
+
<%_ } _%>
|
|
331
331
|
|
|
332
332
|
// Validate the User in the database
|
|
333
333
|
assertPersistedUsers(users -> {
|
|
@@ -337,7 +337,7 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
337
337
|
assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
|
|
338
338
|
assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
|
|
339
339
|
assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
|
|
340
|
-
<%_ if (
|
|
340
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
341
341
|
assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
|
|
342
342
|
<%_ } _%>
|
|
343
343
|
assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
|
|
@@ -345,62 +345,62 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
345
345
|
}
|
|
346
346
|
|
|
347
347
|
@Test
|
|
348
|
-
|
|
348
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
349
349
|
@Transactional
|
|
350
|
-
|
|
350
|
+
<%_ } _%>
|
|
351
351
|
void createUserWithExistingId() throws Exception {
|
|
352
352
|
int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
|
|
353
353
|
.collectList().block()<% } %>.size();
|
|
354
354
|
|
|
355
355
|
ManagedUserVM managedUserVM = new ManagedUserVM();
|
|
356
|
-
|
|
356
|
+
<%_ if (databaseTypeCassandra) { _%>
|
|
357
357
|
managedUserVM.setId(UUID.randomUUID().toString());
|
|
358
|
-
|
|
358
|
+
<%_ } else if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
|
|
359
359
|
managedUserVM.setId("1L");
|
|
360
|
-
|
|
360
|
+
<%_ } else { _%>
|
|
361
361
|
managedUserVM.setId(DEFAULT_ID);
|
|
362
|
-
|
|
362
|
+
<%_ } _%>
|
|
363
363
|
managedUserVM.setLogin(DEFAULT_LOGIN);
|
|
364
364
|
managedUserVM.setPassword(DEFAULT_PASSWORD);
|
|
365
365
|
managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
|
|
366
366
|
managedUserVM.setLastName(DEFAULT_LASTNAME);
|
|
367
367
|
managedUserVM.setEmail(DEFAULT_EMAIL);
|
|
368
368
|
managedUserVM.setActivated(true);
|
|
369
|
-
|
|
369
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
370
370
|
managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
|
|
371
|
-
|
|
371
|
+
<%_ } _%>
|
|
372
372
|
managedUserVM.setLangKey(DEFAULT_LANGKEY);
|
|
373
373
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
374
374
|
|
|
375
375
|
// An entity with an existing ID cannot be created, so this API call must fail
|
|
376
|
-
|
|
376
|
+
<%_ if (!reactive) { _%>
|
|
377
377
|
restUserMockMvc.perform(post("/api/admin/users")
|
|
378
378
|
.contentType(MediaType.APPLICATION_JSON)
|
|
379
379
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
380
380
|
.with(csrf())<% } %>)
|
|
381
381
|
.andExpect(status().isBadRequest());
|
|
382
|
-
|
|
382
|
+
<%_ } else { _%>
|
|
383
383
|
webTestClient.post().uri("/api/admin/users")
|
|
384
384
|
.contentType(MediaType.APPLICATION_JSON)
|
|
385
385
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
386
386
|
.exchange()
|
|
387
387
|
.expectStatus().isBadRequest();
|
|
388
|
-
|
|
388
|
+
<%_ } _%>
|
|
389
389
|
|
|
390
390
|
// Validate the User in the database
|
|
391
391
|
assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
|
|
392
392
|
}
|
|
393
393
|
|
|
394
394
|
@Test
|
|
395
|
-
|
|
395
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
396
396
|
@Transactional
|
|
397
|
-
|
|
397
|
+
<%_ } _%>
|
|
398
398
|
void createUserWithExistingLogin() throws Exception {
|
|
399
399
|
// Initialize the database
|
|
400
|
-
userRepository.save<% if (
|
|
401
|
-
|
|
400
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
401
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
402
402
|
mockUserSearchRepository.save(user);
|
|
403
|
-
|
|
403
|
+
<%_ } _%>
|
|
404
404
|
int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
|
|
405
405
|
.collectList().block()<% } %>.size();
|
|
406
406
|
|
|
@@ -411,41 +411,41 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
411
411
|
managedUserVM.setLastName(DEFAULT_LASTNAME);
|
|
412
412
|
managedUserVM.setEmail("anothermail@localhost");
|
|
413
413
|
managedUserVM.setActivated(true);
|
|
414
|
-
|
|
414
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
415
415
|
managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
|
|
416
|
-
|
|
416
|
+
<%_ } _%>
|
|
417
417
|
managedUserVM.setLangKey(DEFAULT_LANGKEY);
|
|
418
418
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
419
419
|
|
|
420
420
|
// Create the User
|
|
421
|
-
|
|
421
|
+
<%_ if (!reactive) { _%>
|
|
422
422
|
restUserMockMvc.perform(post("/api/admin/users")
|
|
423
423
|
.contentType(MediaType.APPLICATION_JSON)
|
|
424
424
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
425
425
|
.with(csrf())<% } %>)
|
|
426
426
|
.andExpect(status().isBadRequest());
|
|
427
|
-
|
|
427
|
+
<%_ } else { _%>
|
|
428
428
|
webTestClient.post().uri("/api/admin/users")
|
|
429
429
|
.contentType(MediaType.APPLICATION_JSON)
|
|
430
430
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
431
431
|
.exchange()
|
|
432
432
|
.expectStatus().isBadRequest();
|
|
433
|
-
|
|
433
|
+
<%_ } _%>
|
|
434
434
|
|
|
435
435
|
// Validate the User in the database
|
|
436
436
|
assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
|
|
437
437
|
}
|
|
438
438
|
|
|
439
439
|
@Test
|
|
440
|
-
|
|
440
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
441
441
|
@Transactional
|
|
442
|
-
|
|
442
|
+
<%_ } _%>
|
|
443
443
|
void createUserWithExistingEmail() throws Exception {
|
|
444
444
|
// Initialize the database
|
|
445
|
-
userRepository.save<% if (
|
|
446
|
-
|
|
445
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
446
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
447
447
|
mockUserSearchRepository.save(user);
|
|
448
|
-
|
|
448
|
+
<%_ } _%>
|
|
449
449
|
int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
|
|
450
450
|
.collectList().block()<% } %>.size();
|
|
451
451
|
|
|
@@ -456,26 +456,26 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
456
456
|
managedUserVM.setLastName(DEFAULT_LASTNAME);
|
|
457
457
|
managedUserVM.setEmail(DEFAULT_EMAIL);// this email should already be used
|
|
458
458
|
managedUserVM.setActivated(true);
|
|
459
|
-
|
|
459
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
460
460
|
managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
|
|
461
|
-
|
|
461
|
+
<%_ } _%>
|
|
462
462
|
managedUserVM.setLangKey(DEFAULT_LANGKEY);
|
|
463
463
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
464
464
|
|
|
465
465
|
// Create the User
|
|
466
|
-
|
|
466
|
+
<%_ if (!reactive) { _%>
|
|
467
467
|
restUserMockMvc.perform(post("/api/admin/users")
|
|
468
468
|
.contentType(MediaType.APPLICATION_JSON)
|
|
469
469
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
470
470
|
.with(csrf())<% } %>)
|
|
471
471
|
.andExpect(status().isBadRequest());
|
|
472
|
-
|
|
472
|
+
<%_ } else { _%>
|
|
473
473
|
webTestClient.post().uri("/api/admin/users")
|
|
474
474
|
.contentType(MediaType.APPLICATION_JSON)
|
|
475
475
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
476
476
|
.exchange()
|
|
477
477
|
.expectStatus().isBadRequest();
|
|
478
|
-
|
|
478
|
+
<%_ } _%>
|
|
479
479
|
|
|
480
480
|
// Validate the User in the database
|
|
481
481
|
assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
|
|
@@ -483,22 +483,22 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
483
483
|
<%_ } _%>
|
|
484
484
|
|
|
485
485
|
@Test
|
|
486
|
-
|
|
486
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
487
487
|
@Transactional
|
|
488
|
-
|
|
488
|
+
<%_ } _%>
|
|
489
489
|
void getAllUsers()<% if (!reactive) { %> throws Exception<% } %> {
|
|
490
490
|
// Initialize the database
|
|
491
|
-
userRepository.<% if (
|
|
492
|
-
|
|
491
|
+
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
492
|
+
<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
|
|
493
493
|
authorityRepository
|
|
494
494
|
.findById(AuthoritiesConstants.USER)
|
|
495
495
|
.flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
|
|
496
496
|
.block();
|
|
497
|
-
|
|
497
|
+
<%_ } _%>
|
|
498
498
|
|
|
499
499
|
// Get all the users
|
|
500
|
-
|
|
501
|
-
restUserMockMvc.perform(get("/api/admin/users<% if (
|
|
500
|
+
<%_ if (!reactive) { _%>
|
|
501
|
+
restUserMockMvc.perform(get("/api/admin/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
|
|
502
502
|
.accept(MediaType.APPLICATION_JSON))
|
|
503
503
|
.andExpect(status().isOk())
|
|
504
504
|
.andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
|
|
@@ -506,11 +506,11 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
506
506
|
.andExpect(jsonPath("$.[*].firstName").value(hasItem(DEFAULT_FIRSTNAME)))
|
|
507
507
|
.andExpect(jsonPath("$.[*].lastName").value(hasItem(DEFAULT_LASTNAME)))
|
|
508
508
|
.andExpect(jsonPath("$.[*].email").value(hasItem(DEFAULT_EMAIL)))
|
|
509
|
-
|
|
509
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
510
510
|
.andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
|
|
511
|
-
|
|
511
|
+
<%_ } _%>
|
|
512
512
|
.andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
|
|
513
|
-
|
|
513
|
+
<%_ } else { _%>
|
|
514
514
|
<%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,DESC")
|
|
515
515
|
.accept(MediaType.APPLICATION_JSON)
|
|
516
516
|
.exchange()
|
|
@@ -522,40 +522,40 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
522
522
|
assertThat(foundUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
|
|
523
523
|
assertThat(foundUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
|
|
524
524
|
assertThat(foundUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
|
|
525
|
-
|
|
525
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
526
526
|
assertThat(foundUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
|
|
527
|
-
|
|
527
|
+
<%_ } _%>
|
|
528
528
|
assertThat(foundUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
|
|
529
|
-
|
|
529
|
+
<%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
|
|
530
530
|
assertThat(foundUser.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
|
|
531
|
-
|
|
532
|
-
|
|
531
|
+
<%_ } _%>
|
|
532
|
+
<%_ } _%>
|
|
533
533
|
}
|
|
534
534
|
|
|
535
535
|
@Test
|
|
536
|
-
|
|
536
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
537
537
|
@Transactional
|
|
538
|
-
|
|
538
|
+
<%_ } _%>
|
|
539
539
|
void getUser()<% if (!reactive) { %> throws Exception<% } %> {
|
|
540
540
|
// Initialize the database
|
|
541
|
-
userRepository.<% if (
|
|
542
|
-
|
|
541
|
+
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
542
|
+
<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
|
|
543
543
|
authorityRepository
|
|
544
544
|
.findById(AuthoritiesConstants.USER)
|
|
545
545
|
.flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
|
|
546
546
|
.block();
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
547
|
+
<%_ } _%>
|
|
548
|
+
|
|
549
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
550
550
|
mockUserSearchRepository.save(user);
|
|
551
|
-
|
|
552
|
-
|
|
551
|
+
<%_ } _%>
|
|
552
|
+
<%_ if (cacheManagerIsAvailable) { _%>
|
|
553
553
|
|
|
554
554
|
assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
|
|
555
|
-
|
|
555
|
+
<%_ } _%>
|
|
556
556
|
|
|
557
557
|
// Get the user
|
|
558
|
-
|
|
558
|
+
<%_ if (!reactive) { _%>
|
|
559
559
|
restUserMockMvc.perform(get("/api/admin/users/{login}", user.getLogin()))
|
|
560
560
|
.andExpect(status().isOk())
|
|
561
561
|
.andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
|
|
@@ -563,11 +563,11 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
563
563
|
.andExpect(jsonPath("$.firstName").value(DEFAULT_FIRSTNAME))
|
|
564
564
|
.andExpect(jsonPath("$.lastName").value(DEFAULT_LASTNAME))
|
|
565
565
|
.andExpect(jsonPath("$.email").value(DEFAULT_EMAIL))
|
|
566
|
-
|
|
566
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
567
567
|
.andExpect(jsonPath("$.imageUrl").value(DEFAULT_IMAGEURL))
|
|
568
|
-
|
|
568
|
+
<%_ } _%>
|
|
569
569
|
.andExpect(jsonPath("$.langKey").value(DEFAULT_LANGKEY));
|
|
570
|
-
|
|
570
|
+
<%_ } else { _%>
|
|
571
571
|
webTestClient.get().uri("/api/admin/users/{login}", user.getLogin())
|
|
572
572
|
.exchange()
|
|
573
573
|
.expectStatus().isOk()
|
|
@@ -577,52 +577,54 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
577
577
|
.jsonPath("$.firstName").isEqualTo(DEFAULT_FIRSTNAME)
|
|
578
578
|
.jsonPath("$.lastName").isEqualTo(DEFAULT_LASTNAME)
|
|
579
579
|
.jsonPath("$.email").isEqualTo(DEFAULT_EMAIL)
|
|
580
|
-
|
|
580
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
581
581
|
.jsonPath("$.imageUrl").isEqualTo(DEFAULT_IMAGEURL)
|
|
582
|
-
|
|
583
|
-
.jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<%
|
|
582
|
+
<%_ } _%>
|
|
583
|
+
.jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<%
|
|
584
|
+
if (!databaseTypeSql || applicationTypeMicroservice) { %>;
|
|
585
|
+
<%_ } else { _%>
|
|
584
586
|
.jsonPath("$.authorities")
|
|
585
587
|
.isEqualTo(AuthoritiesConstants.USER);
|
|
586
588
|
<% } %>
|
|
587
|
-
|
|
589
|
+
<%_ } _%>
|
|
588
590
|
|
|
589
|
-
|
|
591
|
+
<%_ if (cacheProviderMemcached) { _%>
|
|
590
592
|
if (!(cacheManager instanceof NoOpCacheManager)) {
|
|
591
593
|
assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
|
|
592
594
|
}
|
|
593
|
-
|
|
595
|
+
<%_ } else if (cacheManagerIsAvailable) { _%>
|
|
594
596
|
assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
|
|
595
|
-
|
|
597
|
+
<%_ } _%>
|
|
596
598
|
}
|
|
597
599
|
|
|
598
600
|
@Test
|
|
599
|
-
|
|
601
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
600
602
|
@Transactional
|
|
601
|
-
|
|
603
|
+
<%_ } _%>
|
|
602
604
|
void getNonExistingUser()<% if (!reactive) { %> throws Exception<% } %> {
|
|
603
|
-
|
|
605
|
+
<%_ if (!reactive) { _%>
|
|
604
606
|
restUserMockMvc.perform(get("/api/admin/users/unknown"))
|
|
605
607
|
.andExpect(status().isNotFound());
|
|
606
|
-
|
|
608
|
+
<%_ } else { _%>
|
|
607
609
|
webTestClient.get().uri("/api/admin/users/unknown")
|
|
608
610
|
.exchange()
|
|
609
611
|
.expectStatus().isNotFound();
|
|
610
|
-
|
|
612
|
+
<%_ } _%>
|
|
611
613
|
}
|
|
612
|
-
<%_ if (
|
|
614
|
+
<%_ if (!authenticationTypeOauth2) { _%>
|
|
613
615
|
|
|
614
616
|
@Test
|
|
615
|
-
|
|
617
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
616
618
|
@Transactional
|
|
617
|
-
|
|
619
|
+
<%_ } _%>
|
|
618
620
|
void updateUser() throws Exception {
|
|
619
621
|
// Initialize the database
|
|
620
|
-
userRepository.save<% if (
|
|
621
|
-
|
|
622
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
623
|
+
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
622
624
|
// Configure the mock search repository
|
|
623
625
|
when(mockUserSearchRepository.save(any()))
|
|
624
626
|
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
625
|
-
|
|
627
|
+
<%_ } _%>
|
|
626
628
|
int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
|
|
627
629
|
.collectList().block()<% } %>.size();
|
|
628
630
|
|
|
@@ -637,31 +639,31 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
637
639
|
managedUserVM.setLastName(UPDATED_LASTNAME);
|
|
638
640
|
managedUserVM.setEmail(UPDATED_EMAIL);
|
|
639
641
|
managedUserVM.setActivated(updatedUser.isActivated());
|
|
640
|
-
|
|
642
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
641
643
|
managedUserVM.setImageUrl(UPDATED_IMAGEURL);
|
|
642
|
-
|
|
644
|
+
<%_ } _%>
|
|
643
645
|
managedUserVM.setLangKey(UPDATED_LANGKEY);
|
|
644
|
-
|
|
646
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
645
647
|
managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
|
|
646
648
|
managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
|
|
647
649
|
managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
|
|
648
650
|
managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
|
|
649
|
-
|
|
651
|
+
<%_ } _%>
|
|
650
652
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
651
653
|
|
|
652
|
-
|
|
654
|
+
<%_ if (!reactive) { _%>
|
|
653
655
|
restUserMockMvc.perform(put("/api/admin/users")
|
|
654
656
|
.contentType(MediaType.APPLICATION_JSON)
|
|
655
657
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
656
658
|
.with(csrf())<% } %>)
|
|
657
659
|
.andExpect(status().isOk());
|
|
658
|
-
|
|
660
|
+
<%_ } else { _%>
|
|
659
661
|
webTestClient.put().uri("/api/admin/users")
|
|
660
662
|
.contentType(MediaType.APPLICATION_JSON)
|
|
661
663
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
662
664
|
.exchange()
|
|
663
665
|
.expectStatus().isOk();
|
|
664
|
-
|
|
666
|
+
<%_ } _%>
|
|
665
667
|
|
|
666
668
|
// Validate the User in the database
|
|
667
669
|
assertPersistedUsers(users -> {
|
|
@@ -670,25 +672,25 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
670
672
|
assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
|
|
671
673
|
assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
|
|
672
674
|
assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
|
|
673
|
-
|
|
675
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
674
676
|
assertThat(testUser.getImageUrl()).isEqualTo(UPDATED_IMAGEURL);
|
|
675
|
-
|
|
677
|
+
<%_ } _%>
|
|
676
678
|
assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
|
|
677
679
|
});
|
|
678
680
|
}
|
|
679
681
|
|
|
680
682
|
@Test
|
|
681
|
-
|
|
683
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
682
684
|
@Transactional
|
|
683
|
-
|
|
685
|
+
<%_ } _%>
|
|
684
686
|
void updateUserLogin() throws Exception {
|
|
685
687
|
// Initialize the database
|
|
686
|
-
userRepository.save<% if (
|
|
687
|
-
|
|
688
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
689
|
+
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
688
690
|
// Configure the mock search repository
|
|
689
691
|
when(mockUserSearchRepository.save(any()))
|
|
690
692
|
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
|
|
691
|
-
|
|
693
|
+
<%_ } _%>
|
|
692
694
|
int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
|
|
693
695
|
.collectList().block()<% } %>.size();
|
|
694
696
|
|
|
@@ -703,31 +705,31 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
703
705
|
managedUserVM.setLastName(UPDATED_LASTNAME);
|
|
704
706
|
managedUserVM.setEmail(UPDATED_EMAIL);
|
|
705
707
|
managedUserVM.setActivated(updatedUser.isActivated());
|
|
706
|
-
|
|
708
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
707
709
|
managedUserVM.setImageUrl(UPDATED_IMAGEURL);
|
|
708
|
-
|
|
710
|
+
<%_ } _%>
|
|
709
711
|
managedUserVM.setLangKey(UPDATED_LANGKEY);
|
|
710
|
-
|
|
712
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
711
713
|
managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
|
|
712
714
|
managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
|
|
713
715
|
managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
|
|
714
716
|
managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
|
|
715
|
-
|
|
717
|
+
<%_ } _%>
|
|
716
718
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
717
719
|
|
|
718
|
-
|
|
720
|
+
<%_ if (!reactive) { _%>
|
|
719
721
|
restUserMockMvc.perform(put("/api/admin/users")
|
|
720
722
|
.contentType(MediaType.APPLICATION_JSON)
|
|
721
723
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
722
724
|
.with(csrf())<% } %>)
|
|
723
725
|
.andExpect(status().isOk());
|
|
724
|
-
|
|
726
|
+
<%_ } else { _%>
|
|
725
727
|
webTestClient.put().uri("/api/admin/users")
|
|
726
728
|
.contentType(MediaType.APPLICATION_JSON)
|
|
727
729
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
728
730
|
.exchange()
|
|
729
731
|
.expectStatus().isOk();
|
|
730
|
-
|
|
732
|
+
<%_ } _%>
|
|
731
733
|
|
|
732
734
|
// Validate the User in the database
|
|
733
735
|
assertPersistedUsers(users -> {
|
|
@@ -737,45 +739,45 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
737
739
|
assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
|
|
738
740
|
assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
|
|
739
741
|
assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
|
|
740
|
-
|
|
742
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
741
743
|
assertThat(testUser.getImageUrl()).isEqualTo(UPDATED_IMAGEURL);
|
|
742
|
-
|
|
744
|
+
<%_ } _%>
|
|
743
745
|
assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
|
|
744
746
|
});
|
|
745
747
|
}
|
|
746
748
|
|
|
747
749
|
@Test
|
|
748
|
-
|
|
750
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
749
751
|
@Transactional
|
|
750
|
-
|
|
752
|
+
<%_ } _%>
|
|
751
753
|
void updateUserExistingEmail() throws Exception {
|
|
752
754
|
// Initialize the database with 2 users
|
|
753
|
-
userRepository.save<% if (
|
|
754
|
-
|
|
755
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
756
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
755
757
|
mockUserSearchRepository.save(user);
|
|
756
|
-
|
|
758
|
+
<%_ } _%>
|
|
757
759
|
|
|
758
760
|
<%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
|
|
759
|
-
|
|
761
|
+
<%_ if (databaseTypeCassandra) { _%>
|
|
760
762
|
anotherUser.setId(UUID.randomUUID().toString());
|
|
761
|
-
|
|
763
|
+
<%_ } _%>
|
|
762
764
|
anotherUser.setLogin("jhipster");
|
|
763
765
|
anotherUser.setPassword(RandomStringUtils.random(60));
|
|
764
766
|
anotherUser.setActivated(true);
|
|
765
767
|
anotherUser.setEmail("jhipster@localhost");
|
|
766
768
|
anotherUser.setFirstName("java");
|
|
767
769
|
anotherUser.setLastName("hipster");
|
|
768
|
-
|
|
770
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
769
771
|
anotherUser.setImageUrl("");
|
|
770
|
-
|
|
772
|
+
<%_ } _%>
|
|
771
773
|
anotherUser.setLangKey("en");
|
|
772
|
-
|
|
774
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
773
775
|
anotherUser.setCreatedBy(Constants.SYSTEM);
|
|
774
|
-
|
|
775
|
-
userRepository.save<% if (
|
|
776
|
-
|
|
776
|
+
<%_ } _%>
|
|
777
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
|
|
778
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
777
779
|
mockUserSearchRepository.save(anotherUser);
|
|
778
|
-
|
|
780
|
+
<%_ } _%>
|
|
779
781
|
|
|
780
782
|
// Update the user
|
|
781
783
|
<%= asEntity('User') %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
|
|
@@ -788,65 +790,65 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
788
790
|
managedUserVM.setLastName(updatedUser.getLastName());
|
|
789
791
|
managedUserVM.setEmail("jhipster@localhost");// this email should already be used by anotherUser
|
|
790
792
|
managedUserVM.setActivated(updatedUser.isActivated());
|
|
791
|
-
|
|
793
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
792
794
|
managedUserVM.setImageUrl(updatedUser.getImageUrl());
|
|
793
|
-
|
|
795
|
+
<%_ } _%>
|
|
794
796
|
managedUserVM.setLangKey(updatedUser.getLangKey());
|
|
795
|
-
|
|
797
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
796
798
|
managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
|
|
797
799
|
managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
|
|
798
800
|
managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
|
|
799
801
|
managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
|
|
800
|
-
|
|
802
|
+
<%_ } _%>
|
|
801
803
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
802
804
|
|
|
803
|
-
|
|
805
|
+
<%_ if (!reactive) { _%>
|
|
804
806
|
restUserMockMvc.perform(put("/api/admin/users")
|
|
805
807
|
.contentType(MediaType.APPLICATION_JSON)
|
|
806
808
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
807
809
|
.with(csrf())<% } %>)
|
|
808
810
|
.andExpect(status().isBadRequest());
|
|
809
|
-
|
|
811
|
+
<%_ } else { _%>
|
|
810
812
|
webTestClient.put().uri("/api/admin/users")
|
|
811
813
|
.contentType(MediaType.APPLICATION_JSON)
|
|
812
814
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
813
815
|
.exchange()
|
|
814
816
|
.expectStatus().isBadRequest();
|
|
815
|
-
|
|
817
|
+
<%_ } _%>
|
|
816
818
|
}
|
|
817
819
|
|
|
818
820
|
@Test
|
|
819
|
-
|
|
821
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
820
822
|
@Transactional
|
|
821
|
-
|
|
823
|
+
<%_ } _%>
|
|
822
824
|
void updateUserExistingLogin() throws Exception {
|
|
823
825
|
// Initialize the database
|
|
824
|
-
userRepository.save<% if (
|
|
825
|
-
|
|
826
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
827
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
826
828
|
mockUserSearchRepository.save(user);
|
|
827
|
-
|
|
829
|
+
<%_ } _%>
|
|
828
830
|
|
|
829
831
|
<%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
|
|
830
|
-
|
|
832
|
+
<%_ if (databaseTypeCassandra) { _%>
|
|
831
833
|
anotherUser.setId(UUID.randomUUID().toString());
|
|
832
|
-
|
|
834
|
+
<%_ } _%>
|
|
833
835
|
anotherUser.setLogin("jhipster");
|
|
834
836
|
anotherUser.setPassword(RandomStringUtils.random(60));
|
|
835
837
|
anotherUser.setActivated(true);
|
|
836
838
|
anotherUser.setEmail("jhipster@localhost");
|
|
837
839
|
anotherUser.setFirstName("java");
|
|
838
840
|
anotherUser.setLastName("hipster");
|
|
839
|
-
|
|
841
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
840
842
|
anotherUser.setImageUrl("");
|
|
841
|
-
|
|
843
|
+
<%_ } _%>
|
|
842
844
|
anotherUser.setLangKey("en");
|
|
843
|
-
|
|
845
|
+
<%_ if (databaseTypeSql && reactive) { _%>
|
|
844
846
|
anotherUser.setCreatedBy(Constants.SYSTEM);
|
|
845
|
-
|
|
846
|
-
userRepository.save<% if (
|
|
847
|
-
|
|
847
|
+
<%_ } _%>
|
|
848
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
|
|
849
|
+
<%_ if (searchEngineElasticsearch) { _%>
|
|
848
850
|
mockUserSearchRepository.save(anotherUser);
|
|
849
|
-
|
|
851
|
+
<%_ } _%>
|
|
850
852
|
|
|
851
853
|
// Update the user
|
|
852
854
|
<%= asEntity('User') %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
|
|
@@ -859,68 +861,68 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
859
861
|
managedUserVM.setLastName(updatedUser.getLastName());
|
|
860
862
|
managedUserVM.setEmail(updatedUser.getEmail());
|
|
861
863
|
managedUserVM.setActivated(updatedUser.isActivated());
|
|
862
|
-
|
|
864
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
863
865
|
managedUserVM.setImageUrl(updatedUser.getImageUrl());
|
|
864
|
-
|
|
866
|
+
<%_ } _%>
|
|
865
867
|
managedUserVM.setLangKey(updatedUser.getLangKey());
|
|
866
|
-
|
|
868
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
867
869
|
managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
|
|
868
870
|
managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
|
|
869
871
|
managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
|
|
870
872
|
managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
|
|
871
|
-
|
|
873
|
+
<%_ } _%>
|
|
872
874
|
managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
873
875
|
|
|
874
|
-
|
|
876
|
+
<%_ if (!reactive) { _%>
|
|
875
877
|
restUserMockMvc.perform(put("/api/admin/users")
|
|
876
878
|
.contentType(MediaType.APPLICATION_JSON)
|
|
877
879
|
.content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
|
|
878
880
|
.with(csrf())<% } %>)
|
|
879
881
|
.andExpect(status().isBadRequest());
|
|
880
|
-
|
|
882
|
+
<%_ } else { _%>
|
|
881
883
|
webTestClient.put().uri("/api/admin/users")
|
|
882
884
|
.contentType(MediaType.APPLICATION_JSON)
|
|
883
885
|
.bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
|
|
884
886
|
.exchange()
|
|
885
887
|
.expectStatus().isBadRequest();
|
|
886
|
-
|
|
888
|
+
<%_ } _%>
|
|
887
889
|
}
|
|
888
890
|
|
|
889
891
|
@Test
|
|
890
|
-
|
|
892
|
+
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
891
893
|
@Transactional
|
|
892
|
-
|
|
894
|
+
<%_ } _%>
|
|
893
895
|
void deleteUser()<% if (!reactive) { %> throws Exception<% } %> {
|
|
894
896
|
// Initialize the database
|
|
895
|
-
userRepository.save<% if (
|
|
896
|
-
|
|
897
|
+
userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
|
|
898
|
+
<%_ if (searchEngineElasticsearch && reactive) { _%>
|
|
897
899
|
// Configure the mock search repository
|
|
898
900
|
when(mockUserSearchRepository.delete(any())).thenReturn(Mono.empty());
|
|
899
|
-
|
|
901
|
+
<%_ } _%>
|
|
900
902
|
int databaseSizeBeforeDelete = userRepository.findAll()<% if (reactive) { %>
|
|
901
903
|
.collectList().block()<% } %>.size();
|
|
902
904
|
|
|
903
905
|
// Delete the user
|
|
904
|
-
|
|
906
|
+
<%_ if (!reactive) { _%>
|
|
905
907
|
restUserMockMvc.perform(delete("/api/admin/users/{login}", user.getLogin())
|
|
906
908
|
.accept(MediaType.APPLICATION_JSON)<% if (testsNeedCsrf) { %>
|
|
907
909
|
.with(csrf())<% } %>)
|
|
908
910
|
.andExpect(status().isNoContent());
|
|
909
|
-
|
|
911
|
+
<%_ } else { _%>
|
|
910
912
|
webTestClient.delete().uri("/api/admin/users/{login}", user.getLogin())
|
|
911
913
|
.accept(MediaType.APPLICATION_JSON)
|
|
912
914
|
.exchange()
|
|
913
915
|
.expectStatus().isNoContent();
|
|
914
|
-
|
|
915
|
-
|
|
916
|
+
<%_ } _%>
|
|
917
|
+
<%_ if (cacheManagerIsAvailable) { _%>
|
|
916
918
|
|
|
917
919
|
assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
|
|
918
|
-
|
|
920
|
+
<%_ } _%>
|
|
919
921
|
|
|
920
922
|
// Validate the database is empty
|
|
921
923
|
assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeDelete - 1));
|
|
922
924
|
}
|
|
923
|
-
|
|
925
|
+
<%_ } _%>
|
|
924
926
|
|
|
925
927
|
@Test
|
|
926
928
|
void testUserEquals() throws Exception {
|
|
@@ -945,14 +947,14 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
945
947
|
userDTO.setLastName(DEFAULT_LASTNAME);
|
|
946
948
|
userDTO.setEmail(DEFAULT_EMAIL);
|
|
947
949
|
userDTO.setActivated(true);
|
|
948
|
-
|
|
950
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
949
951
|
userDTO.setImageUrl(DEFAULT_IMAGEURL);
|
|
950
|
-
|
|
952
|
+
<%_ } _%>
|
|
951
953
|
userDTO.setLangKey(DEFAULT_LANGKEY);
|
|
952
|
-
|
|
954
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
953
955
|
userDTO.setCreatedBy(DEFAULT_LOGIN);
|
|
954
956
|
userDTO.setLastModifiedBy(DEFAULT_LOGIN);
|
|
955
|
-
|
|
957
|
+
<%_ } _%>
|
|
956
958
|
userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
|
|
957
959
|
|
|
958
960
|
<%= asEntity('User') %> user = userMapper.userDTOToUser(userDTO);
|
|
@@ -962,37 +964,37 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
962
964
|
assertThat(user.getLastName()).isEqualTo(DEFAULT_LASTNAME);
|
|
963
965
|
assertThat(user.getEmail()).isEqualTo(DEFAULT_EMAIL);
|
|
964
966
|
assertThat(user.isActivated()).isTrue();
|
|
965
|
-
|
|
967
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
966
968
|
assertThat(user.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
|
|
967
|
-
|
|
969
|
+
<%_ } _%>
|
|
968
970
|
assertThat(user.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
|
|
969
|
-
|
|
971
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
970
972
|
assertThat(user.getCreatedBy()).isNull();
|
|
971
973
|
assertThat(user.getCreatedDate()).isNotNull();
|
|
972
974
|
assertThat(user.getLastModifiedBy()).isNull();
|
|
973
975
|
assertThat(user.getLastModifiedDate()).isNotNull();
|
|
974
|
-
|
|
975
|
-
assertThat(user.getAuthorities())<% if (
|
|
976
|
+
<%_ } _%>
|
|
977
|
+
assertThat(user.getAuthorities())<% if (!databaseTypeCassandra && !databaseTypeCouchbase) { %>.extracting("name")<%_ } _%>.containsExactly(AuthoritiesConstants.USER);
|
|
976
978
|
}
|
|
977
979
|
|
|
978
980
|
@Test
|
|
979
981
|
void testUserToUserDTO() {
|
|
980
982
|
user.setId(DEFAULT_ID);
|
|
981
|
-
|
|
983
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
982
984
|
user.setCreatedBy(DEFAULT_LOGIN);
|
|
983
985
|
user.setCreatedDate(Instant.now());
|
|
984
986
|
user.setLastModifiedBy(DEFAULT_LOGIN);
|
|
985
987
|
user.setLastModifiedDate(Instant.now());
|
|
986
|
-
|
|
987
|
-
|
|
988
|
+
<%_ } _%>
|
|
989
|
+
<%_ if (!databaseTypeCassandra && !databaseTypeCouchbase) { _%>
|
|
988
990
|
Set<Authority> authorities = new HashSet<>();
|
|
989
991
|
Authority authority = new Authority();
|
|
990
992
|
authority.setName(AuthoritiesConstants.USER);
|
|
991
993
|
authorities.add(authority);
|
|
992
994
|
user.setAuthorities(authorities);
|
|
993
|
-
|
|
995
|
+
<%_ } else { _%>
|
|
994
996
|
user.setAuthorities(Stream.of(AuthoritiesConstants.USER).collect(Collectors.toSet()));
|
|
995
|
-
|
|
997
|
+
<%_ } _%>
|
|
996
998
|
|
|
997
999
|
<%= asDto('AdminUser') %> userDTO = userMapper.userToAdminUserDTO(user);
|
|
998
1000
|
|
|
@@ -1002,20 +1004,20 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
1002
1004
|
assertThat(userDTO.getLastName()).isEqualTo(DEFAULT_LASTNAME);
|
|
1003
1005
|
assertThat(userDTO.getEmail()).isEqualTo(DEFAULT_EMAIL);
|
|
1004
1006
|
assertThat(userDTO.isActivated()).isTrue();
|
|
1005
|
-
|
|
1007
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
1006
1008
|
assertThat(userDTO.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
|
|
1007
|
-
|
|
1009
|
+
<%_ } _%>
|
|
1008
1010
|
assertThat(userDTO.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
|
|
1009
|
-
|
|
1011
|
+
<%_ if (!databaseTypeCassandra) { _%>
|
|
1010
1012
|
assertThat(userDTO.getCreatedBy()).isEqualTo(DEFAULT_LOGIN);
|
|
1011
1013
|
assertThat(userDTO.getCreatedDate()).isEqualTo(user.getCreatedDate());
|
|
1012
1014
|
assertThat(userDTO.getLastModifiedBy()).isEqualTo(DEFAULT_LOGIN);
|
|
1013
1015
|
assertThat(userDTO.getLastModifiedDate()).isEqualTo(user.getLastModifiedDate());
|
|
1014
|
-
|
|
1016
|
+
<%_ } _%>
|
|
1015
1017
|
assertThat(userDTO.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
|
|
1016
1018
|
assertThat(userDTO.toString()).isNotNull();
|
|
1017
1019
|
}
|
|
1018
|
-
|
|
1020
|
+
<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
|
|
1019
1021
|
|
|
1020
1022
|
@Test
|
|
1021
1023
|
void testAuthorityEquals() {
|
|
@@ -1040,13 +1042,13 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
|
|
|
1040
1042
|
.isEqualTo(authorityB)
|
|
1041
1043
|
.hasSameHashCodeAs(authorityB);
|
|
1042
1044
|
}
|
|
1043
|
-
|
|
1045
|
+
<%_ } _%>
|
|
1044
1046
|
|
|
1045
1047
|
private void assertPersistedUsers(Consumer<List<<%= asEntity('User') %>>> userAssertion) {
|
|
1046
|
-
|
|
1048
|
+
<%_ if (databaseTypeCouchbase) { _%>
|
|
1047
1049
|
// The security filter chain clears the security context after remote calls
|
|
1048
1050
|
SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
|
|
1049
|
-
|
|
1051
|
+
<%_ } _%>
|
|
1050
1052
|
userAssertion.accept(userRepository.findAll()<% if (reactive) { %>.collectList().block()<% } %>);
|
|
1051
1053
|
}
|
|
1052
1054
|
}
|