generator-jhipster 8.0.0 → 8.1.0

package/dist/generators/server/resources/pom.xml

@@ -8,29 +8,29 @@
 
     <properties>
         <!-- Dependency versions -->
-        <archunit-junit5.version>1.1.0</archunit-junit5.version>
+        <archunit-junit5.version>1.2.1</archunit-junit5.version>
         <awaitility.version>4.2.0</awaitility.version>
         <blockhound-junit-platform.version>1.0.8.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <gatling.version>3.9.5</gatling.version>
         <h2.version>2.2.224</h2.version>
         <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
-        <hazelcast-spring.version>5.3.5</hazelcast-spring.version>
+        <hazelcast-spring.version>5.3.6</hazelcast-spring.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <jaxb-runtime.version>4.0.4</jaxb-runtime.version>
-        <junit-platform-launcher.version>1.10.0</junit-platform-launcher.version>
+        <junit-platform-launcher.version>1.10.1</junit-platform-launcher.version>
         <liquibase.version>4.24.0</liquibase.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
-        <micrometer-context-propagation.version>1.0.6</micrometer-context-propagation.version>
+        <micrometer-context-propagation.version>1.1.0</micrometer-context-propagation.version>
         <picocli.version>4.7.5</picocli.version>
         <spring-pulsar.version>0.2.0</spring-pulsar.version>
         <typesafe.version>1.4.3</typesafe.version>
         <validation-api.version>3.0.2</validation-api.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.12.4</checkstyle.version>
+        <checkstyle.version>10.12.5</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
-        <frontend-maven-plugin.version>1.14.2</frontend-maven-plugin.version>
+        <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
         <gatling-maven-plugin.version>4.6.0</gatling-maven-plugin.version>
         <git-commit-id-maven-plugin.version>7.0.0</git-commit-id-maven-plugin.version>
         <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
@@ -42,20 +42,20 @@
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.2.1</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
-        <maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <modernizer-maven-plugin.version>2.7.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.0.1</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.1.0</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
-        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.41.1</spotless-maven-plugin.version>
     </properties>
 
     <dependencyManagement>

package/dist/generators/server/support/config.mjs

@@ -49,6 +49,7 @@ export const loadServerConfig = ({ config, application }) => {
         'embeddableLaunchScript',
         'enableGradleEnterprise',
         'gradleEnterpriseHost',
+        'feignClient',
     ]), {
         packageFolder: ({ packageFolder }) => (packageFolder ? normalizePathEnd(packageFolder) : packageFolder),
         gradleEnterpriseHost: ({ gradleEnterpriseHost }) => !gradleEnterpriseHost || gradleEnterpriseHost.startsWith('https://') ? gradleEnterpriseHost : `https://${gradleEnterpriseHost}`,

package/dist/generators/server/support/prepare-entity.mjs

@@ -81,7 +81,10 @@ export function preparePostEntityServerDerivedProperties(entity) {
         .filter(relationship => relationship.ignoreOtherSideProperty === undefined)
         .forEach(relationship => {
         relationship.ignoreOtherSideProperty =
-            !relationship.embedded && !!relationship.otherEntity && relationship.otherEntity.relationships.length > 0;
+            entity.databaseType !== 'neo4j' &&
+                !relationship.embedded &&
+                !!relationship.otherEntity &&
+                relationship.otherEntity.relationships.length > 0;
     });
     entity.relationshipsContainOtherSideIgnore = entity.relationships.some(relationship => relationship.ignoreOtherSideProperty);
     entity.importApiModelProperty =

package/dist/generators/server/templates/build.gradle.ejs

@@ -266,7 +266,7 @@ dependencies {
     // to use a SNAPSHOT release instead of a stable release
     implementation "tech.jhipster:jhipster-framework"
     implementation "jakarta.annotation:jakarta.annotation-api"
-<%_ // This is useful for major Spring Boot migration
+<%_ /* This is useful for major Spring Boot migration */
 if (addSpringMilestoneRepository) { _%>
     runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"
 <%_ } _%>
@@ -421,7 +421,6 @@ if (addSpringMilestoneRepository) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j"
   <%_ } _%>
     implementation "org.springframework.retry:spring-retry"
-    implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
 <%_ } _%>
 <%_ if (serviceDiscoveryAny) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-bootstrap"

package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs

@@ -49,29 +49,11 @@ dependencies {
     implementation "com.h2database:h2"
     <%_ } _%>
   <%_ } _%>
