generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.2

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.
Files changed (229) hide show
  1. package/README.md +0 -5
  2. package/dist/generators/angular/resources/package.json +14 -14
  3. package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +1 -1
  4. package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs +9 -14
  5. package/dist/generators/angular/templates/src/main/webapp/app/app-routing.module.ts.ejs +1 -1
  6. package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +26 -33
  7. package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +1 -1
  8. package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
  9. package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs +1 -1
  10. package/dist/generators/app/generator.mjs +0 -1
  11. package/dist/generators/app/prompts.mjs +1 -1
  12. package/dist/generators/base/generator-base-blueprint.mjs +5 -3
  13. package/dist/generators/base/generator-base-todo.mjs +5 -12
  14. package/dist/generators/base/support/faker.mjs +6 -8
  15. package/dist/generators/base-application/support/prepare-field.mjs +9 -9
  16. package/dist/generators/base-core/generator-base.mjs +565 -0
  17. package/dist/generators/base-core/index.mjs +1 -1
  18. package/dist/generators/base-docker/generator.mjs +0 -7
  19. package/dist/generators/bootstrap/generator.mjs +10 -26
  20. package/dist/generators/ci-cd/templates/jenkins/idea.gdsl.ejs +1 -1
  21. package/dist/generators/client/needle-api/needle-client-webpack.mjs +1 -1
  22. package/dist/generators/client/resources/package.json +6 -6
  23. package/dist/generators/client/templates/src/main/webapp/index.html.ejs +7 -8
  24. package/dist/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs +2 -1
  25. package/dist/generators/common/resources/package.json +3 -3
  26. package/dist/generators/docker/generator.mjs +1 -1
  27. package/dist/generators/docker/templates/src/main/docker/app.yml.ejs +1 -2
  28. package/dist/generators/docker/templates/src/main/docker/mariadb.yml.ejs +5 -5
  29. package/dist/generators/docker-compose/generator.mjs +1 -1
  30. package/dist/generators/entities/generator.mjs +0 -1
  31. package/dist/generators/generate-blueprint/files.mjs +1 -0
  32. package/dist/generators/generate-blueprint/generator.mjs +3 -1
  33. package/dist/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs +1 -1
  34. package/dist/generators/generate-blueprint/templates/tsconfig.json.ejs +31 -0
  35. package/dist/generators/generator-constants.mjs +11 -14
  36. package/dist/generators/gradle/constants.mjs +1 -1
  37. package/dist/generators/heroku/generator.mjs +42 -2
  38. package/dist/generators/init/constants.mjs +0 -1
  39. package/dist/generators/init/generator.mjs +3 -2
  40. package/dist/generators/init/templates/package.json.ejs +1 -1
  41. package/dist/generators/jdl/generator.mjs +22 -15
  42. package/dist/generators/kubernetes/kubernetes-base.mjs +2 -2
  43. package/dist/generators/kubernetes/templates/deployment.yml.ejs +1 -3
  44. package/dist/generators/kubernetes-helm/templates/app/Chart.yml.ejs +1 -1
  45. package/dist/generators/kubernetes-helm/templates/app/requirements.yml.ejs +1 -1
  46. package/dist/generators/kubernetes-knative/templates/service.yml.ejs +1 -3
  47. package/dist/generators/languages/templates/entity/i18n/entity_ja.json.ejs +11 -11
  48. package/dist/generators/languages/templates/src/main/resources/i18n/messages_ja.properties.ejs +7 -7
  49. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/error.json +5 -5
  50. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/gateway.json +6 -6
  51. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/global.json.ejs +37 -37
  52. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/health.json.ejs +6 -6
  53. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/home.json +2 -2
  54. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/login.json +2 -2
  55. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/metrics.json +54 -46
  56. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/register.json +1 -1
  57. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/reset.json.ejs +10 -10
  58. package/dist/generators/languages/templates/src/main/webapp/i18n/ja/user-management.json +21 -21
  59. package/dist/generators/liquibase/generator.mjs +6 -0
  60. package/dist/generators/liquibase/support/maven-plugin.mjs +2 -1
  61. package/dist/generators/liquibase/templates/gradle/liquibase.gradle.ejs +14 -4
  62. package/dist/generators/liquibase-changelogs/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs +1 -1
  63. package/dist/generators/openshift/templates/deployment.yml.ejs +1 -3
  64. package/dist/generators/page/generator.mjs +0 -1
  65. package/dist/generators/react/resources/package.json +26 -26
  66. package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.tsx.ejs +1 -0
  67. package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +1 -1
  68. package/dist/generators/server/command.mjs +1 -1
  69. package/dist/generators/server/generator.mjs +1 -7
  70. package/dist/generators/server/resources/Dockerfile +11 -11
  71. package/dist/generators/server/resources/gradle/libs.versions.toml +5 -3
  72. package/dist/generators/server/resources/pom.xml +35 -17
  73. package/dist/generators/server/support/spring-factories.mjs +8 -13
  74. package/dist/generators/server/templates/.devcontainer/devcontainer.json.ejs +24 -19
  75. package/dist/generators/server/templates/build.gradle.ejs +10 -1
  76. package/dist/generators/server/templates/entity/src/test/java/package/web/rest/_EntityClass_ResourceIT.java.ejs +2 -2
  77. package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs +16 -4
  78. package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs +16 -4
  79. package/dist/generators/server/templates/gradle.properties.ejs +1 -0
  80. package/dist/generators/server/templates/pom.xml.ejs +39 -9
  81. package/dist/generators/server/templates/settings.gradle.ejs +1 -0
  82. package/dist/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs +3 -3
  83. package/dist/generators/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs +11 -4
  84. package/dist/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +5 -3
  85. package/dist/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +3 -3
  86. package/dist/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +1 -1
  87. package/dist/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs +2 -4
  88. package/dist/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs +1 -1
  89. package/dist/generators/server/templates/src/main/java/package/service/UserService.java.ejs +1 -1
  90. package/dist/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +3 -3
  91. package/dist/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs +2 -2
  92. package/dist/generators/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.ejs +0 -9
  93. package/dist/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs +2 -2
  94. package/dist/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +1 -2
  95. package/dist/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +1 -2
  96. package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs +1 -1
  97. package/dist/generators/server/templates/src/main/resources/logback-spring.xml.ejs +4 -0
  98. package/dist/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +70 -37
  99. package/dist/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_imperative.java.ejs +1 -1
  100. package/dist/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_reactive.java.ejs +1 -1
  101. package/dist/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +7 -7
  102. package/dist/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +5 -5
  103. package/dist/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +6 -6
  104. package/dist/generators/spring-cache/internal/dependencies.mjs +3 -0
  105. package/dist/generators/spring-controller/generator.mjs +0 -1
  106. package/dist/generators/spring-data-relational/internal/dependencies.mjs +6 -6
  107. package/dist/generators/spring-data-relational/support/database-data.mjs +0 -4
  108. package/dist/generators/spring-data-relational/templates/src/test/java/package/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +1 -1
  109. package/dist/generators/spring-service/generator.mjs +0 -1
  110. package/dist/generators/upgrade/generator.mjs +25 -55
  111. package/dist/generators/vue/resources/package.json +23 -23
  112. package/dist/types/generators/angular/support/index.d.mts +23 -0
  113. package/dist/types/generators/angular/support/needles.d.mts +35 -0
  114. package/dist/types/generators/angular/support/path-utils.d.mts +1 -0
  115. package/dist/types/generators/angular/support/translate-angular.d.mts +11 -0
  116. package/dist/types/generators/angular/support/update-languages.d.mts +21 -0
  117. package/dist/types/generators/angular/types-export.d.ts +1 -0
  118. package/dist/types/generators/app/support/check-node.d.mts +10 -0
  119. package/dist/types/generators/app/support/index.d.mts +19 -0
  120. package/dist/types/generators/app/types-export.d.ts +1 -0
  121. package/dist/types/generators/aws/types-export.d.ts +1 -0
  122. package/dist/types/generators/azure-app-service/types-export.d.ts +1 -0
  123. package/dist/types/generators/azure-spring-cloud/types-export.d.ts +1 -0
  124. package/dist/types/generators/base/generator-base-blueprint.d.mts +1 -1
  125. package/dist/types/generators/base/generator-base-todo.d.mts +9 -15
  126. package/dist/types/generators/base/support/needles.d.mts +1 -1
  127. package/dist/types/generators/base/types-export.d.ts +4 -0
  128. package/dist/types/generators/base-application/generator.d.mts +1 -22
  129. package/dist/types/generators/base-application/types-export.d.ts +4 -0
  130. package/dist/types/generators/base-core/generator-base.d.mts +166 -0
  131. package/dist/types/generators/base-core/index.d.mts +1 -1
  132. package/dist/types/generators/base-core/types-export.d.ts +1 -0
  133. package/dist/types/generators/bootstrap/support/auto-crlf-transform.d.mts +7 -0
  134. package/dist/types/generators/bootstrap/support/force-write-config-files-transform.d.mts +3 -0
  135. package/dist/types/generators/bootstrap/support/index.d.mts +23 -0
  136. package/dist/types/generators/bootstrap/support/multi-step-transform/index.d.mts +24 -0
  137. package/dist/types/generators/bootstrap/support/multi-step-transform/template-data.d.mts +18 -0
  138. package/dist/types/generators/bootstrap/support/multi-step-transform/template-file-fs.d.mts +11 -0
  139. package/dist/types/generators/bootstrap/support/multi-step-transform/template-file.d.mts +18 -0
  140. package/dist/types/generators/bootstrap/support/prettier-support.d.mts +2 -0
  141. package/dist/types/generators/bootstrap/support/sort-config-files-transform.d.mts +2 -0
  142. package/dist/types/generators/bootstrap/types-export.d.ts +1 -0
  143. package/dist/types/generators/bootstrap-application/types-export.d.ts +1 -0
  144. package/dist/types/generators/bootstrap-application-base/types-export.d.ts +1 -0
  145. package/dist/types/generators/bootstrap-application-client/types-export.d.ts +1 -0
  146. package/dist/types/generators/bootstrap-application-server/types-export.d.ts +1 -0
  147. package/dist/types/generators/ci-cd/types-export.d.ts +1 -0
  148. package/dist/types/generators/client/needle-api/needle-client-webpack.d.mts +1 -1
  149. package/dist/types/generators/client/types-export.d.ts +1 -0
  150. package/dist/types/generators/cloudfoundry/types-export.d.ts +1 -0
  151. package/dist/types/generators/common/types-export.d.ts +1 -0
  152. package/dist/types/generators/cucumber/types-export.d.ts +1 -0
  153. package/dist/types/generators/cypress/types-export.d.ts +1 -0
  154. package/dist/types/generators/docker/types-export.d.ts +1 -0
  155. package/dist/types/generators/docker-compose/types-export.d.ts +1 -0
  156. package/dist/types/generators/entities/types-export.d.ts +1 -0
  157. package/dist/types/generators/entity/support/asserts.d.mts +18 -0
  158. package/dist/types/generators/entity/support/index.d.mts +19 -0
  159. package/dist/types/generators/entity/types-export.d.ts +1 -0
  160. package/dist/types/generators/export-jdl/types-export.d.ts +1 -0
  161. package/dist/types/generators/gae/types-export.d.ts +1 -0
  162. package/dist/types/generators/gatling/types-export.d.ts +1 -0
  163. package/dist/types/generators/generate-blueprint/types-export.d.ts +1 -0
  164. package/dist/types/generators/generator-constants.d.mts +6 -6
  165. package/dist/types/generators/git/types-export.d.ts +1 -0
  166. package/dist/types/generators/gradle/types-export.d.ts +1 -0
  167. package/dist/types/generators/heroku/types-export.d.ts +1 -0
  168. package/dist/types/generators/info/types-export.d.ts +1 -0
  169. package/dist/types/generators/init/types-export.d.ts +1 -0
  170. package/dist/types/generators/java/support/add-java-annotation.d.mts +22 -0
  171. package/dist/types/generators/java/support/checks/check-java.d.mts +9 -0
  172. package/dist/types/generators/java/support/checks/index.d.mts +1 -0
  173. package/dist/types/generators/java/support/generated-annotation-transform.d.mts +3 -0
  174. package/dist/types/generators/java/support/index.d.mts +23 -0
  175. package/dist/types/generators/java/support/package-info-transform.d.mts +11 -0
  176. package/dist/types/generators/java/types-export.d.ts +1 -0
  177. package/dist/types/generators/jdl/types-export.d.ts +1 -0
  178. package/dist/types/generators/kubernetes/types-export.d.ts +1 -0
  179. package/dist/types/generators/kubernetes-helm/types-export.d.ts +1 -0
  180. package/dist/types/generators/kubernetes-knative/types-export.d.ts +1 -0
  181. package/dist/types/generators/languages/types-export.d.ts +1 -0
  182. package/dist/types/generators/liquibase/support/index.d.mts +21 -0
  183. package/dist/types/generators/liquibase/support/maven-plugin.d.mts +13 -0
  184. package/dist/types/generators/liquibase/support/post-prepare-entity.d.mts +2 -0
  185. package/dist/types/generators/liquibase/support/prepare-field.d.mts +1 -0
  186. package/dist/types/generators/liquibase/support/relationship.d.mts +15 -0
  187. package/dist/types/generators/liquibase/types-export.d.ts +1 -0
  188. package/dist/types/generators/liquibase/types.d.mts +8 -0
  189. package/dist/types/generators/liquibase-changelogs/support/formatting.d.mts +9 -0
  190. package/dist/types/generators/liquibase-changelogs/support/index.d.mts +19 -0
  191. package/dist/types/generators/liquibase-changelogs/types-export.d.ts +1 -0
  192. package/dist/types/generators/maven/internal/xml-store.d.mts +40 -0
  193. package/dist/types/generators/maven/support/index.d.mts +20 -0
  194. package/dist/types/generators/maven/support/pom-store.d.mts +47 -0
  195. package/dist/types/generators/maven/types-export.d.ts +1 -0
  196. package/dist/types/generators/needle-base.d.mts +1 -1
  197. package/dist/types/generators/openapi-client/types-export.d.ts +1 -0
  198. package/dist/types/generators/openshift/types-export.d.ts +1 -0
  199. package/dist/types/generators/page/support/index.d.mts +19 -0
  200. package/dist/types/generators/page/support/needles.d.mts +22 -0
  201. package/dist/types/generators/page/types-export.d.ts +1 -0
  202. package/dist/types/generators/project-name/types-export.d.ts +1 -0
  203. package/dist/types/generators/react/support/index.d.mts +22 -0
  204. package/dist/types/generators/react/support/needles.d.mts +1 -0
  205. package/dist/types/generators/react/support/translate-react.d.mts +5 -0
  206. package/dist/types/generators/react/support/update-languages.d.mts +21 -0
  207. package/dist/types/generators/react/types-export.d.ts +1 -0
  208. package/dist/types/generators/server/types-export.d.ts +1 -0
  209. package/dist/types/generators/server/types.d.mts +2 -0
  210. package/dist/types/generators/spring-cache/types-export.d.ts +1 -0
  211. package/dist/types/generators/spring-cloud-stream/types-export.d.ts +1 -0
  212. package/dist/types/generators/spring-controller/types-export.d.ts +1 -0
  213. package/dist/types/generators/spring-data-cassandra/types-export.d.ts +1 -0
  214. package/dist/types/generators/spring-data-couchbase/types-export.d.ts +1 -0
  215. package/dist/types/generators/spring-data-elasticsearch/types-export.d.ts +1 -0
  216. package/dist/types/generators/spring-data-mongodb/types-export.d.ts +1 -0
  217. package/dist/types/generators/spring-data-neo4j/types-export.d.ts +1 -0
  218. package/dist/types/generators/spring-data-relational/types-export.d.ts +1 -0
  219. package/dist/types/generators/spring-service/types-export.d.ts +1 -0
  220. package/dist/types/generators/spring-websocket/types-export.d.ts +1 -0
  221. package/dist/types/generators/upgrade/types-export.d.ts +1 -0
  222. package/dist/types/generators/vue/support/convert-translation.d.mts +11 -0
  223. package/dist/types/generators/vue/support/index.d.mts +23 -0
  224. package/dist/types/generators/vue/support/needles.d.mts +1 -0
  225. package/dist/types/generators/vue/support/translate-vue.d.mts +22 -0
  226. package/dist/types/generators/vue/support/update-languages.d.mts +21 -0
  227. package/dist/types/generators/vue/types-export.d.ts +1 -0
  228. package/dist/types/generators/workspaces/types-export.d.ts +1 -0
  229. package/package.json +33 -26
