generator-jhipster 8.6.0 → 8.7.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/dist/cli/download.mjs +1 -1
- package/dist/cli/environment-builder.mjs +3 -7
- package/dist/cli/program.mjs +6 -11
- package/dist/cli/utils.mjs +1 -2
- package/dist/generators/angular/cleanup.js +0 -1
- package/dist/generators/angular/files-angular.js +2 -2
- package/dist/generators/angular/generator.js +27 -9
- package/dist/generators/angular/resources/package.json +17 -15
- package/dist/generators/angular/support/path-utils.js +0 -1
- package/dist/generators/angular/templates/eslint.config.js.jhi.angular.ejs +141 -0
- package/dist/generators/angular/templates/jest.conf.js.ejs +4 -2
- package/dist/generators/angular/templates/package.json.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +9 -9
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +16 -18
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +6 -8
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +17 -14
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs +7 -9
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs +4 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +13 -11
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +42 -49
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +1 -3
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +42 -37
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +7 -13
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs +6 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +16 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/admin.routes.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +7 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs +3 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs +10 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +44 -40
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +7 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +14 -16
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +10 -10
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +18 -21
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +42 -42
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +60 -56
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +24 -24
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +85 -83
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +85 -61
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs +88 -95
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +34 -27
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +42 -41
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +9 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs +8 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +8 -10
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +13 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +12 -14
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +17 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs +8 -11
- package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +6 -4
- package/dist/generators/angular/templates/src/main/webapp/app/app.routes.ts.ejs +3 -8
- package/dist/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +6 -4
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +25 -25
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.ts.ejs +5 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs +5 -10
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +18 -18
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +8 -7
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.route.ts.ejs +3 -5
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +22 -29
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +7 -9
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs +15 -17
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.model.ts.ejs +5 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +7 -9
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs +10 -7
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +18 -18
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs +7 -5
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs +6 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +4 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/content/scss/global.scss.ejs +3 -4
- package/dist/generators/angular/templates/src/main/webapp/main.ts.ejs +1 -1
- package/dist/generators/angular/templates/webpack/environment.js.ejs +1 -1
- package/dist/generators/angular/templates/webpack/proxy.conf.js.ejs +1 -2
- package/dist/generators/angular/templates/webpack/webpack.custom.js.ejs +14 -10
- package/dist/generators/angular/templates/webpack/webpack.microfrontend.js.ejs +1 -1
- package/dist/generators/app/generator.js +3 -21
- package/dist/generators/base/generator.js +10 -3
- package/dist/generators/base/internal/blueprint.js +1 -1
- package/dist/generators/base/support/config.js +0 -2
- package/dist/generators/base/support/configuration-helpers/options.js +0 -1
- package/dist/generators/base/support/contents.js +0 -2
- package/dist/generators/base/support/faker.js +1 -5
- package/dist/generators/base/support/index.js +1 -1
- package/dist/generators/base/support/jhipster7-context.js +29 -8
- package/dist/generators/base/support/namespace.js +0 -1
- package/dist/generators/base/support/path.js +0 -1
- package/dist/generators/base/support/string.js +2 -2
- package/dist/generators/base/support/write-files.js +0 -1
- package/dist/generators/base-application/generator.js +2 -3
- package/dist/generators/base-application/priorities.js +1 -1
- package/dist/generators/base-application/support/debug.js +0 -1
- package/dist/generators/base-application/support/doc.js +0 -1
- package/dist/generators/base-application/support/entities.js +1 -2
- package/dist/generators/base-application/support/entity.js +0 -1
- package/dist/generators/base-application/support/enum.js +0 -2
- package/dist/generators/base-application/support/field-utils.js +0 -1
- package/dist/generators/base-application/support/prepare-entity.js +5 -5
- package/dist/generators/base-application/support/prepare-field.js +3 -4
- package/dist/generators/base-application/support/prepare-relationship.js +2 -2
- package/dist/generators/base-application/support/relationship.js +1 -1
- package/dist/generators/base-application/support/update-application-entities-transform.js +1 -1
- package/dist/generators/base-core/generator.js +121 -30
- package/dist/generators/base-workspaces/generator.js +2 -2
- package/dist/generators/base-workspaces/internal/deployments.js +1 -1
- package/dist/generators/base-workspaces/internal/docker-prompts.js +2 -2
- package/dist/generators/base-workspaces/priorities.js +1 -1
- package/dist/generators/bootstrap/generator.js +4 -7
- package/dist/generators/bootstrap/support/eslint-transform.js +18 -10
- package/dist/generators/bootstrap/support/eslint-worker.js +9 -21
- package/dist/generators/bootstrap/support/java-unused-imports-transform.js +0 -1
- package/dist/generators/bootstrap/support/multi-step-transform/index.js +0 -1
- package/dist/generators/bootstrap/support/prettier-support.js +16 -11
- package/dist/generators/bootstrap/support/prettier-worker.js +3 -3
- package/dist/generators/bootstrap-application/generator.js +8 -10
- package/dist/generators/bootstrap-application-base/generator.js +5 -6
- package/dist/generators/bootstrap-application-base/utils.js +0 -1
- package/dist/generators/bootstrap-application-client/generator.js +1 -1
- package/dist/generators/bootstrap-application-server/generator.js +1 -1
- package/dist/generators/ci-cd/command.js +2 -2
- package/dist/generators/ci-cd/generator.js +4 -16
- package/dist/generators/ci-cd/index.js +1 -0
- package/dist/generators/client/files-common.js +1 -4
- package/dist/generators/client/generator.js +5 -22
- package/dist/generators/client/generators/common/generator.js +0 -32
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs +1 -1
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs +1 -1
- package/dist/generators/client/needle-api/needle-client-vue.js +1 -1
- package/dist/generators/client/prompts.js +1 -1
- package/dist/generators/client/resources/package.json +6 -6
- package/dist/generators/client/support/entity-definition.js +1 -1
- package/dist/generators/client/support/files.js +1 -1
- package/dist/generators/client/support/template-utils.js +1 -1
- package/dist/generators/client/support/update-languages.js +0 -1
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +22 -6
- package/dist/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs +6 -5
- package/dist/generators/client/templates/webpack/webpack.microfrontend.js.jhi.ejs +1 -1
- package/dist/generators/common/command.js +1 -13
- package/dist/generators/common/files.js +1 -14
- package/dist/generators/common/generator.js +23 -75
- package/dist/generators/common/resources/package.json +2 -4
- package/dist/generators/common/templates/{.editorconfig.ejs → .editorconfig.jhi.ejs} +3 -4
- package/dist/generators/cucumber/files.js +19 -1
- package/dist/generators/cucumber/generator.js +18 -18
- package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs +1 -5
- package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs +1 -3
- package/dist/generators/cypress/files.js +4 -1
- package/dist/generators/cypress/generator.js +7 -8
- package/dist/generators/cypress/index.js +0 -1
- package/dist/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs +40 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +3 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +4 -2
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/account.ts.ejs +1 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +0 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +0 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +0 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +2 -2
- package/dist/generators/docker/files.js +6 -1
- package/dist/generators/docker/generator.js +2 -3
- package/dist/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs +4 -4
- package/dist/generators/docker/templates/docker/monitoring.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/prometheus/prometheus.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/sonar.yml.ejs +1 -1
- package/dist/generators/{init/templates/.eslintignore.jhi.ejs → docker/templates/eslint.config.js.jhi.docker.ejs} +3 -3
- package/dist/generators/docker-compose/files.js +0 -1
- package/dist/generators/docker-compose/generator.js +12 -16
- package/dist/generators/entities/generator.js +0 -3
- package/dist/generators/entity/generator.js +1 -5
- package/dist/generators/entity/prompts.js +1 -1
- package/dist/generators/entity/support/index.js +0 -1
- package/dist/generators/export-jdl/generator.js +0 -1
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs +4 -4
- package/dist/generators/gatling/entity-files.js +18 -0
- package/dist/generators/gatling/files.js +19 -1
- package/dist/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs +12 -12
- package/dist/generators/generate-blueprint/files.js +4 -3
- package/dist/generators/generate-blueprint/generator.js +5 -11
- package/dist/generators/generate-blueprint/resources/package.json +3 -3
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs +0 -3
- package/dist/generators/{init/templates/.lintstagedrc.cjs.ejs → generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs} +6 -3
- package/dist/generators/generator-constants.js +3 -2
- package/dist/generators/git/command.js +14 -3
- package/dist/generators/git/files.js +0 -1
- package/dist/generators/git/generator.js +36 -18
- package/dist/generators/gradle/generator.js +20 -30
- package/dist/generators/gradle/generators/jib/templates/buildSrc/src/main/groovy/jhipster.docker-conventions.gradle.ejs +3 -0
- package/dist/generators/gradle/internal/needles.js +38 -25
- package/dist/generators/gradle/support/dependabot-gradle.js +0 -1
- package/dist/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties +1 -1
- package/dist/generators/heroku/generator.js +1 -2
- package/dist/generators/heroku/templates.js +0 -1
- package/dist/generators/info/generator.js +7 -3
- package/dist/generators/init/command.js +2 -27
- package/dist/generators/init/config.js +0 -2
- package/dist/generators/init/files.js +3 -39
- package/dist/generators/init/generator.js +7 -71
- package/dist/generators/init/resources/.node-version +1 -1
- package/dist/generators/init/templates/.editorconfig.jhi.ejs +1 -1
- package/dist/generators/java/generator.js +1 -10
- package/dist/generators/java/generators/bootstrap/generator.js +32 -26
- package/dist/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs +3 -0
- package/dist/generators/java/generators/build-tool/generator.js +19 -24
- package/dist/generators/java/generators/code-quality/generator.js +0 -32
- package/dist/generators/java/generators/domain/generator.js +2 -11
- package/dist/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +2 -2
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Asserts.java.ejs +7 -0
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs +0 -1
- package/dist/generators/java/generators/jib/generator.js +0 -32
- package/dist/generators/java/generators/node/generator.js +0 -32
- package/dist/generators/java/generators/openapi-generator/README.md +7 -0
- package/dist/generators/java/generators/openapi-generator/command.js +14 -0
- package/dist/generators/java/generators/openapi-generator/generator.js +130 -0
- package/dist/generators/{init/constants.js → java/generators/openapi-generator/index.js} +2 -3
- package/dist/generators/java/generators/openapi-generator/templates/README.md.jhi.openapi-generator.ejs +48 -0
- package/dist/generators/{server/templates/gradle/swagger.gradle.ejs → java/generators/openapi-generator/templates/buildSrc/src/main/groovy/jhipster.openapi-generator-conventions.gradle.ejs} +3 -5
- package/dist/generators/java/support/checks/index.js +0 -1
- package/dist/generators/java/support/files.js +2 -2
- package/dist/generators/java/support/key-store.js +1 -2
- package/dist/generators/javascript/generators/bootstrap/command.js +23 -0
- package/dist/generators/javascript/generators/bootstrap/generator.js +82 -0
- package/dist/generators/javascript/generators/bootstrap/index.js +20 -0
- package/dist/generators/{common/templates/.prettierignore.jhi.ejs → javascript/generators/bootstrap/templates/package.json.ejs} +7 -6
- package/dist/generators/javascript/generators/eslint/command.js +11 -0
- package/dist/generators/javascript/generators/eslint/generator.js +84 -0
- package/dist/generators/javascript/generators/eslint/index.js +20 -0
- package/dist/generators/javascript/generators/eslint/support/index.js +1 -0
- package/dist/generators/javascript/generators/eslint/support/tasks.js +31 -0
- package/dist/generators/{generate-blueprint/templates/eslint.config.js.ejs → javascript/generators/eslint/templates/eslint.config.js.jhi.ejs} +30 -4
- package/dist/generators/javascript/generators/husky/command.js +13 -0
- package/dist/generators/javascript/generators/husky/generator.js +75 -0
- package/dist/generators/javascript/generators/husky/index.js +20 -0
- package/dist/generators/javascript/generators/husky/templates/.husky/pre-commit.ejs +1 -0
- package/dist/generators/{common → javascript/generators/husky}/templates/.lintstagedrc.cjs.ejs +1 -1
- package/dist/generators/javascript/generators/prettier/command.js +43 -0
- package/dist/generators/javascript/generators/prettier/generator.js +127 -0
- package/dist/generators/javascript/generators/prettier/index.js +20 -0
- package/dist/generators/{init → javascript/generators/prettier}/templates/.prettierrc.yml.jhi.ejs +2 -4
- package/dist/generators/javascript/resources/package.json +8 -0
- package/dist/generators/jdl/generator.js +3 -6
- package/dist/generators/kubernetes/files.js +1 -1
- package/dist/generators/kubernetes/generator.js +5 -6
- package/dist/generators/kubernetes/kubernetes-base.js +2 -2
- package/dist/generators/kubernetes/kubernetes-constants.js +1 -1
- package/dist/generators/kubernetes/prompts.js +2 -2
- package/dist/generators/kubernetes-helm/generator.js +4 -5
- package/dist/generators/kubernetes-knative/files.js +0 -1
- package/dist/generators/kubernetes-knative/generator.js +8 -9
- package/dist/generators/languages/files.js +0 -1
- package/dist/generators/languages/generator.js +5 -9
- package/dist/generators/languages/support/load-config.js +1 -1
- package/dist/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs +12 -12
- package/dist/generators/liquibase/files.js +0 -1
- package/dist/generators/liquibase/generator.js +9 -17
- package/dist/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs +4 -5
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +1 -1
- package/dist/generators/maven/command.js +1 -0
- package/dist/generators/maven/generator.js +23 -7
- package/dist/generators/maven/generators/code-quality/generator.js +0 -32
- package/dist/generators/maven/generators/frontend-plugin/generator.js +0 -32
- package/dist/generators/maven/generators/jib/generator.js +21 -34
- package/dist/generators/maven/internal/pom-sort.js +144 -0
- package/dist/generators/maven/internal/xml-store.js +5 -4
- package/dist/generators/maven/support/dependabot-maven.js +3 -2
- package/dist/generators/maven/support/index.js +1 -0
- package/dist/generators/maven/support/pom-file-sort.js +28 -0
- package/dist/generators/maven/support/pom-store.js +4 -105
- package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/dist/generators/project-name/command.js +0 -18
- package/dist/generators/project-name/generator.js +3 -7
- package/dist/generators/project-name/support/index.js +0 -1
- package/dist/generators/react/application/entities/index.js +0 -1
- package/dist/generators/react/files-react.js +5 -4
- package/dist/generators/react/generator.js +29 -12
- package/dist/generators/react/resources/package.json +25 -24
- package/dist/generators/react/templates/eslint.config.js.jhi.react.ejs +101 -0
- package/dist/generators/react/templates/jest.conf.js.ejs +37 -38
- package/dist/generators/react/templates/package.json.ejs +4 -3
- package/dist/generators/react/templates/postcss.config.js.ejs +1 -3
- package/dist/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs +11 -11
- package/dist/generators/react/templates/src/main/webapp/app/app.scss.ejs +68 -66
- package/dist/generators/react/templates/src/main/webapp/app/app.tsx.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +3 -4
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/constants.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/error-middleware.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.spec.ts.ejs +5 -5
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs +3 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/store.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/index.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.reducer.spec.ts.ejs +1 -5
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.reducer.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.tsx.ejs +3 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password/password.reducer.spec.ts.ejs +6 -10
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password/password.reducer.ts.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs +36 -34
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs +4 -5
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs +5 -8
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.ejs +7 -13
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.tsx.ejs +34 -25
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.spec.ts.ejs +6 -9
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs +25 -25
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs +23 -15
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.scss.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.tsx.ejs +6 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs +9 -4
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health.tsx.ejs +11 -6
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/index.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +3 -10
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs +10 -4
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs +14 -11
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs +30 -47
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts.ejs +11 -23
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +31 -23
- package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/setup-tests.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs +8 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs +6 -8
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.spec.tsx.ejs +1 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.tsx.ejs +7 -7
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +4 -5
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +5 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/locale.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +9 -9
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/menu-item.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx.ejs +8 -15
- package/dist/generators/react/templates/src/main/webapp/app/shared/model/user.model.ts.ejs +1 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/application-profile.spec.ts.ejs +9 -10
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/application-profile.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +14 -17
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.ts.ejs +8 -4
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/locale.spec.ts.ejs +42 -25
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/locale.ts.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +7 -8
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.spec.ts.ejs +4 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/date-utils.ts.ejs +2 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.spec.ts.ejs +10 -12
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.ts.ejs +4 -2
- package/dist/generators/react/templates/src/main/webapp/app/typings.d.ts.ejs +2 -2
- package/dist/generators/react/templates/webpack/environment.js.ejs +2 -2
- package/dist/generators/react/templates/webpack/utils.js.ejs +2 -2
- package/dist/generators/react/templates/webpack/webpack.common.js.ejs +8 -11
- package/dist/generators/react/templates/webpack/webpack.dev.js.ejs +0 -1
- package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs +0 -5
- package/dist/generators/server/generator.js +4 -34
- package/dist/generators/server/jdl/application-definition.js +1 -1
- package/dist/generators/server/resources/Dockerfile +15 -15
- package/dist/generators/server/resources/gradle/libs.versions.toml +14 -10
- package/dist/generators/server/resources/pom.xml +11 -17
- package/dist/generators/server/support/config.js +1 -1
- package/dist/generators/server/support/database.js +1 -1
- package/dist/generators/server/support/prepare-entity.js +1 -1
- package/dist/generators/server/support/prepare-field.js +2 -2
- package/dist/generators/server/support/relationship.js +0 -1
- package/dist/generators/server/support/spring-factories.js +0 -1
- package/dist/generators/server/support/string.js +0 -1
- package/dist/generators/server/support/templates/field-values.js +1 -1
- package/dist/generators/spring-boot/cleanup.js +5 -2
- package/dist/generators/spring-boot/command.js +1 -1
- package/dist/generators/spring-boot/entity-cleanup.js +0 -1
- package/dist/generators/spring-boot/entity-files.js +2 -2
- package/dist/generators/spring-boot/files.js +7 -11
- package/dist/generators/spring-boot/generator.js +24 -47
- package/dist/generators/spring-boot/prompts.js +1 -1
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +133 -236
- package/dist/generators/{server → spring-boot}/templates/README.md.jhi.spring-boot.ejs +0 -30
- package/dist/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/build.gradle.ejs +1 -10
- package/dist/generators/{server → spring-boot}/templates/gradle.properties.ejs +0 -6
- package/dist/generators/{server → spring-boot}/templates/pom.xml.ejs +5 -82
- package/dist/generators/{server → spring-boot}/templates/settings.gradle.ejs +10 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/Application.java.ejs +27 -17
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs +5 -5
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs +13 -10
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +37 -36
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs +4 -4
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs +11 -11
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/PublicUserResource.java.ejs +3 -3
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs +37 -16
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs +7 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs +16 -16
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs +2 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs +17 -16
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/Constants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +23 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +59 -34
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs +5 -5
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SpringDocConfiguration.java.ejs +40 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/WebConfigurer.java.ejs +6 -6
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs +2 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs +23 -28
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/SecurityUtils.java.ejs +12 -13
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs +3 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs +9 -8
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/MailService.java.ejs +22 -13
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs +8 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs +5 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +33 -41
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs +9 -22
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs +12 -22
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs +2 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs +16 -21
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs +7 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs +7 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs +17 -17
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs +6 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-dev.yml.ejs +3 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-prod.yml.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application.yml.ejs +7 -9
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap-prod.yml.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap.yml.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/error.html.ejs +4 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/activationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/creationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +5 -1
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs +1 -11
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs +7 -12
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +35 -23
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs +2 -6
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs +11 -17
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs +2 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs +13 -40
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs +10 -6
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs +21 -25
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs +3 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs +3 -2
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs +7 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/MailServiceIT.java.ejs +5 -3
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs +4 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs +1 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs +34 -38
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +20 -13
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs +4 -4
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs +4 -4
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +212 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs +4 -3
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/config/bootstrap.yml.ejs +12 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/activationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/creationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs +1 -1
- package/dist/generators/spring-cache/files.js +19 -1
- package/dist/generators/spring-cache/generator.js +11 -10
- package/dist/generators/spring-cache/internal/dependencies.js +0 -1
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +3 -3
- package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +20 -19
- package/dist/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainer.java.ejs +2 -2
- package/dist/generators/spring-cloud/generators/gateway/generator.js +21 -37
- package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/rest/GatewayResource_imperative.java.ejs +126 -0
- package/dist/generators/spring-cloud-stream/generators/kafka/files.js +1 -1
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_imperative.java.ejs +5 -5
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_reactive.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs +3 -3
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainer.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/pulsar/files.js +1 -1
- package/dist/generators/spring-cloud-stream/generators/pulsar/templates/src/test/java/_package_/config/PulsarTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-cassandra/files.js +1 -1
- package/dist/generators/spring-data-cassandra/generator.js +1 -1
- package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-couchbase/files.js +1 -1
- package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +2 -2
- package/dist/generators/spring-data-couchbase/templates/src/test/java/_package_/config/CouchbaseTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-elasticsearch/generator.js +1 -1
- package/dist/generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-mongodb/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs +0 -3
- package/dist/generators/spring-data-mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-neo4j/entity-files.js +18 -0
- package/dist/generators/spring-data-neo4j/files.js +1 -1
- package/dist/generators/spring-data-neo4j/generator.js +14 -13
- package/dist/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/files.js +2 -2
- package/dist/generators/spring-data-relational/generator.js +35 -51
- package/dist/generators/spring-data-relational/internal/dependencies.js +0 -1
- package/dist/generators/spring-data-relational/support/application-properties.js +1 -1
- package/dist/generators/spring-data-relational/support/database-data.js +1 -1
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs +35 -28
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs +1 -0
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs +0 -2
- package/dist/generators/spring-data-relational/templates/src/main/resources/.h2.server.properties.ejs +1 -1
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MariadbTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MsSqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MysqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/PostgreSqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs +0 -1
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +1 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs +1 -3
- package/dist/generators/spring-websocket/files.js +18 -0
- package/dist/generators/spring-websocket/templates/src/main/java/_package_/web/websocket/ActivityService.java.ejs +2 -2
- package/dist/generators/upgrade/generator.js +2 -5
- package/dist/generators/vue/files-vue.js +3 -3
- package/dist/generators/vue/generator.js +28 -12
- package/dist/generators/vue/resources/package.json +28 -29
- package/dist/generators/vue/support/translate-vue.js +1 -1
- package/dist/generators/vue/templates/.postcssrc.js.ejs +2 -2
- package/dist/generators/vue/templates/eslint.config.js.jhi.vue.ejs +74 -0
- package/dist/generators/vue/templates/package.json.ejs +5 -5
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.spec.ts.ejs +3 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.component.spec.ts.ejs +13 -12
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs +122 -77
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs +35 -25
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs +11 -7
- package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.vue.ejs +211 -143
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs +101 -72
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs +35 -35
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.vue.ejs +69 -44
- package/dist/generators/vue/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +6 -6
- package/dist/generators/vue/templates/src/main/webapp/app/account/sessions/sessions.vue.ejs +38 -36
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +6 -7
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs +91 -34
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +9 -9
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.vue.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/admin/docs/docs.vue.ejs +11 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health-modal.component.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +56 -56
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.service.ts.ejs +7 -8
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.vue.ejs +3 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/logs/logs.vue.ejs +8 -8
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics-modal.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics-modal.vue.ejs +6 -6
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +171 -173
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs +0 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.vue.ejs +58 -48
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +2 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.vue.ejs +77 -38
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-view.vue.ejs +2 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.vue.ejs +20 -23
- package/dist/generators/vue/templates/src/main/webapp/app/core/error/error.vue.ejs +3 -5
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.vue.ejs +8 -6
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-footer/jhi-footer.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +6 -8
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +22 -23
- package/dist/generators/vue/templates/src/main/webapp/app/core/ribbon/ribbon.component.ts.ejs +1 -3
- package/dist/generators/vue/templates/src/main/webapp/app/core/ribbon/ribbon.vue.ejs +30 -30
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs +12 -12
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs +14 -14
- package/dist/generators/vue/templates/src/main/webapp/app/entities/entities-menu.component.ts.ejs +4 -1
- package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs +9 -5
- package/dist/generators/vue/templates/src/main/webapp/app/router/admin.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/alert/alert.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/shared/computables/arrays.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.spec.ts.ejs +30 -30
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/config.ts.ejs +9 -12
- package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.spec.ts.ejs +15 -11
- package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +5 -5
- package/dist/generators/vue/templates/src/main/webapp/app/shared/jhi-item-count.vue.ejs +1 -3
- package/dist/generators/vue/templates/src/main/webapp/app/shared/model/user.model.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/security/authority.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/sort/jhi-sort-indicator.vue.ejs +2 -3
- package/dist/generators/vue/templates/src/main/webapp/app/shared/sort/sorts.spec.ts.ejs +0 -1
- package/dist/generators/vue/templates/src/main/webapp/app/test-setup.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/content/scss/global.scss.ejs +94 -94
- package/dist/generators/vue/templates/vite.config.mts.ejs +4 -2
- package/dist/generators/vue/templates/webpack/config.js.ejs +4 -6
- package/dist/generators/vue/templates/webpack/vue.utils.js.ejs +3 -7
- package/dist/generators/vue/templates/webpack/webpack.common.js.ejs +1 -1
- package/dist/generators/vue/templates/webpack/webpack.dev.js.ejs +8 -9
- package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs +0 -6
- package/dist/generators/vue/templates/webpack/webpack.prod.js.ejs +17 -18
- package/dist/generators/workspaces/generator.js +25 -5
- package/dist/generators/workspaces/support/applications-lookup.js +31 -0
- package/dist/generators/workspaces/support/index.js +19 -0
- package/dist/generators/workspaces/templates/.prettierignore.jhi.workspaces.ejs +26 -0
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js +1 -1
- package/dist/jdl/converters/json-to-jdl-converter.js +4 -4
- package/dist/jdl/converters/json-to-jdl-entity-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +1 -3
- package/dist/jdl/exporters/jhipster-entity-exporter.js +1 -1
- package/dist/jdl/jhipster/application-options.js +1 -1
- package/dist/jdl/jhipster/default-application-options.js +1 -1
- package/dist/jdl/jhipster/field-types.js +2 -2
- package/dist/jdl/jhipster/reserved-keywords.js +2 -2
- package/dist/jdl/linters/entity-linter.js +1 -1
- package/dist/jdl/linters/relationship-linter.js +1 -1
- package/dist/jdl/linters/rule.js +1 -1
- package/dist/jdl/linters/rules.js +1 -1
- package/dist/jdl/models/index.js +0 -1
- package/dist/jdl/models/jdl-binary-option.js +1 -1
- package/dist/jdl/models/jdl-deployment.js +1 -1
- package/dist/jdl/models/jdl-object.js +1 -1
- package/dist/jdl/models/jdl-unary-option.js +1 -1
- package/dist/jdl/models/list-jdl-application-configuration-option.js +1 -1
- package/dist/jdl/parsing/exports.js +2 -2
- package/dist/jdl/parsing/jdl-ast-builder-visitor.js +2 -2
- package/dist/jdl/parsing/lexer/application-tokens.js +2 -2
- package/dist/jdl/parsing/lexer/lexer.js +1 -1
- package/dist/jdl/parsing/lexer/option-tokens.js +1 -1
- package/dist/jdl/parsing/lexer/token-creator.js +1 -1
- package/dist/jdl/parsing/self-checks/parsing-system-checker.js +1 -2
- package/dist/jdl/parsing/validator.js +1 -1
- package/dist/jdl/readers/json-reader.js +2 -3
- package/dist/jdl/utils/file-utils.js +1 -1
- package/dist/jdl/utils/objects/logger.js +8 -9
- package/dist/jdl/validators/deployment-validator.js +1 -1
- package/dist/jdl/validators/entity-validator.js +1 -1
- package/dist/jdl/validators/enum-validator.js +1 -1
- package/dist/jdl/validators/jdl-with-application-validator.js +1 -1
- package/dist/jdl/validators/jdl-without-application-validator.js +2 -2
- package/dist/jdl/validators/relationship-validator.js +1 -1
- package/dist/jdl/validators/validation-validator.js +1 -1
- package/dist/lib/eslint/base.js +38 -17
- package/dist/lib/eslint/index.js +4 -0
- package/dist/lib/eslint/recommended.js +1 -0
- package/dist/lib/index.js +0 -1
- package/dist/lib/internal/config-def.js +2 -4
- package/dist/testing/github.js +1 -1
- package/dist/testing/helpers.js +28 -14
- package/dist/testing/support/client-samples.js +1 -2
- package/dist/testing/support/matrix-utils.js +22 -10
- package/dist/testing/support/server-samples.js +2 -3
- package/dist/types/generators/base/api.d.ts +22 -7
- package/dist/types/generators/base/generator.d.ts +1 -1
- package/dist/types/generators/base/support/config.d.ts +2 -2
- package/dist/types/generators/base/support/index.d.ts +1 -1
- package/dist/types/generators/base/support/jhipster7-context.d.ts +495 -1
- package/dist/types/generators/base/support/logger.d.ts +1 -1
- package/dist/types/generators/base/types.d.ts +2 -2
- package/dist/types/generators/base-application/application-options.d.ts +1 -1
- package/dist/types/generators/base-application/generator.d.ts +3 -3
- package/dist/types/generators/base-application/support/relationship.d.ts +1 -1
- package/dist/types/generators/base-application/support/task-type-inference.d.ts +1 -1
- package/dist/types/generators/base-application/tasks.d.ts +3 -3
- package/dist/types/generators/base-application/types/entity.d.ts +5 -0
- package/dist/types/generators/base-application/types.d.ts +8 -4
- package/dist/types/generators/base-core/generator.d.ts +8 -1
- package/dist/types/generators/bootstrap/support/eslint-transform.d.ts +20 -2
- package/dist/types/generators/bootstrap/support/eslint-worker.d.ts +6 -2
- package/dist/types/generators/bootstrap/support/multi-step-transform/template-file-fs.d.ts +1 -1
- package/dist/types/generators/bootstrap/support/prettier-support.d.ts +20 -5
- package/dist/types/generators/client/support/files.d.ts +3 -1
- package/dist/types/generators/client/types.d.ts +3 -1
- package/dist/types/generators/generator-constants.d.ts +1 -1
- package/dist/types/generators/gradle/types.d.ts +6 -5
- package/dist/types/generators/java/types.d.ts +11 -1
- package/dist/types/generators/javascript/types.d.ts +12 -0
- package/dist/types/generators/languages/support/detect-language.d.ts +1 -1
- package/dist/types/generators/languages/support/languages.d.ts +4 -4
- package/dist/types/generators/languages/types.d.ts +1 -1
- package/dist/types/generators/maven/internal/pom-sort.d.ts +2 -0
- package/dist/types/generators/maven/internal/xml-store.d.ts +3 -1
- package/dist/types/generators/maven/support/index.d.ts +1 -0
- package/dist/types/generators/maven/support/pom-file-sort.d.ts +25 -0
- package/dist/types/generators/server/types.d.ts +10 -3
- package/dist/types/generators/spring-cloud/generators/gateway/types.d.ts +2 -1
- package/dist/types/generators/workspaces/support/applications-lookup.d.ts +1 -0
- package/dist/types/generators/workspaces/support/index.d.ts +19 -0
- package/dist/types/jdl/converters/json-to-jdl-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/application-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/option-converter.d.ts +1 -1
- package/dist/types/jdl/converters/types.d.ts +1 -1
- package/dist/types/jdl/exporters/types.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application-configuration-factory.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application.d.ts +1 -1
- package/dist/types/jdl/models/jdl-enum.d.ts +1 -1
- package/dist/types/jdl/models/jdl-relationship.d.ts +1 -1
- package/dist/types/jdl/parsing/exports.d.ts +2 -2
- package/dist/types/jdl/utils/objects/logger.d.ts +6 -19
- package/dist/types/jdl/validators/deployment-validator.d.ts +1 -1
- package/dist/types/jdl/validators/relationship-validator.d.ts +1 -1
- package/dist/types/lib/eslint/base.d.ts +7 -19
- package/dist/types/lib/eslint/index.d.ts +15 -0
- package/dist/types/lib/eslint/recommended.d.ts +2 -19
- package/dist/types/testing/helpers.d.ts +12 -5
- package/dist/types/testing/support/matrix-utils.d.ts +21 -1
- package/package.json +43 -38
- package/dist/generators/angular/templates/.eslintrc.json.ejs +0 -123
- package/dist/generators/client/templates/.eslintignore.ejs +0 -32
- package/dist/generators/common/templates/.husky/pre-commit.ejs +0 -9
- package/dist/generators/common/templates/.prettierrc.ejs +0 -24
- package/dist/generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs +0 -20
- package/dist/generators/init/resources/package.json +0 -6
- package/dist/generators/init/templates/.husky/pre-commit +0 -4
- package/dist/generators/init/templates/package.json.ejs +0 -34
- package/dist/generators/react/templates/.eslintrc.json.ejs +0 -109
- package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/JwtGrantedAuthorityConverter.java.ejs +0 -40
- package/dist/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +0 -161
- package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/filter/ModifyServersOpenApiFilter.java.ejs +0 -179
- package/dist/generators/spring-cloud/generators/gateway/templates/src/test/java/_package_/web/filter/ModifyServersOpenApiFilterTest.java.ejs +0 -150
- package/dist/generators/vue/templates/.eslintrc.cjs.ejs +0 -65
- package/dist/generators/{server → java/generators/openapi-generator}/templates/src/main/resources/swagger/api.yml.ejs +0 -0
- package/dist/generators/{init → javascript/generators/prettier}/templates/.prettierignore.jhi.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/.devcontainer/Dockerfile.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/.devcontainer/devcontainer.json.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/profile_dev.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/profile_prod.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/war.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/zipkin.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/micro_services_architecture.md +0 -0
- package/dist/generators/{server → spring-boot}/templates/package.json.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/ApplicationWebXml.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/PersistentToken.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/User.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs +1 -1
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner-no-color.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner_react.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner_vue.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-tls.yml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/i18n/messages.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/logback-spring.xml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/static/index_microservices.html.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/IntegrationTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/config/application.yml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/i18n/messages_en.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/junit-platform.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/logback.xml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/testEmail.html.ejs +0 -0
- /package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/rest/{GatewayResource.java.ejs → GatewayResource_reactive.java.ejs} +0 -0
|
@@ -210,7 +210,7 @@ import java.util.UUID;
|
|
|
210
210
|
<%_ } _%>
|
|
211
211
|
<%_ if (!embedded && (primaryKey.hasLong || primaryKey.hasInteger)) { _%>
|
|
212
212
|
import java.util.Random;
|
|
213
|
-
<%_ if (primaryKey.hasLong) { _%>
|
|
213
|
+
<%_ if (primaryKey.hasLong && !readOnly && updatableEntity) { _%>
|
|
214
214
|
import java.util.concurrent.atomic.AtomicLong;
|
|
215
215
|
<%_ } else if (primaryKey.hasInteger) { _%>
|
|
216
216
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
@@ -448,8 +448,10 @@ if (field.fieldTypeString || field.blobContentTypeText) {
|
|
|
448
448
|
<%_ } _%>
|
|
449
449
|
<%_ if (!embedded && (primaryKey.hasLong || primaryKey.hasInteger)) { _%>
|
|
450
450
|
|
|
451
|
+
<%_ if (primaryKey.hasLong && !readOnly && updatableEntity || primaryKey.hasInteger) { _%>
|
|
451
452
|
private static Random random = new Random();
|
|
452
|
-
<%_
|
|
453
|
+
<%_ } _%>
|
|
454
|
+
<%_ if (primaryKey.hasLong && !readOnly && updatableEntity) { _%>
|
|
453
455
|
private static AtomicLong longCount = new AtomicLong(random.nextInt() + ( 2 * Integer.MAX_VALUE ));
|
|
454
456
|
<%_ } else if (primaryKey.hasInteger) { _%>
|
|
455
457
|
private static AtomicInteger intCount = new AtomicInteger(random.nextInt() + ( 2 * Short.MAX_VALUE ));
|
|
@@ -514,42 +516,51 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
|
|
|
514
516
|
<%_ });
|
|
515
517
|
}_%>
|
|
516
518
|
<%_ ['DEFAULT_', 'UPDATED_'].forEach((fieldStatus) => { _%>
|
|
519
|
+
<%_ const createInstance = fieldStatus === 'UPDATED_' ? `updated${persistClass}` : persistInstance; _%>
|
|
517
520
|
/**
|
|
518
521
|
* Create an <% if (fieldStatus === 'UPDATED_') { %>updated <% } %>entity for this test.
|
|
519
522
|
*
|
|
520
523
|
* This is a static method, as tests for other entities might also need it,
|
|
521
524
|
* if they test an entity which requires the current entity.
|
|
522
525
|
*/
|
|
523
|
-
public static <%= persistClass %> create<% if (fieldStatus === 'UPDATED_') { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
|
|
526
|
+
public static <%= persistClass %> create<% if (fieldStatus === 'UPDATED_') { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql && anyRelationshipIsRequired) { %>EntityManager em<% } %>) {
|
|
524
527
|
<%_ if (fluentMethods) { _%>
|
|
525
|
-
|
|
528
|
+
<% if (!anyRelationshipIsRequired) { %>return <% } else { %><%= persistClass %> <%= createInstance %> = <% } %>new <%= persistClass %>()
|
|
526
529
|
<%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
|
|
527
530
|
.<%= primaryKey.name %>(UUID.randomUUID())
|
|
528
531
|
<%_ } _%>
|
|
529
532
|
<%_ if (primaryKey.typeString && !isUsingMapsId && !primaryKey.autoGenerate) { _%>
|
|
530
533
|
.<%= primaryKey.name %>(UUID.randomUUID().toString())
|
|
531
534
|
<%_ } _%>
|
|
532
|
-
<% for (field of fieldsToTest) { %>
|
|
533
|
-
.<%= field.fieldName %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>)
|
|
534
|
-
|
|
535
|
+
<%_ for (field of fieldsToTest) { _%>
|
|
536
|
+
.<%= field.fieldName %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>)
|
|
537
|
+
<%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
|
|
538
|
+
.<%= field.fieldName %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)
|
|
539
|
+
<%_ } _%>
|
|
540
|
+
<%_ } _%>;
|
|
541
|
+
<%_ if (!anyRelationshipIsRequired) { _%>
|
|
542
|
+
}
|
|
543
|
+
<%_ return; _%>
|
|
544
|
+
<%_ } _%>
|
|
535
545
|
<%_ } else { _%>
|
|
536
|
-
<%= persistClass %> <%=
|
|
546
|
+
<%= persistClass %> <%= createInstance %> = new <%= persistClass %>();
|
|
537
547
|
<%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
|
|
538
|
-
<%=
|
|
548
|
+
<%= createInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID());
|
|
539
549
|
<%_ } _%>
|
|
540
550
|
<%_ if (primaryKey.typeString && !isUsingMapsId && !primaryKey.autoGenerate) { _%>
|
|
541
|
-
<%=
|
|
551
|
+
<%= createInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID().toString());
|
|
542
552
|
<%_ } _%>
|
|
543
553
|
<%_ for (field of fieldsToTest) { _%>
|
|
544
|
-
<%=
|
|
554
|
+
<%= createInstance %>.set<%= field.fieldInJavaBeanMethod %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>);
|
|
545
555
|
<%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
|
|
546
|
-
<%=
|
|
556
|
+
<%= createInstance %>.set<%= field.fieldInJavaBeanMethod %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE);
|
|
547
557
|
<%_ } _%>
|
|
548
558
|
<%_ } _%>
|
|
549
559
|
<%_ } _%>
|
|
550
560
|
<%_
|
|
551
561
|
const alreadyGeneratedEntities = [];
|
|
552
562
|
for (relationship of persistableRelationships) {
|
|
563
|
+
const otherEntity = relationship.otherEntity;
|
|
553
564
|
const relationshipValidate = relationship.relationshipValidate;
|
|
554
565
|
const otherEntityName = relationship.otherEntityName;
|
|
555
566
|
const otherEntityNameCapitalized = relationship.otherEntityNameCapitalized;
|
|
@@ -560,7 +571,7 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
|
|
|
560
571
|
// Add required entity
|
|
561
572
|
<%_ if (alreadyGeneratedEntities.indexOf(otherEntityName) == -1) { _%>
|
|
562
573
|
<%_ if (relationship.otherEntityUser) { /* TODO or other entity has no unique fields */ _%>
|
|
563
|
-
<%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (databaseTypeSql) { %>em<% } %>)<%= createEntityPostfix %>;
|
|
574
|
+
<%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (databaseTypeSql && otherEntity.anyRelationshipIsRequired) { %>em<% } %>)<%= createEntityPostfix %>;
|
|
564
575
|
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
565
576
|
em.persist(<%= otherEntityName %>);
|
|
566
577
|
em.flush();
|
|
@@ -574,7 +585,7 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
|
|
|
574
585
|
<%_ if (!isUsingMapsId || fieldStatus !== "UPDATED_") { _%>
|
|
575
586
|
if (TestUtil.findAll(em, <%= relationship.otherEntity.persistClass %>.class).isEmpty()) {
|
|
576
587
|
<%_ } _%>
|
|
577
|
-
<%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(em)<%= createEntityPostfix %>;
|
|
588
|
+
<%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(<% if (relationship.otherEntity.anyRelationshipIsRequired) { %>em<% } %>)<%= createEntityPostfix %>;
|
|
578
589
|
em.persist(<%= otherEntityName %>);
|
|
579
590
|
em.flush();
|
|
580
591
|
<%_ if (!isUsingMapsId || fieldStatus !== "UPDATED_") { _%>
|
|
@@ -583,7 +594,7 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
|
|
|
583
594
|
}
|
|
584
595
|
<%_ } _%>
|
|
585
596
|
<%_ } else { _%>
|
|
586
|
-
<%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(<% if (databaseType === 'sql') { %>em<% } %>)<%= createEntityPostfix %>;
|
|
597
|
+
<%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(<% if (databaseType === 'sql' && otherEntity.anyRelationshipIsRequired) { %>em<% } %>)<%= createEntityPostfix %>;
|
|
587
598
|
<%_ } _%>
|
|
588
599
|
<%_ if (databaseTypeMongodb) { _%>
|
|
589
600
|
<%= otherEntityName %>.set<%= primaryKey.nameCapitalized %>("fixed-id-for-tests");
|
|
@@ -591,14 +602,14 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
|
|
|
591
602
|
<%_ } _%>
|
|
592
603
|
<%_ } _%>
|
|
593
604
|
<%_ if (relationship.relationshipManyToMany || relationship.relationshipOneToMany) { _%>
|
|
594
|
-
<%=
|
|
605
|
+
<%= createInstance %>.get<%= relationshipNameCapitalizedPlural %>().add(<%= otherEntityName %>);
|
|
595
606
|
<%_ } else { _%>
|
|
596
|
-
<%=
|
|
607
|
+
<%= createInstance %>.set<%= relationshipNameCapitalized %>(<%= otherEntityName %>);
|
|
597
608
|
<%_ } _%>
|
|
598
609
|
<%_ alreadyGeneratedEntities.push(otherEntityName) _%>
|
|
599
610
|
<%_ } _%>
|
|
600
611
|
<%_ } _%>
|
|
601
|
-
return <%=
|
|
612
|
+
return <%= createInstance %>;
|
|
602
613
|
}
|
|
603
614
|
<%_ }); _%>
|
|
604
615
|
|
|
@@ -634,7 +645,7 @@ _%>
|
|
|
634
645
|
<%_ } _%>
|
|
635
646
|
@BeforeEach
|
|
636
647
|
public void initTest() {
|
|
637
|
-
<%= persistInstance %> = createEntity(<% if (databaseTypeSql) { %>em<% } %>);
|
|
648
|
+
<%= persistInstance %> = createEntity(<% if (databaseTypeSql && anyRelationshipIsRequired) { %>em<% } %>);
|
|
638
649
|
}
|
|
639
650
|
|
|
640
651
|
@AfterEach
|
|
@@ -787,13 +798,14 @@ _%>
|
|
|
787
798
|
int searchDatabaseSizeBefore = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
|
|
788
799
|
<%_ } _%>
|
|
789
800
|
<%_ for (relationship of relationships) {
|
|
801
|
+
const otherEntity = relationship.otherEntity;
|
|
790
802
|
const otherEntityName = relationship.otherEntityName;
|
|
791
803
|
const otherEntityNameCapitalized = relationship.otherEntityNameCapitalized;
|
|
792
804
|
const mapsIdUse = relationship.id;
|
|
793
805
|
if (mapsIdUse) { _%>
|
|
794
806
|
// Add a new parent entity
|
|
795
807
|
<%_ if (alreadyGeneratedEntities.indexOf(otherEntityName) == -1) { _%>
|
|
796
|
-
<%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= otherEntityNameCapitalized %>ResourceIT.create<% if (!relationship.otherEntityUser) { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql) { %>em<% } %>);
|
|
808
|
+
<%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= otherEntityNameCapitalized %>ResourceIT.create<% if (!relationship.otherEntityUser) { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql && otherEntity.anyRelationshipIsRequired) { %>em<% } %>);
|
|
797
809
|
<%_ if (databaseTypeSql && !reactive) { _%>
|
|
798
810
|
em.persist(<%= otherEntityName %>);
|
|
799
811
|
em.flush();
|
|
@@ -1230,12 +1242,12 @@ _%>
|
|
|
1230
1242
|
<%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %>;
|
|
1231
1243
|
if (TestUtil.findAll(em, <%= relationship.otherEntity.persistClass %>.class).isEmpty()) {
|
|
1232
1244
|
<%= entityInstance %>Repository.saveAndFlush(<%= persistInstance %>);
|
|
1233
|
-
<%= relationship.relationshipFieldName %> = <%= createEntityPrefix %><%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(em);
|
|
1245
|
+
<%= relationship.relationshipFieldName %> = <%= createEntityPrefix %><%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (relationship.otherEntity.anyRelationshipIsRequired) { %>em<% } %>);
|
|
1234
1246
|
} else {
|
|
1235
1247
|
<%= relationship.relationshipFieldName %> = TestUtil.findAll(em, <%= relationship.otherEntity.persistClass %>.class).get(0);
|
|
1236
1248
|
}
|
|
1237
1249
|
<%_ } else { _%>
|
|
1238
|
-
<%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %> = <%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(em);
|
|
1250
|
+
<%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %> = <%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (relationship.otherEntity.anyRelationshipIsRequired) { %>em<% } %>);
|
|
1239
1251
|
<%_ } _%>
|
|
1240
1252
|
<%_ if(reactive) { _%>
|
|
1241
1253
|
<%= relationship.otherEntity.persistInstance %>Repository.<%= saveMethod %>(<%= relationship.relationshipFieldName %>)<%= callBlock %>;
|
|
@@ -1887,7 +1899,7 @@ _%>
|
|
|
1887
1899
|
}
|
|
1888
1900
|
|
|
1889
1901
|
protected void assertSameRepositoryCount(long countBefore) {
|
|
1890
|
-
|
|
1902
|
+
assertThat(countBefore).isEqualTo(getRepositoryCount());
|
|
1891
1903
|
}
|
|
1892
1904
|
|
|
1893
1905
|
protected <%- persistClass %> getPersisted<%- persistClass %>(<%- persistClass %> <%- entityInstance %>) {
|
|
@@ -53,13 +53,10 @@ class StaticResourcesWebConfigurerTest {
|
|
|
53
53
|
|
|
54
54
|
@Test
|
|
55
55
|
void shouldAppendResourceHandlerAndInitializeIt() {
|
|
56
|
-
|
|
57
56
|
staticResourcesWebConfiguration.addResourceHandlers(resourceHandlerRegistry);
|
|
58
57
|
|
|
59
|
-
verify(resourceHandlerRegistry, times(1))
|
|
60
|
-
|
|
61
|
-
verify(staticResourcesWebConfiguration, times(1))
|
|
62
|
-
.initializeResourceHandler(any(ResourceHandlerRegistration.class));
|
|
58
|
+
verify(resourceHandlerRegistry, times(1)).addResourceHandler(RESOURCE_PATHS);
|
|
59
|
+
verify(staticResourcesWebConfiguration, times(1)).initializeResourceHandler(any(ResourceHandlerRegistration.class));
|
|
63
60
|
for (String testingPath : RESOURCE_PATHS) {
|
|
64
61
|
assertThat(resourceHandlerRegistry.hasMappingForPattern(testingPath)).isTrue();
|
|
65
62
|
}
|
|
@@ -78,7 +75,6 @@ class StaticResourcesWebConfigurerTest {
|
|
|
78
75
|
verify(resourceHandlerRegistration, times(1)).addResourceLocations(RESOURCE_LOCATIONS);
|
|
79
76
|
}
|
|
80
77
|
|
|
81
|
-
|
|
82
78
|
@Test
|
|
83
79
|
void shouldCreateCacheControlBasedOnJhipsterDefaultProperties() {
|
|
84
80
|
CacheControl cacheExpected = CacheControl.maxAge(JHipsterDefaults.Http.Cache.timeToLiveInDays, TimeUnit.DAYS).cachePublic();
|
|
@@ -65,10 +65,8 @@ class WebConfigurerTest {
|
|
|
65
65
|
@BeforeEach
|
|
66
66
|
public void setup() {
|
|
67
67
|
servletContext = spy(new MockServletContext());
|
|
68
|
-
doReturn(mock(FilterRegistration.Dynamic.class))
|
|
69
|
-
|
|
70
|
-
doReturn(mock(ServletRegistration.Dynamic.class))
|
|
71
|
-
.when(servletContext).addServlet(anyString(), any(Servlet.class));
|
|
68
|
+
doReturn(mock(FilterRegistration.Dynamic.class)).when(servletContext).addFilter(anyString(), any(Filter.class));
|
|
69
|
+
doReturn(mock(ServletRegistration.Dynamic.class)).when(servletContext).addServlet(anyString(), any(Servlet.class));
|
|
72
70
|
|
|
73
71
|
env = new MockEnvironment();
|
|
74
72
|
props = new JHipsterProperties();
|
|
@@ -99,14 +97,14 @@ class WebConfigurerTest {
|
|
|
99
97
|
props.getCors().setMaxAge(1800L);
|
|
100
98
|
props.getCors().setAllowCredentials(true);
|
|
101
99
|
|
|
102
|
-
MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController())
|
|
103
|
-
.addFilters(webConfigurer.corsFilter())
|
|
104
|
-
.build();
|
|
100
|
+
MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build();
|
|
105
101
|
|
|
106
|
-
mockMvc
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
102
|
+
mockMvc
|
|
103
|
+
.perform(
|
|
104
|
+
options("/api/test-cors")
|
|
105
|
+
.header(HttpHeaders.ORIGIN, "other.domain.com")
|
|
106
|
+
.header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST")
|
|
107
|
+
)
|
|
110
108
|
.andExpect(status().isOk())
|
|
111
109
|
.andExpect(header().string(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "other.domain.com"))
|
|
112
110
|
.andExpect(header().string(HttpHeaders.VARY, "Origin"))
|
|
@@ -140,9 +138,7 @@ class WebConfigurerTest {
|
|
|
140
138
|
void shouldCorsFilterDeactivatedForNullAllowedOrigins() throws Exception {
|
|
141
139
|
props.getCors().setAllowedOrigins(null);
|
|
142
140
|
|
|
143
|
-
MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController())
|
|
144
|
-
.addFilters(webConfigurer.corsFilter())
|
|
145
|
-
.build();
|
|
141
|
+
MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build();
|
|
146
142
|
|
|
147
143
|
mockMvc
|
|
148
144
|
.perform(get("/api/test-cors").header(HttpHeaders.ORIGIN, "other.domain.com"))
|
|
@@ -154,9 +150,7 @@ class WebConfigurerTest {
|
|
|
154
150
|
void shouldCorsFilterDeactivatedForEmptyAllowedOrigins() throws Exception {
|
|
155
151
|
props.getCors().setAllowedOrigins(new ArrayList<>());
|
|
156
152
|
|
|
157
|
-
MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController())
|
|
158
|
-
.addFilters(webConfigurer.corsFilter())
|
|
159
|
-
.build();
|
|
153
|
+
MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build();
|
|
160
154
|
|
|
161
155
|
mockMvc
|
|
162
156
|
.perform(get("/api/test-cors").header(HttpHeaders.ORIGIN, "other.domain.com"))
|
|
@@ -18,16 +18,14 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
package <%= packageName %>.management;
|
|
20
20
|
|
|
21
|
+
import static org.assertj.core.api.Assertions.assertThat;
|
|
21
22
|
import io.micrometer.core.instrument.Counter;
|
|
22
23
|
import io.micrometer.core.instrument.MeterRegistry;
|
|
23
24
|
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
|
|
24
25
|
import org.junit.jupiter.api.BeforeEach;
|
|
25
26
|
import org.junit.jupiter.api.Test;
|
|
26
|
-
|
|
27
27
|
import java.util.Collection;
|
|
28
28
|
|
|
29
|
-
import static org.assertj.core.api.Assertions.assertThat;
|
|
30
|
-
|
|
31
29
|
class SecurityMetersServiceTests {
|
|
32
30
|
private static final String INVALID_TOKENS_METER_EXPECTED_NAME = "security.authentication.invalid-tokens";
|
|
33
31
|
|
|
@@ -46,21 +44,13 @@ class SecurityMetersServiceTests {
|
|
|
46
44
|
void testInvalidTokensCountersByCauseAreCreated() {
|
|
47
45
|
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).counter();
|
|
48
46
|
|
|
49
|
-
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
50
|
-
.tag("cause", "expired")
|
|
51
|
-
.counter();
|
|
47
|
+
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter();
|
|
52
48
|
|
|
53
|
-
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
54
|
-
.tag("cause", "unsupported")
|
|
55
|
-
.counter();
|
|
49
|
+
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter();
|
|
56
50
|
|
|
57
|
-
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
58
|
-
.tag("cause", "invalid-signature")
|
|
59
|
-
.counter();
|
|
51
|
+
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter();
|
|
60
52
|
|
|
61
|
-
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
62
|
-
.tag("cause", "malformed")
|
|
63
|
-
.counter();
|
|
53
|
+
meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter();
|
|
64
54
|
|
|
65
55
|
Collection<Counter> counters = meterRegistry.find(INVALID_TOKENS_METER_EXPECTED_NAME).counters();
|
|
66
56
|
|
|
@@ -69,45 +59,28 @@ class SecurityMetersServiceTests {
|
|
|
69
59
|
|
|
70
60
|
@Test
|
|
71
61
|
void testCountMethodsShouldBeBoundToCorrectCounters() {
|
|
72
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
73
|
-
.tag("cause", "expired")
|
|
74
|
-
.counter().count()).isZero();
|
|
62
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter().count()).isZero();
|
|
75
63
|
|
|
76
64
|
securityMetersService.trackTokenExpired();
|
|
77
65
|
|
|
78
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
79
|
-
.tag("cause", "expired")
|
|
80
|
-
.counter().count()).isEqualTo(1);
|
|
66
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter().count()).isEqualTo(1);
|
|
81
67
|
|
|
82
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
83
|
-
.tag("cause", "unsupported")
|
|
84
|
-
.counter().count()).isZero();
|
|
68
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter().count()).isZero();
|
|
85
69
|
|
|
86
70
|
securityMetersService.trackTokenUnsupported();
|
|
87
71
|
|
|
88
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
89
|
-
.tag("cause", "unsupported")
|
|
90
|
-
.counter().count()).isEqualTo(1);
|
|
72
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter().count()).isEqualTo(1);
|
|
91
73
|
|
|
92
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
93
|
-
.tag("cause", "invalid-signature")
|
|
94
|
-
.counter().count()).isZero();
|
|
74
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isZero();
|
|
95
75
|
|
|
96
76
|
securityMetersService.trackTokenInvalidSignature();
|
|
97
77
|
|
|
98
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
99
|
-
.tag("cause", "invalid-signature")
|
|
100
|
-
.counter().count()).isEqualTo(1);
|
|
78
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isEqualTo(1);
|
|
101
79
|
|
|
102
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
103
|
-
.tag("cause", "malformed")
|
|
104
|
-
.counter().count()).isZero();
|
|
80
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter().count()).isZero();
|
|
105
81
|
|
|
106
82
|
securityMetersService.trackTokenMalformed();
|
|
107
83
|
|
|
108
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
|
|
109
|
-
.tag("cause", "malformed")
|
|
110
|
-
.counter().count()).isEqualTo(1);
|
|
84
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter().count()).isEqualTo(1);
|
|
111
85
|
}
|
|
112
|
-
|
|
113
86
|
}
|
|
@@ -73,8 +73,7 @@ class SecurityUtilsUnitTest {
|
|
|
73
73
|
claims.put("groups", AuthoritiesConstants.USER);
|
|
74
74
|
claims.put("sub", 123);
|
|
75
75
|
claims.put("preferred_username", "admin");
|
|
76
|
-
OidcIdToken idToken = new OidcIdToken(ID_TOKEN, Instant.now(),
|
|
77
|
-
Instant.now().plusSeconds(60), claims);
|
|
76
|
+
OidcIdToken idToken = new OidcIdToken(ID_TOKEN, Instant.now(), Instant.now().plusSeconds(60), claims);
|
|
78
77
|
Collection<GrantedAuthority> authorities = new ArrayList<>();
|
|
79
78
|
authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
|
|
80
79
|
OidcUser user = new DefaultOidcUser(authorities, idToken);
|
|
@@ -92,12 +91,14 @@ class SecurityUtilsUnitTest {
|
|
|
92
91
|
Map<String, Object> claims = new HashMap<>();
|
|
93
92
|
claims.put("groups", Arrays.asList(AuthoritiesConstants.ADMIN, AuthoritiesConstants.USER));
|
|
94
93
|
|
|
95
|
-
List<GrantedAuthority> expectedAuthorities = Arrays.asList(
|
|
94
|
+
List<GrantedAuthority> expectedAuthorities = Arrays.asList(
|
|
95
|
+
new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN),
|
|
96
|
+
new SimpleGrantedAuthority(AuthoritiesConstants.USER)
|
|
97
|
+
);
|
|
96
98
|
|
|
97
99
|
List<GrantedAuthority> authorities = SecurityUtils.extractAuthorityFromClaims(claims);
|
|
98
100
|
|
|
99
|
-
assertThat(authorities).isNotNull().isNotEmpty().hasSize(2)
|
|
100
|
-
.containsAll(expectedAuthorities);
|
|
101
|
+
assertThat(authorities).isNotNull().isNotEmpty().hasSize(2).containsAll(expectedAuthorities);
|
|
101
102
|
}
|
|
102
103
|
|
|
103
104
|
@Test
|
|
@@ -105,7 +106,10 @@ class SecurityUtilsUnitTest {
|
|
|
105
106
|
Map<String, Object> claims = new HashMap<>();
|
|
106
107
|
claims.put(SecurityUtils.CLAIMS_NAMESPACE + "roles", Arrays.asList(AuthoritiesConstants.ADMIN, AuthoritiesConstants.USER));
|
|
107
108
|
|
|
108
|
-
List<GrantedAuthority> expectedAuthorities = Arrays.asList(
|
|
109
|
+
List<GrantedAuthority> expectedAuthorities = Arrays.asList(
|
|
110
|
+
new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN),
|
|
111
|
+
new SimpleGrantedAuthority(AuthoritiesConstants.USER)
|
|
112
|
+
);
|
|
109
113
|
|
|
110
114
|
List<GrantedAuthority> authorities = SecurityUtils.extractAuthorityFromClaims(claims);
|
|
111
115
|
|
|
@@ -48,11 +48,7 @@ class SecurityUtilsUnitTest {
|
|
|
48
48
|
@Test
|
|
49
49
|
void testgetCurrentUserLogin() {
|
|
50
50
|
String login = SecurityUtils.getCurrentUserLogin()
|
|
51
|
-
.contextWrite(
|
|
52
|
-
ReactiveSecurityContextHolder.withAuthentication(
|
|
53
|
-
new UsernamePasswordAuthenticationToken("admin", "admin")
|
|
54
|
-
)
|
|
55
|
-
)
|
|
51
|
+
.contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin")))
|
|
56
52
|
.block();
|
|
57
53
|
assertThat(login).isEqualTo("admin");
|
|
58
54
|
}
|
|
@@ -61,11 +57,7 @@ class SecurityUtilsUnitTest {
|
|
|
61
57
|
@Test
|
|
62
58
|
void testgetCurrentUserJWT() {
|
|
63
59
|
String jwt = SecurityUtils.getCurrentUserJWT()
|
|
64
|
-
.contextWrite(
|
|
65
|
-
ReactiveSecurityContextHolder.withAuthentication(
|
|
66
|
-
new UsernamePasswordAuthenticationToken("admin", "token")
|
|
67
|
-
)
|
|
68
|
-
)
|
|
60
|
+
.contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "token")))
|
|
69
61
|
.block();
|
|
70
62
|
assertThat(jwt).isEqualTo("token");
|
|
71
63
|
}
|
|
@@ -74,11 +66,7 @@ class SecurityUtilsUnitTest {
|
|
|
74
66
|
@Test
|
|
75
67
|
void testIsAuthenticated() {
|
|
76
68
|
Boolean isAuthenticated = SecurityUtils.isAuthenticated()
|
|
77
|
-
.contextWrite(
|
|
78
|
-
ReactiveSecurityContextHolder.withAuthentication(
|
|
79
|
-
new UsernamePasswordAuthenticationToken("admin", "admin")
|
|
80
|
-
)
|
|
81
|
-
)
|
|
69
|
+
.contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin")))
|
|
82
70
|
.block();
|
|
83
71
|
assertThat(isAuthenticated).isTrue();
|
|
84
72
|
}
|
|
@@ -89,9 +77,7 @@ class SecurityUtilsUnitTest {
|
|
|
89
77
|
authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS));
|
|
90
78
|
Boolean isAuthenticated = SecurityUtils.isAuthenticated()
|
|
91
79
|
.contextWrite(
|
|
92
|
-
ReactiveSecurityContextHolder.withAuthentication(
|
|
93
|
-
new UsernamePasswordAuthenticationToken("admin", "admin", authorities)
|
|
94
|
-
)
|
|
80
|
+
ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin", authorities))
|
|
95
81
|
)
|
|
96
82
|
.block();
|
|
97
83
|
assertThat(isAuthenticated).isFalse();
|
|
@@ -104,12 +90,18 @@ class SecurityUtilsUnitTest {
|
|
|
104
90
|
Context context = ReactiveSecurityContextHolder.withAuthentication(
|
|
105
91
|
new UsernamePasswordAuthenticationToken("admin", "admin", authorities)
|
|
106
92
|
);
|
|
107
|
-
Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(
|
|
93
|
+
Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(
|
|
94
|
+
AuthoritiesConstants.USER,
|
|
95
|
+
AuthoritiesConstants.ADMIN
|
|
96
|
+
)
|
|
108
97
|
.contextWrite(context)
|
|
109
98
|
.block();
|
|
110
99
|
assertThat(hasCurrentUserThisAuthority).isTrue();
|
|
111
100
|
|
|
112
|
-
hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(
|
|
101
|
+
hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(
|
|
102
|
+
AuthoritiesConstants.ANONYMOUS,
|
|
103
|
+
AuthoritiesConstants.ADMIN
|
|
104
|
+
)
|
|
113
105
|
.contextWrite(context)
|
|
114
106
|
.block();
|
|
115
107
|
assertThat(hasCurrentUserThisAuthority).isFalse();
|
|
@@ -122,12 +114,18 @@ class SecurityUtilsUnitTest {
|
|
|
122
114
|
Context context = ReactiveSecurityContextHolder.withAuthentication(
|
|
123
115
|
new UsernamePasswordAuthenticationToken("admin", "admin", authorities)
|
|
124
116
|
);
|
|
125
|
-
Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(
|
|
117
|
+
Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(
|
|
118
|
+
AuthoritiesConstants.USER,
|
|
119
|
+
AuthoritiesConstants.ADMIN
|
|
120
|
+
)
|
|
126
121
|
.contextWrite(context)
|
|
127
122
|
.block();
|
|
128
123
|
assertThat(hasCurrentUserThisAuthority).isFalse();
|
|
129
124
|
|
|
130
|
-
hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(
|
|
125
|
+
hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(
|
|
126
|
+
AuthoritiesConstants.ANONYMOUS,
|
|
127
|
+
AuthoritiesConstants.ADMIN
|
|
128
|
+
)
|
|
131
129
|
.contextWrite(context)
|
|
132
130
|
.block();
|
|
133
131
|
assertThat(hasCurrentUserThisAuthority).isTrue();
|
|
@@ -145,9 +143,7 @@ class SecurityUtilsUnitTest {
|
|
|
145
143
|
.block();
|
|
146
144
|
assertThat(hasCurrentUserThisAuthority).isTrue();
|
|
147
145
|
|
|
148
|
-
hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.ADMIN)
|
|
149
|
-
.contextWrite(context)
|
|
150
|
-
.block();
|
|
146
|
+
hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.ADMIN).contextWrite(context).block();
|
|
151
147
|
assertThat(hasCurrentUserThisAuthority).isFalse();
|
|
152
148
|
}
|
|
153
149
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
package <%= packageName %>.security.jwt;
|
|
2
2
|
|
|
3
|
+
import org.springframework.http.MediaType;
|
|
3
4
|
import org.springframework.web.bind.annotation.*;
|
|
4
5
|
|
|
5
6
|
/**
|
|
@@ -8,12 +9,13 @@ import org.springframework.web.bind.annotation.*;
|
|
|
8
9
|
@RestController
|
|
9
10
|
@RequestMapping("/api")
|
|
10
11
|
public class TestAuthenticationResource {
|
|
12
|
+
|
|
11
13
|
/**
|
|
12
14
|
* {@code GET /authenticate} : check if the authentication token correctly validates
|
|
13
15
|
*
|
|
14
16
|
* @return ok.
|
|
15
17
|
*/
|
|
16
|
-
@GetMapping("/authenticate")
|
|
18
|
+
@GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
|
|
17
19
|
public String isAuthenticated() {
|
|
18
20
|
return "ok";
|
|
19
21
|
}
|
|
@@ -68,8 +68,9 @@ class TokenAuthenticationSecurityMetersIT {
|
|
|
68
68
|
|
|
69
69
|
tryToAuthenticate(createTokenWithDifferentSignature());
|
|
70
70
|
|
|
71
|
-
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count())
|
|
72
|
-
|
|
71
|
+
assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isEqualTo(
|
|
72
|
+
count + 1
|
|
73
|
+
);
|
|
73
74
|
}
|
|
74
75
|
|
|
75
76
|
@Test
|
|
@@ -77,8 +77,7 @@ class CustomClaimConverterIT {
|
|
|
77
77
|
any(HttpEntity.class),
|
|
78
78
|
ArgumentMatchers.<Class<ObjectNode>>any()
|
|
79
79
|
)
|
|
80
|
-
)
|
|
81
|
-
.thenReturn(ResponseEntity.ok(userInfo));
|
|
80
|
+
).thenReturn(ResponseEntity.ok(userInfo));
|
|
82
81
|
}
|
|
83
82
|
|
|
84
83
|
@Test
|
|
@@ -157,11 +156,9 @@ class CustomClaimConverterIT {
|
|
|
157
156
|
user.put("preferred_username", USERNAME);
|
|
158
157
|
mockHttpGetUserInfo(user);
|
|
159
158
|
|
|
160
|
-
assertThatCode(() ->
|
|
159
|
+
assertThatCode(() -> {
|
|
161
160
|
Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
|
|
162
|
-
assertThat(convertedClaims)
|
|
163
|
-
.containsEntry("preferred_username", USERNAME)
|
|
164
|
-
.doesNotContainKeys("given_name", "family_name");
|
|
161
|
+
assertThat(convertedClaims).containsEntry("preferred_username", USERNAME).doesNotContainKeys("given_name", "family_name");
|
|
165
162
|
}).doesNotThrowAnyException();
|
|
166
163
|
}
|
|
167
164
|
|
|
@@ -176,7 +173,7 @@ class CustomClaimConverterIT {
|
|
|
176
173
|
user.put("name", FULL_NAME);
|
|
177
174
|
mockHttpGetUserInfo(user);
|
|
178
175
|
|
|
179
|
-
assertThatCode(() ->
|
|
176
|
+
assertThatCode(() -> {
|
|
180
177
|
Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
|
|
181
178
|
assertThat(convertedClaims)
|
|
182
179
|
.containsEntry("preferred_username", USERNAME)
|
|
@@ -196,7 +193,7 @@ class CustomClaimConverterIT {
|
|
|
196
193
|
user.put("name", FULL_NAME + " " + NAME_SUFFIX);
|
|
197
194
|
mockHttpGetUserInfo(user);
|
|
198
195
|
|
|
199
|
-
assertThatCode(() ->
|
|
196
|
+
assertThatCode(() -> {
|
|
200
197
|
Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
|
|
201
198
|
System.out.println(convertedClaims);
|
|
202
199
|
assertThat(convertedClaims)
|
|
@@ -217,11 +214,9 @@ class CustomClaimConverterIT {
|
|
|
217
214
|
user.put("email", EMAIL);
|
|
218
215
|
mockHttpGetUserInfo(user);
|
|
219
216
|
|
|
220
|
-
assertThatCode(() ->
|
|
217
|
+
assertThatCode(() -> {
|
|
221
218
|
Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
|
|
222
|
-
assertThat(convertedClaims)
|
|
223
|
-
.containsEntry("preferred_username", USERNAME)
|
|
224
|
-
.containsEntry("email", EMAIL);
|
|
219
|
+
assertThat(convertedClaims).containsEntry("preferred_username", USERNAME).containsEntry("email", EMAIL);
|
|
225
220
|
}).doesNotThrowAnyException();
|
|
226
221
|
}
|
|
227
222
|
}
|
|
@@ -78,7 +78,7 @@ class MailServiceIT {
|
|
|
78
78
|
@BeforeEach
|
|
79
79
|
public void setup() {
|
|
80
80
|
doNothing().when(javaMailSender).send(any(MimeMessage.class));
|
|
81
|
-
when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session)null));
|
|
81
|
+
when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session) null));
|
|
82
82
|
}
|
|
83
83
|
|
|
84
84
|
@Test
|
|
@@ -233,7 +233,9 @@ class MailServiceIT {
|
|
|
233
233
|
|
|
234
234
|
String emailTitle = (String) properties.get("email.test.title");
|
|
235
235
|
assertThat(message.getSubject()).isEqualTo(emailTitle);
|
|
236
|
-
assertThat(message.getContent().toString()).isEqualToNormalizingNewlines(
|
|
236
|
+
assertThat(message.getContent().toString()).isEqualToNormalizingNewlines(
|
|
237
|
+
"<html>" + emailTitle + ", http://127.0.0.1:8080, john</html>\n"
|
|
238
|
+
);
|
|
237
239
|
}
|
|
238
240
|
}
|
|
239
241
|
|
|
@@ -244,7 +246,7 @@ class MailServiceIT {
|
|
|
244
246
|
String javaLangKey = langKey;
|
|
245
247
|
Matcher matcher2 = PATTERN_LOCALE_2.matcher(langKey);
|
|
246
248
|
if (matcher2.matches()) {
|
|
247
|
-
javaLangKey = matcher2.group(1) + "_"+ matcher2.group(2).toUpperCase();
|
|
249
|
+
javaLangKey = matcher2.group(1) + "_" + matcher2.group(2).toUpperCase();
|
|
248
250
|
}
|
|
249
251
|
Matcher matcher3 = PATTERN_LOCALE_3.matcher(langKey);
|
|
250
252
|
if (matcher3.matches()) {
|