-  <%_ if (devDatabaseTypeMysql) { _%>
+  <%_ if (devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypePostgres || devDatabaseTypeMysql) { _%>
     <%_ if (reactive) { _%>
-    implementation ("io.asyncer:r2dbc-mysql")
+    implementation "<%- prodDatabaseDriver.r2dbc.groupId %>:<%- prodDatabaseDriver.r2dbc.artifactId %>"
     <%_ } _%>
-    implementation "com.mysql:mysql-connector-j"
-  <%_ } _%>
-  <%_ if (devDatabaseTypePostgres) { _%>
-    <%_ if (reactive) { _%>
-    implementation "org.postgresql:r2dbc-postgresql"
-    <%_ } _%>
-    implementation "org.postgresql:postgresql"
-  <%_ } _%>
-  <%_ if (devDatabaseTypeMariadb) { _%>
-    <%_ if (reactive) { _%>
-    implementation "org.mariadb:r2dbc-mariadb"
-    <%_ } _%>
-    implementation "org.mariadb.jdbc:mariadb-java-client"
-  <%_ } _%>
-  <%_ if (devDatabaseTypeMssql) { _%>
-    <%_ if (reactive) { _%>
-    implementation "io.r2dbc:r2dbc-mssql"
-    <%_ } _%>
-    implementation "com.microsoft.sqlserver:mssql-jdbc"
+    implementation "<%- prodDatabaseDriver.jdbc.groupId %>:<%- prodDatabaseDriver.jdbc.artifactId %>"
   <%_ } _%>
   <%_ if (devDatabaseTypeOracle) { _%>
     implementation "com.oracle.database.jdbc:ojdbc8"

package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs

@@ -41,32 +41,22 @@ configurations {
 }
 
 dependencies {
-  <%_ if (prodDatabaseTypeMysql) { _%>
+  <%_ if (prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypeMysql || prodDatabaseTypePostgresql) { _%>
     <%_ if (reactive) { _%>
-    implementation "io.asyncer:r2dbc-mysql"
+    implementation "<%- prodDatabaseDriver.r2dbc.groupId %>:<%- prodDatabaseDriver.r2dbc.artifactId %>"
     <%_ } _%>
-    implementation "com.mysql:mysql-connector-j"
+    implementation "<%- prodDatabaseDriver.jdbc.groupId %>:<%- prodDatabaseDriver.jdbc.artifactId %>"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMysql) { _%>
     testImplementation "org.testcontainers:mysql"
   <%_ } _%>
   <%_ if (prodDatabaseTypePostgresql) { _%>
-    <%_ if (reactive) { _%>
-    implementation "org.postgresql:r2dbc-postgresql"
-    <%_ } _%>
-    implementation "org.postgresql:postgresql"
     testImplementation "org.testcontainers:postgresql"
   <%_ } _%>
   <%_ if (prodDatabaseTypeMariadb) { _%>
-    <%_ if (reactive) { _%>
-    implementation "org.mariadb:r2dbc-mariadb"
-    <%_ } _%>
-    implementation "org.mariadb.jdbc:mariadb-java-client"
     testImplementation "org.testcontainers:mariadb"
   <%_ } _%>
   <%_ if (prodDatabaseTypeMssql) { _%>
-    <%_ if (reactive) { _%>
-    implementation "io.r2dbc:r2dbc-mssql"
-    <%_ } _%>
-    implementation "com.microsoft.sqlserver:mssql-jdbc"
     testImplementation "org.testcontainers:mssqlserver"
   <%_ } _%>
   <%_ if (prodDatabaseTypeOracle) { _%>

package/dist/generators/server/templates/pom.xml.ejs

@@ -319,10 +319,6 @@
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
 <%_ } _%>
 <%_ if (serviceDiscoveryAny) { _%>
         <dependency>
@@ -477,6 +473,7 @@
                     <configuration>
                         <source>${java.version}</source>
                         <target>${java.version}</target>
+                        <parameters>true</parameters>
                         <annotationProcessorPaths>
                             <path>
                                 <groupId>org.springframework.boot</groupId>

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs

@@ -35,7 +35,7 @@ _%>
         return ResponseEntity.ok().body(entityList);
     <%_ } else { _%>
         Page<<%= instanceType %>> page = <%= entityInstance %>QueryService.findByCriteria(criteria, pageable);
-        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (!reactive) { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } else { %>UriComponentsBuilder.fromHttpRequest(request)<% } %>, page);
+        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (!reactive) { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } else { %>ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders())<% } %>, page);
         return ResponseEntity.ok().headers(headers).body(page.getContent());
     <%_ } _%>
   <%_ } else { _%>
@@ -47,7 +47,7 @@ _%>
           ResponseEntity.ok()
               .headers(
                   PaginationUtil.generatePaginationHttpHeaders(
-                      UriComponentsBuilder.fromHttpRequest(request),
+                      ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()),
                       new PageImpl<>(countWithEntities.getT2(), pageable, countWithEntities.getT1())
                   )
               ).body(countWithEntities.getT2())