@@ -60,6 +60,7 @@
60
60
  <spring-boot.version><%- javaDependencies['spring-boot'] %></spring-boot.version>
61
61
  <%_ if (reactive) { _%>
62
62
  <blockhound-junit-platform.version><%- javaDependencies['blockhound-junit-platform'] %></blockhound-junit-platform.version>
63
+ <micrometer-context-propagation.version><%- javaDependencies['micrometer-context-propagation'] %></micrometer-context-propagation.version>
63
64
  <%_ } _%>
64
65
  <archunit-junit5.version><%- javaDependencies['archunit-junit5'] %></archunit-junit5.version>
65
66
  <mapstruct.version><%- javaDependencies.mapstruct %></mapstruct.version>
@@ -71,7 +72,7 @@
71
72
  <checksum-maven-plugin.version><%- javaDependencies['checksum-maven-plugin'] %></checksum-maven-plugin.version>
72
73
  <frontend-maven-plugin.version><%- javaDependencies['frontend-maven-plugin'] %></frontend-maven-plugin.version>
73
74
  <%_ } _%>
74
- <git-commit-id-plugin.version><%- javaDependencies['git-commit-id-plugin'] %></git-commit-id-plugin.version>
75
+ <git-commit-id-maven-plugin.version><%- javaDependencies['git-commit-id-maven-plugin'] %></git-commit-id-maven-plugin.version>
75
76
  <jacoco-maven-plugin.version><%- javaDependencies['jacoco-maven-plugin'] %></jacoco-maven-plugin.version>