@@ -75,7 +75,7 @@ _%>
     }
 <%_ } else { _%>
   <%_ if (paginationNo) { _%>
-    public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> getAll<%= entityClassPlural %>(<% if (fieldsContainNoOwnerOneToOne) { %>@RequestParam(required = false) String filter<% } %><% if (implementsEagerLoadApis && fieldsContainNoOwnerOneToOne) { %>,<% } %><% if (implementsEagerLoadApis) { %>@RequestParam(required = false, defaultValue = "true") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
+    public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> getAll<%= entityClassPlural %>(<% if (fieldsContainNoOwnerOneToOne) { %>@RequestParam(name = "filter", required = false) String filter<% } %><% if (implementsEagerLoadApis && fieldsContainNoOwnerOneToOne) { %>,<% } %><% if (implementsEagerLoadApis) { %>@RequestParam(name = "eagerload", required = false, defaultValue = "true") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
         log.debug("REST request to get all <%= entityClassPlural %>");
     <%_ if (viaService) { _%>
         return <%= entityInstance %>Service.findAll()<% if (reactive) { %>.collectList()<% } %>;
@@ -96,7 +96,7 @@ _%>
             return <%= entityInstance %>Repository.findAll()<% if (reactive) { %>.collectList()<% } %>;
     <%_ } _%>
   <%_ } else { _%>
-    public <% if (reactive) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(@org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% if (fieldsContainNoOwnerOneToOne) { %>, @RequestParam(required = false) String filter<% } %><% if (implementsEagerLoadApis) { %>, @RequestParam(required = false, defaultValue = "true") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
+    public <% if (reactive) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(@org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% if (fieldsContainNoOwnerOneToOne) { %>, @RequestParam(name = "filter", required = false) String filter<% } %><% if (implementsEagerLoadApis) { %>, @RequestParam(name = "eagerload", required = false, defaultValue = "true") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
         log.debug("REST request to get a page of <%= entityClassPlural %>");
     <%_ if (reactive) { _%>
         return <%= entityInstance %><%= viaService ? 'Service.countAll' : 'Repository.count' %>().zipWith(<%= entityInstance %><%= viaService ? 'Service.findAll' : 'Repository.findAllBy' %>(pageable)<%= reactiveEntityToDto %>.collectList())
@@ -104,7 +104,7 @@ _%>
                     ResponseEntity.ok()
                         .headers(
                             PaginationUtil.generatePaginationHttpHeaders(
-                                UriComponentsBuilder.fromHttpRequest(request),
+                                ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()),
                                 new PageImpl<>(countWithEntities.getT2(), pageable, countWithEntities.getT1())
                             )
                         ).body(countWithEntities.getT2())
@@ -117,10 +117,10 @@ _%>
         } else {
             page = <%= entityInstance %><%= viaService ? 'Service' : 'Repository' %>.findAll(pageable)<%= reactiveEntityToDto %>;
         }
-        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (reactive) { %>UriComponentsBuilder.fromHttpRequest(request)<% } else { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } %>, page);
+        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (reactive) { %>ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders())<% } else { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } %>, page);
       <%_ } else { _%>
         Page<<%= instanceType %>> page = <%= entityInstance %><%= viaService ? 'Service' : 'Repository' %>.findAll(pageable)<%= reactiveEntityToDto %>;
-        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (reactive) { %>UriComponentsBuilder.fromHttpRequest(request)<% } else { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } %>, page);
+        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (reactive) { %>ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders())<% } else { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } %>, page);
       <%_ } _%>
         return ResponseEntity.ok().headers(headers).body(page.getContent());
     <%_ } _%>

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs

@@ -24,17 +24,17 @@
   const entityToDtoReference = mapper + '::' + 'toDto';
   const entityListToDtoListReference = mapper + '.' + 'toDto';
 if (paginationNo) { %>
-    public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam String query) {
+    public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam("query") String query) {
         log.debug("REST request to search <%= entityClassPlural %> for query {}", query);<%- include('search_stream_template', {viaService: viaService, fromResource: true}); -%>
 <% } else { %>
-    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= listOrFlux %><<%= instanceType %>>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam String query, @org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %>) {
+    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= listOrFlux %><<%= instanceType %>>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam("query") String query, @org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %>) {
         log.debug("REST request to search for a page of <%= entityClassPlural %> for query {}", query);
   <%_ if (reactive) { _%>
         return <%= entityInstance %><%= viaService ?
                 'Service.' + (searchEngineElasticsearch ? 'searchCount' : 'countAll') :
                 (searchEngineElasticsearch ? 'Search' : '') + 'Repository.count' %>()
             .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
-            .map(page -> PaginationUtil.generatePaginationHttpHeaders(UriComponentsBuilder.fromHttpRequest(request), page))
+            .map(page -> PaginationUtil.generatePaginationHttpHeaders(ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()), page))
             .map(headers -> ResponseEntity.ok().headers(headers).body(<%= entityInstance %><%= viaService ? 'Service' : (searchEngineElasticsearch ? 'Search' : '') + 'Repository' %>.search(query, pageable)<% if (!viaService && dtoMapstruct) { %>.map(<%= entityToDtoReference %>)<% } %>));
   <%_ } else { _%>
         try {
@@ -43,7 +43,7 @@ if (paginationNo) { %>
     <%_ } else { _%>
             Page<<%= persistClass %>> page = <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query, pageable);
     <%_ } _%>
-            HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (reactive) { %>UriComponentsBuilder.fromHttpRequest(request)<% } else { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } %>, page);
+            HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (reactive) { %>ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders())<% } else { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } %>, page);
             return ResponseEntity.ok().headers(headers).body(<% if (!viaService && dtoMapstruct) { %><%= entityListToDtoListReference %>(<% } %>page.getContent()<% if (!viaService && dtoMapstruct) { %>)<% } %>);
         } catch (RuntimeException e) {
     <% if (searchEngineElasticsearch) { %>

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs

@@ -70,7 +70,7 @@ public interface <%= entityClass %>Repository extends <% if (containsBagRelation
 <%_ for (const relationship of relationships) { _%>
   <%_ if (relationship.relationshipManyToOne && relationship.otherEntityUser && databaseTypeSql) { _%>
 
-    @Query("select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %> where <%= entityInstanceDbSafe %>.<%= relationship.relationshipFieldName %>.login = ?#{principal.<% if (authenticationTypeOauth2) { %>preferredUsername<% } else { %>username<% } %>}")
+    @Query("select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %> where <%= entityInstanceDbSafe %>.<%= relationship.relationshipFieldName %>.login = ?#{authentication.name}")
     List<<%= persistClass %>> findBy<%= relationship.relationshipNameCapitalized %>IsCurrentUser();
   <%_ } _%>
 <%_ } _%>

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs

@@ -63,7 +63,7 @@ import java.util.UUID;
 @Mapper(componentModel = "spring")
 public interface <%= entityClass %>Mapper extends EntityMapper<<%= dtoClass %>, <%= persistClass %>> {
 <%_ if (!embedded) { _%>
-  <%_ var renMapAnotEnt = false; //Render Mapping Annotation during Entity to DTO conversion? _%>
+  <%_ var renMapAnotEnt = false; /*Render Mapping Annotation during Entity to DTO conversion?*/ _%>
   <%_ for (relationship of dtoRelationships) { _%>
     <%_
       renMapAnotEnt = true;
@@ -80,7 +80,7 @@ public interface <%= entityClass %>Mapper extends EntityMapper<<%= dtoClass %>,
     <%= dtoClass %> toDto(<%= persistClass %> s);
   <%_ } _%>
 
-  <%_ var renMapAnotDto = false;  //Render Mapping Annotation during DTO to Entity conversion? _%>
+  <%_ var renMapAnotDto = false;  /*Render Mapping Annotation during DTO to Entity conversion?*/ _%>
   <%_ if(primaryKey.ids.length > 1) { _%>
     <%_ renMapAnotDto = true; _%>
     <%_ for (const id of primaryKey.ids) { _%>

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs

@@ -74,7 +74,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
   <%_ } _%>
   <%_ if (reactive) { _%>
-import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.util.ForwardedHeaderUtils;
   <%_ } else { _%>
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
   <%_ } _%>
@@ -398,7 +398,7 @@ public class <%= entityClass %>Resource {
 <%_ if (databaseTypeSql && isUsingMapsId && !viaService) { _%>
     @Transactional(readOnly = true)
 <%_ } _%>
-    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> get<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
+    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> get<%= entityClass %>(@PathVariable("id") <%= primaryKey.type %> id) {
         log.debug("REST request to get <%= entityClass %> : {}", id);<%- include('../../_partials_entity_/get_template', {viaService, returnDirectly:false, implementsEagerLoadApis}); -%>
         return ResponseUtil.wrapOrNotFound(<%= instanceName %>);
     }
@@ -411,7 +411,7 @@ public class <%= entityClass %>Resource {
      * @return the {@link ResponseEntity} with status {@code 204 (NO_CONTENT)}.
      */
     @DeleteMapping("/{id}")
-    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Void><% if (reactive) { %>><% } %> delete<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
+    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Void><% if (reactive) { %>><% } %> delete<%= entityClass %>(@PathVariable("id") <%= primaryKey.type %> id) {
         log.debug("REST request to delete <%= entityClass %> : {}", id);
 <%- include('../../_partials_entity_/delete_template', {viaService: viaService, fromResource: true}); -%>
   <%_ if (reactive) { _%>

package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs

@@ -62,11 +62,18 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
+import static org.springframework.security.oauth2.core.oidc.StandardClaimNames.PREFERRED_USERNAME;
+
 import <%= packageName %>.security.oauth2.AudienceValidator;
 import <%= packageName %>.security.SecurityUtils;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
 import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
 import org.springframework.security.oauth2.core.OAuth2TokenValidator;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.jwt.*;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
 import org.springframework.beans.factory.annotation.Value;
@@ -261,14 +268,14 @@ public class SecurityConfiguration {
             .oauth2ResourceServer(oauth2 -> oauth2.jwt(Customizer.withDefaults()));
 <%_ } else if (authenticationTypeOauth2) { _%>
   <%_ if (applicationTypeMonolith) { _%>
-            .oauth2Login(withDefaults())
+            .oauth2Login(oauth2 -> oauth2.userInfoEndpoint(userInfo -> userInfo.oidcUserService(this.oidcUserService())))
   <%_ } else if (applicationTypeMicroservice) { _%>
             .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
   <%_ } _%>
             .oauth2ResourceServer(oauth2 -> oauth2
                 .jwt(jwt -> jwt
                     .jwtAuthenticationConverter(authenticationConverter())))
-            .oauth2Client();
+            .oauth2Client(withDefaults());
 <%_ } _%>
 <%_ if (devDatabaseTypeH2Any) { _%>
         if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
@@ -291,9 +298,20 @@ public class SecurityConfiguration {
     Converter<Jwt, AbstractAuthenticationToken> authenticationConverter() {
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
         jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(new JwtGrantedAuthorityConverter());
+        jwtAuthenticationConverter.setPrincipalClaimName(PREFERRED_USERNAME);
         return jwtAuthenticationConverter;
     }
+
+    OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService() {
+        final OidcUserService delegate = new OidcUserService();
+
+        return userRequest -> {
+            OidcUser oidcUser = delegate.loadUser(userRequest);
+            return new DefaultOidcUser(oidcUser.getAuthorities(), oidcUser.getIdToken(), oidcUser.getUserInfo(), PREFERRED_USERNAME);
+        };
+    }
   <%_ if (!applicationTypeMicroservice) { _%>
+
     /**
      * Map authorities from "groups" or "roles" claim in ID Token.
      *

package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs

@@ -20,6 +20,8 @@ package <%= packageName %>.config;
 
 import <%= packageName %>.security.AuthoritiesConstants;
 <%_ if (authenticationTypeOauth2) { _%>
+import static org.springframework.security.oauth2.core.oidc.StandardClaimNames.PREFERRED_USERNAME;
+
 import <%= packageName %>.security.SecurityUtils;
 import <%= packageName %>.security.oauth2.AudienceValidator;
 import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
@@ -339,6 +341,7 @@ public class SecurityConfiguration {
     Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
         jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(new JwtGrantedAuthorityConverter());
+        jwtAuthenticationConverter.setPrincipalClaimName(PREFERRED_USERNAME);
         return new ReactiveJwtAuthenticationConverterAdapter(jwtAuthenticationConverter);
     }
 
@@ -363,7 +366,7 @@ public class SecurityConfiguration {
                     }
                 });
 
-                return new DefaultOidcUser(mappedAuthorities, user.getIdToken(), user.getUserInfo());
+                return new DefaultOidcUser(mappedAuthorities, user.getIdToken(), user.getUserInfo(), PREFERRED_USERNAME);
             });
         };
     }

package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs

@@ -80,7 +80,7 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
             // Retrieve and set the token
             String token = bearerTokenResolver.resolve(((ServletRequestAttributes) attributes).getRequest());
             HttpHeaders headers = new HttpHeaders();
-            headers.set("Authorization", buildBearer(token));
+            headers.setBearerAuth(token);
 
             // Retrieve user info from OAuth provider if not already loaded
             ObjectNode user = users.get(claims.get("sub").toString(), s -> {
@@ -126,8 +126,4 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
         }
         return convertedClaims;
     }
-
-    private String buildBearer(String token) {
-        return "Bearer " + token;
-    }
 }

package/dist/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs

@@ -29,21 +29,29 @@ import jakarta.mail.internet.MimeMessage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.mail.MailException;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring6.SpringTemplateEngine;
+<%_ if (reactive) { _%>
+import reactor.core.publisher.Mono;
+<%_ } else { _%>
+import org.springframework.scheduling.annotation.Async;
+<%_ } _%>
+<%_
+    const localSendEmailFromTemplateApi = reactive ? 'sendEmailFromTemplate' : 'sendEmailFromTemplateSync';
+_%>
+
 
 /**
- * Service for sending emails.
+ * Service for sending emails asynchronously.
+<%_ if (!reactive) { _%>
  * <p>
  * We use the {@link Async} annotation to send emails asynchronously.
+<%_ } _%>
  */
 @Service
 public class MailService {
@@ -62,10 +70,6 @@ public class MailService {
 
     private final SpringTemplateEngine templateEngine;
 
-    @Autowired
-    @Lazy
-    private MailService self;
-
     public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender,
             MessageSource messageSource, SpringTemplateEngine templateEngine) {
 
@@ -75,8 +79,21 @@ public class MailService {
         this.templateEngine = templateEngine;
     }
 
+<%_ if (!reactive) { _%>
     @Async
+<%_ } _%>
     public void sendEmail(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
+<%_ if (reactive) { _%>
+        Mono.defer(() -> {
+            this.sendEmailSync(to, subject, content, isMultipart, isHtml);
+            return Mono.empty();
+        }).subscribe();
+<%_ } else { _%>
+        this.sendEmailSync(to, subject, content, isMultipart, isHtml);
+<%_ } _%>
+    }
+
+    private void sendEmailSync(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
         log.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}",
             isMultipart, isHtml, to, subject, content);
 
@@ -95,8 +112,21 @@ public class MailService {
         }
     }
 
+<%_ if (!reactive) { _%>
     @Async
+<%_ } _%>
     public void sendEmailFromTemplate(<%= user.persistClass %> user, String templateName, String titleKey) {
+<%_ if (reactive) { _%>
+        Mono.defer(() -> {
+            this.sendEmailFromTemplateSync(user, templateName, titleKey);
+            return Mono.empty();
+        }).subscribe();
+<%_ } else { _%>
+        this.sendEmailFromTemplateSync(user, templateName, titleKey);
+<%_ } _%>
+    }
+
+    private void sendEmailFromTemplateSync(<%= user.persistClass %> user, String templateName, String titleKey) {
         if (user.getEmail() == null) {
             log.debug("Email doesn't exist for user '{}'", user.getLogin());
             return;
@@ -107,26 +137,32 @@ public class MailService {
         context.setVariable(BASE_URL, jHipsterProperties.getMail().getBaseUrl());
         String content = templateEngine.process(templateName, context);
         String subject = messageSource.getMessage(titleKey, null, locale);
-        self.sendEmail(user.getEmail(), subject, content, false, true);
+        this.sendEmailSync(user.getEmail(), subject, content, false, true);
     }
 <%_ if (!authenticationTypeOauth2) { _%>
 
+<%_ if (!reactive) { _%>
     @Async
+<%_ } _%>
     public void sendActivationEmail(<%= user.persistClass %> user) {
         log.debug("Sending activation email to '{}'", user.getEmail());
-        self.sendEmailFromTemplate(user, "mail/activationEmail", "email.activation.title");
+        this.<%- localSendEmailFromTemplateApi %>(user, "mail/activationEmail", "email.activation.title");
     }
 
+<%_ if (!reactive) { _%>
     @Async
+<%_ } _%>
     public void sendCreationEmail(<%= user.persistClass %> user) {
         log.debug("Sending creation email to '{}'", user.getEmail());
-        self.sendEmailFromTemplate(user, "mail/creationEmail", "email.activation.title");
+        this.<%- localSendEmailFromTemplateApi %>(user, "mail/creationEmail", "email.activation.title");
     }
 
+<%_ if (!reactive) { _%>
     @Async
+<%_ } _%>
     public void sendPasswordResetMail(<%= user.persistClass %> user) {
         log.debug("Sending password reset email to '{}'", user.getEmail());
-        self.sendEmailFromTemplate(user, "mail/passwordResetEmail", "email.reset.title");
+        this.<%- localSendEmailFromTemplateApi %>(user, "mail/passwordResetEmail", "email.reset.title");
     }
 <%_ } _%>
 }

package/dist/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs

@@ -264,7 +264,7 @@ public class AccountResource {
      * @throws IllegalArgumentException if the series couldn't be URL decoded.
      */
     @DeleteMapping("/account/sessions/{series}")
-    public void invalidateSession(@PathVariable String series) {
+    public void invalidateSession(@PathVariable("series") String series) {
         String decodedSeries = URLDecoder.decode(series, StandardCharsets.UTF_8);
         SecurityUtils.getCurrentUserLogin()
             .flatMap(userRepository::findOneByLogin)

package/dist/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs

@@ -52,21 +52,12 @@ public class LogoutResource {
                                     @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) {
         StringBuilder logoutUrl = new StringBuilder();
 
-        String issuerUri = this.registration.getProviderDetails().getIssuerUri();
-        if (issuerUri.contains("auth0.com")) {
-            logoutUrl.append(issuerUri.endsWith("/") ? issuerUri + "v2/logout" : issuerUri + "/v2/logout");
-        } else {
-            logoutUrl.append(this.registration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
-        }
-
+        logoutUrl.append(this.registration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
+ 
         String originUrl = request.getHeader(HttpHeaders.ORIGIN);
 
-        if (issuerUri.contains("auth0.com")) {
-            logoutUrl.append("?client_id=").append(this.registration.getClientId()).append("&returnTo=").append(originUrl);
-        } else {
-            logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
-        }
-
+        logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
+   
         request.getSession().invalidate();
         return ResponseEntity.ok().body(Map.of("logoutUrl", logoutUrl.toString()));
     }