76
77
  <jib-maven-plugin.version><%- javaDependencies['jib-maven-plugin'] %></jib-maven-plugin.version>
77
78
  <jib-maven-plugin.image><%- dockerContainers.javaJre %></jib-maven-plugin.image>
@@ -100,6 +101,7 @@
100
101
  <%_ } _%>
101
102
  <properties-maven-plugin.version><%- javaDependencies['properties-maven-plugin'] %></properties-maven-plugin.version>
102
103
  <sonar-maven-plugin.version><%- javaDependencies['sonar-maven-plugin'] %></sonar-maven-plugin.version>
104
+ <spotless-maven-plugin.version><%- javaDependencies['spotless-maven-plugin'] %></spotless-maven-plugin.version>
103
105
  </properties>
104
106
 
105
107
  <dependencyManagement>
@@ -199,6 +201,12 @@
199
201
  <version>${blockhound-junit-platform.version}</version>
200
202
  <scope>test</scope>
201
203
  </dependency>
204
+ <dependency>
205
+ <!-- fix https://github.com/jhipster/generator-jhipster/issues/21359 -->
206
+ <groupId>io.micrometer</groupId>
207
+ <artifactId>context-propagation</artifactId>
208
+ <version>${micrometer-context-propagation.version}</version>
209
+ </dependency>
202
210
  <%_ } else { _%>
203
211
  <dependency>
204
212
  <groupId>org.springframework.boot</groupId>
@@ -346,12 +354,6 @@
346
354
  <groupId>io.micrometer</groupId>
347
355
  <artifactId>micrometer-registry-prometheus</artifactId>
348
356
  </dependency>
349
- <dependency>
350
- <!-- fix https://github.com/reactor/BlockHound/issues/311 -->
351
- <groupId>io.micrometer</groupId>
352
- <artifactId>context-propagation</artifactId>
353
- <version>1.0.0</version>
354
- </dependency>
355
357
  <dependency>
356
358
  <groupId>io.dropwizard.metrics</groupId>
357
359
  <artifactId>metrics-core</artifactId>
@@ -405,6 +407,10 @@
405
407
  <groupId>org.sonarsource.scanner.maven</groupId>
406
408
  <artifactId>sonar-maven-plugin</artifactId>
407
409
  </plugin>
410
+ <plugin>
411
+ <groupId>com.diffplug.spotless</groupId>
412
+ <artifactId>spotless-maven-plugin</artifactId>
413
+ </plugin>
408
414
  <plugin>
409
415
  <groupId>org.springframework.boot</groupId>
410
416
  <artifactId>spring-boot-maven-plugin</artifactId>
@@ -555,7 +561,7 @@
555
561
  <plugin>
556
562
  <groupId>io.github.git-commit-id</groupId>
557
563
  <artifactId>git-commit-id-maven-plugin</artifactId>
558
- <version>${git-commit-id-plugin.version}</version>
564
+ <version>${git-commit-id-maven-plugin.version}</version>
559
565
  <executions>
560
566
  <execution>
561
567
  <goals>
@@ -589,6 +595,12 @@
589
595
  </executions>
590
596
  <configuration>
591
597
  <javaVersion>${java.version}</javaVersion>
598
+ <%_ if (databaseTypeCassandra) { _%>
599
+ <ignoreClassNamePatterns>
600
+ <ignoreClassNamePattern><%= packageName %>.domain.PersistentTokenHelper__MapperGenerated</ignoreClassNamePattern>
601
+ <ignoreClassNamePattern><%= packageName %>.domain.UserHelper__MapperGenerated</ignoreClassNamePattern>
602
+ </ignoreClassNamePatterns>
603
+ <%_ } _%>
592
604
  </configuration>
593
605
  </plugin>
594
606
  <plugin>
@@ -838,6 +850,25 @@
838
850
  <artifactId>sonar-maven-plugin</artifactId>
839
851
  <version>${sonar-maven-plugin.version}</version>
840
852
  </plugin>
853
+ <plugin>
854
+ <groupId>com.diffplug.spotless</groupId>
855
+ <artifactId>spotless-maven-plugin</artifactId>
856
+ <version>${spotless-maven-plugin.version}</version>
857
+ <configuration>
858
+ <java>
859
+ <removeUnusedImports />
860
+ </java>
861
+ </configuration>
862
+ <executions>
863
+ <execution>
864
+ <id>spotless</id>
865
+ <phase>process-sources</phase>
866
+ <goals>
867
+ <goal>apply</goal>
868
+ </goals>
869
+ </execution>
870
+ </executions>
871
+ </plugin>
841
872
  <plugin>
842
873
  <groupId>org.springframework.boot</groupId>
843
874
  <artifactId>spring-boot-maven-plugin</artifactId>
@@ -854,7 +885,6 @@
854
885
  <%_ if (embeddableLaunchScript) { _%>
855
886
  <executable>true</executable>
856
887
  <%_ } _%>
857
- <fork>true</fork>
858
888
  <!--
859
889
  Enable the line below to have remote debugging of your application on port 5005
860
890
  <jvmArguments>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</jvmArguments>
@@ -37,6 +37,7 @@ pluginManagement {
37
37
  id 'com.github.node-gradle.node' version "${gradleNodePluginVersion}"
38
38
  <%_ } _%>
39
39
  id 'org.sonarqube' version "${sonarqubePluginVersion}"
40
+ id 'com.diffplug.spotless' version "${spotlessPluginVersion}"
40
41
  id "io.spring.nohttp" version "${noHttpCheckstyleVersion}"
41
42
  id 'com.github.andygoossens.gradle-modernizer-plugin' version "${modernizerPluginVersion}"
42
43
  <%_ if (enableGradleEnterprise) { _%>
@@ -19,7 +19,7 @@
19
19
  package <%= packageName %>.config;
20
20
 
21
21
  <%_ if (databaseTypeSql && !reactive) { _%>
22
- import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;
22
+ import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
23
23
  <%_ } _%>
24
24
  import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
25
25
  import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -49,8 +49,8 @@ public class JacksonConfiguration {
49
49
  * Support for Hibernate types in Jackson.
50
50
  */
51
51
  @Bean
52
- public Hibernate5JakartaModule hibernate5Module() {
53
- return new Hibernate5JakartaModule();
52
+ public Hibernate6Module hibernate6Module() {
53
+ return new Hibernate6Module();
54
54
  }
55
55
  <%_ } _%>
56
56
  }
@@ -31,7 +31,9 @@ import org.springframework.http.HttpMethod;
31
31
  <%_ } _%>
32
32
  import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
33
33
  import org.springframework.security.config.annotation.web.builders.HttpSecurity;
34
- import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
34
+ <%_ if (!skipClient) { _%>
35
+ import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig;
36
+ <%_ } _%>
35
37
  import org.springframework.security.web.SecurityFilterChain;
36
38
  <%_ if (!skipClient || authenticationUsesCsrf) { _%>
37
39
  import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
@@ -81,7 +83,6 @@ import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
81
83
  <%_ } _%>
82
84
  <%_ if (authenticationTypeOauth2) { _%>
83
85
  import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
84
- import static org.springframework.security.config.Customizer.withDefaults;
85
86
  <%_ } _%>
86
87
  <%_ if (authenticationTypeJwt) { _%>
87
88
  import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationEntryPoint;
@@ -96,8 +97,11 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter;
96
97
  import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
97
98
  <%_ } _%>
98
99
 
100
+ <%_ if (authenticationTypeOauth2 || !applicationTypeMicroservice) { _%>
101
+ import static org.springframework.security.config.Customizer.withDefaults;
102
+ <%_ } _%>
103
+
99
104
  @Configuration
100
- @EnableWebSecurity
101
105
  @EnableMethodSecurity(securedEnabled = true)
102
106
  public class SecurityConfiguration {
103
107
 
@@ -129,6 +133,9 @@ public class SecurityConfiguration {
129
133
  @Bean
130
134
  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
131
135
  http
136
+ <%_ if (!applicationTypeMicroservice) { _%>
137
+ .cors(withDefaults())
138
+ <%_ } _%>
132
139
  .csrf(csrf -> csrf
133
140
  <%_ if (devDatabaseTypeH2Any) { _%>
134
141
  .ignoringRequestMatchers("/h2-console/**")
@@ -151,7 +158,7 @@ public class SecurityConfiguration {
151
158
  <%_ if (!skipClient) { _%>
152
159
  .headers(headers -> headers
153
160
  .contentSecurityPolicy(csp -> csp.policyDirectives(jHipsterProperties.getSecurity().getContentSecurityPolicy()))
154
- .frameOptions(frameOptions -> frameOptions.sameOrigin())
161
+ .frameOptions(FrameOptionsConfig::sameOrigin)
155
162
  .referrerPolicy(referrer -> referrer.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN))
156
163
  .permissionsPolicy(permissions ->
157
164
  permissions.policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")))
@@ -46,7 +46,6 @@ import org.springframework.core.ParameterizedTypeReference;
46
46
  <%_ } _%>
47
47
  <%_ } _%>
48
48
  import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
49
- import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
50
49
  import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
51
50
  import org.springframework.security.config.web.server.ServerHttpSecurity;
52
51
  <%_ if (authenticationTypeSession) { _%>
@@ -131,14 +130,14 @@ import java.util.Set;
131
130
  <%_ if (!applicationTypeMicroservice) { _%>
132
131
  import java.util.function.Consumer;
133
132
  <%_ } _%>
133
+ <%_ } _%>
134
134
 
135
+ <%_ if (authenticationTypeOauth2 || !applicationTypeMicroservice) { _%>
135
136
  import static org.springframework.security.config.Customizer.withDefaults;
136
137
  <%_ } _%>
137
-
138
138
  import static org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers.pathMatchers;
139
139
 
140
140
  @Configuration
141
- @EnableWebFluxSecurity
142
141
  @EnableReactiveMethodSecurity
143
142
  public class SecurityConfiguration {
144
143
 
@@ -211,6 +210,9 @@ public class SecurityConfiguration {
211
210
  .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
212
211
  pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**")
213
212
  )))
213
+ <%_ if (!applicationTypeMicroservice) { _%>
214
+ .cors(withDefaults())
215
+ <%_ } _%>
214
216
  .csrf(csrf -> csrf
215
217
  <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
216
218
  .csrfTokenRepository(CookieServerCsrfTokenRepository.withHttpOnlyFalse())
@@ -64,7 +64,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
64
64
  import org.springframework.web.filter.CorsFilter;
65
65
  <%_ } _%>
66
66
  <%_ if (reactive) { _%>
67
- import org.springframework.web.cors.reactive.CorsWebFilter;
67
+ import org.springframework.web.cors.reactive.CorsConfigurationSource;;
68
68
  import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
69
69
  import org.springframework.web.reactive.config.WebFluxConfigurer;
70
70
  import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver;
@@ -175,7 +175,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
175
175
  <%_ } _%>
176
176
 
177
177
  @Bean
178
- public Cors<% if (reactive) { %>Web<% } %>Filter corsFilter() {
178
+ public <% if (reactive) { %>CorsConfigurationSource corsConfigurationSource()<% } else { %>CorsFilter corsFilter()<% } %> {
179
179
  UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
180
180
  CorsConfiguration config = jHipsterProperties.getCors();
181
181
  if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || ! CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) {
@@ -190,7 +190,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
190
190
  source.registerCorsConfiguration("/*/management/**", config);
191
191
  <%_ } _%>
192
192
  }
193
- return new Cors<% if (reactive) { %>Web<% } %>Filter(source);
193
+ return <% if (reactive) { %>source<% } else { %>new CorsFilter(source)<% } %>;
194
194
  }
195
195
  <%_ if (reactive) { _%>
196
196
 
@@ -427,7 +427,7 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal {
427
427
  .map(
428
428
  t -> {
429
429
  Authority authority = new Authority();
430
- authority.setName(t.getT2().get());
430
+ authority.setName(t.getT2().orElseThrow());
431
431
  return authority;
432
432
  }
433
433
  )
@@ -26,7 +26,6 @@ import <%= packageName %>.repository.UserRepository;
26
26
  import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
27
27
  import org.slf4j.Logger;
28
28
  import org.slf4j.LoggerFactory;
29
- import org.springframework.security.core.GrantedAuthority;
30
29
  import org.springframework.security.core.authority.SimpleGrantedAuthority;
31
30
  <%_ if (reactive) { _%>
32
31
  import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
@@ -45,7 +44,6 @@ import reactor.core.publisher.Mono;
45
44
  <%_ } _%>
46
45
 
47
46
  import java.util.*;
48
- import java.util.stream.Collectors;
49
47
 
50
48
  /**
51
49
  * Authenticate a user from the database.
@@ -91,10 +89,10 @@ public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<%
91
89
  if (!user.isActivated()) {
92
90
  throw new UserNotActivatedException("User " + lowercaseLogin + " was not activated");
93
91
  }
94
- List<GrantedAuthority> grantedAuthorities = user.getAuthorities().stream()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>
92
+ List<SimpleGrantedAuthority> grantedAuthorities = user.getAuthorities().stream()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>
95
93
  .map(Authority::getName)<% } %>
96
94
  .map(SimpleGrantedAuthority::new)
97
- .collect(Collectors.toList());
95
+ .toList();
98
96
  return new org.springframework.security.core.userdetails.User(user.getLogin(),
99
97
  user.getPassword(),
100
98
  grantedAuthorities);
@@ -240,7 +240,7 @@ public class PersistentTokenRememberMeServices extends
240
240
  // No series match, so we can't authenticate using this cookie
241
241
  throw new RememberMeAuthenticationException("No persistent token found for series id: " + presentedSeries);
242
242
  }
243
- PersistentToken token = optionalToken.get();
243
+ PersistentToken token = optionalToken.orElseThrow();
244
244
  // We have a match for this user/series combination
245
245
  log.info("presentedToken={} / tokenValue={}", presentedToken, token.getTokenValue());
246
246
  if (!presentedToken.equals(token.getTokenValue())) {
@@ -950,7 +950,7 @@ public class UserService {
950
950
  if (existingUser.isPresent()) {
951
951
  // if IdP sends last updated information, use it to determine if an update should happen
952
952
  if (details.get("updated_at") != null) {
953
- Instant dbModifiedDate = existingUser.get().getLastModifiedDate();
953
+ Instant dbModifiedDate = existingUser.orElseThrow().getLastModifiedDate();
954
954
  Instant idpModifiedDate;
955
955
  if (details.get("updated_at") instanceof Instant) {
956
956
  idpModifiedDate = (Instant) details.get("updated_at");
@@ -45,7 +45,7 @@ import org.springframework.web.server.ServerWebExchange;
45
45
  import reactor.core.publisher.Mono;
46
46
  <%_ } _%>
47
47
 
48
- <%_ if (!reactive) { _%>
48
+ <%_ if (!reactive && !authenticationTypeJwt) { _%>
49
49
  import jakarta.servlet.http.HttpServletRequest;
50
50
  <%_ } _%>
51
51
  import jakarta.validation.Valid;
@@ -205,7 +205,7 @@ public class AccountResource {
205
205
  public void saveAccount(@Valid @RequestBody <%= user.adminUserDto %> userDTO) {
206
206
  String userLogin = SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new AccountResourceException("Current user login not found"));
207
207
  Optional<<%= user.persistClass %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
208
- if (existingUser.isPresent() && (!existingUser.get().getLogin().equalsIgnoreCase(userLogin))) {
208
+ if (existingUser.isPresent() && (!existingUser.orElseThrow().getLogin().equalsIgnoreCase(userLogin))) {
209
209
  throw new EmailAlreadyUsedException();
210
210
  }
211
211
  Optional<<%= user.persistClass %>> user = userRepository.findOneByLogin(userLogin);
@@ -304,7 +304,7 @@ public class AccountResource {
304
304
  public void requestPasswordReset(@RequestBody String mail) {
305
305
  Optional<<%= user.persistClass %>> user = userService.requestPasswordReset(mail);
306
306
  if (user.isPresent()) {
307
- mailService.sendPasswordResetMail(user.get());
307
+ mailService.sendPasswordResetMail(user.orElseThrow());
308
308
  } else {
309
309
  // Pretend the request has been successful to prevent checking which emails really exist
310
310
  // but log that an invalid attempt has been made
@@ -237,11 +237,11 @@ public class UserResource {
237
237
  public ResponseEntity<<%= user.adminUserDto %>> updateUser(@Valid @RequestBody <%= user.adminUserDto %> userDTO) {
238
238
  log.debug("REST request to update User : {}", userDTO);
239
239
  Optional<<%= user.persistClass %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
240
- if (existingUser.isPresent() && (!existingUser.get().getId().equals(userDTO.getId()))) {
240
+ if (existingUser.isPresent() && (!existingUser.orElseThrow().getId().equals(userDTO.getId()))) {
241
241
  throw new EmailAlreadyUsedException();
242
242
  }
243
243
  existingUser = userRepository.findOneByLogin(userDTO.getLogin().toLowerCase());
244
- if (existingUser.isPresent() && (!existingUser.get().getId().equals(userDTO.getId()))) {
244
+ if (existingUser.isPresent() && (!existingUser.orElseThrow().getId().equals(userDTO.getId()))) {
245
245
  throw new LoginAlreadyUsedException();
246
246
  }
247
247
  Optional<<%= user.adminUserDto %>> updatedUser = userService.updateUser(userDTO);
@@ -24,8 +24,6 @@ import tech.jhipster.web.rest.errors.ProblemDetailWithCause;
24
24
  import tech.jhipster.web.rest.errors.ProblemDetailWithCause.ProblemDetailWithCauseBuilder;
25
25
 
26
26
  import java.net.URI;
27
- import java.util.HashMap;
28
- import java.util.Map;
29
27
 
30
28
  @SuppressWarnings("java:S110") // Inheritance tree of classes should not be too deep
31
29
  public class BadRequestAlertException extends ErrorResponseException {
@@ -63,11 +61,4 @@ public class BadRequestAlertException extends ErrorResponseException {
63
61
  public ProblemDetailWithCause getProblemDetailWithCause() {
64
62
  return (ProblemDetailWithCause) this.getBody();
65
63
  }
66
-
67
- private static Map<String, Object> getAlertParameters(String entityName, String errorKey) {
68
- Map<String, Object> parameters = new HashMap<>();
69
- parameters.put("message", "error." + errorKey);
70
- parameters.put("params", entityName);
71
- return parameters;
72
- }
73
64
  }
@@ -36,7 +36,6 @@ import org.springframework.http.converter.HttpMessageConversionException;
36
36
  <%_ if (reactive && databaseTypeSql) { _%>
37
37
  import org.springframework.stereotype.Component;
38
38
  <%_ } _%>
39
- import org.springframework.validation.BindingResult;
40
39
  import org.springframework.web.ErrorResponseException;
41
40
  import org.springframework.web.bind.annotation.ControllerAdvice;
42
41
  import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -110,6 +109,7 @@ _%>
110
109
  private static final String FIELD_ERRORS_KEY = "fieldErrors";
111
110
  private static final String MESSAGE_KEY = "message";
112
111
  private static final String PATH_KEY = "path";
112
+ private static final boolean CASUAL_CHAIN_ENABLED = false;
113
113
 
114
114
  @Value("${jhipster.clientApp.name}")
115
115
  private String applicationName;
@@ -341,7 +341,7 @@ _%>
341
341
 
342
342
  private boolean isCasualChainEnabled() {
343
343
  // Customize as per the needs
344
- return false;
344
+ return CASUAL_CHAIN_ENABLED;
345
345
  }
346
346
 
347
347
  private boolean containsPackageName(String message) {
@@ -154,8 +154,7 @@ spring:
154
154
  <%_ if (databaseTypeMongodb) { _%>
155
155
  data:
156
156
  mongodb:
157
- uri: mongodb://localhost:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
158
- database: <%= baseName %>
157
+ uri: mongodb://localhost:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
159
158
  <%_ } _%>
160
159
  <%_ if (databaseTypeCassandra) { _%>
161
160
  cassandra:
@@ -136,8 +136,7 @@ spring:
136
136
  <%_ if (databaseTypeMongodb) { _%>
137
137
  data:
138
138
  mongodb:
139
- uri: mongodb://localhost:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
140
- database: <%= baseName %>
139
+ uri: mongodb://localhost:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
141
140
  <%_ } _%>
142
141
  <%_ if (databaseTypeCassandra) { _%>
143
142
  cassandra:
@@ -126,7 +126,7 @@ management:
126
126
  liveness:
127
127
  include: livenessState
128
128
  readiness:
129
- include: readinessState<% if (databaseTypeSql) { %>,db<% } %>
129
+ include: readinessState<% if (databaseTypeSql && !reactive) { %>,db<% } %>
130
130
  jhimetrics:
131
131
  enabled: true
132
132
  info:
@@ -45,6 +45,7 @@
45
45
  </root>
46
46
  -->
47
47
 
48
+ <logger name="angus.activation" level="WARN"/>
48
49
  <logger name="jakarta.activation" level="WARN"/>
49
50
  <logger name="jakarta.mail" level="WARN"/>
50
51
  <logger name="jakarta.management.remote" level="WARN"/>
@@ -84,6 +85,9 @@
84
85
  <logger name="io.searchbox" level="WARN"/>
85
86
  <%_ } _%>
86
87
  <%_ if (databaseTypeSql && reactive) { _%>
88
+ <%_ if (prodDatabaseTypeMysql) { _%>
89
+ <logger name="io.asyncer.r2dbc.mysql" level="WARN"/>
90
+ <%_ } _%>
87
91
  <logger name="io.r2dbc" level="WARN"/>
88
92
  <%_ } _%>
89
93
  <%_ if (!reactive) { _%>