generator-jhipster 8.0.0-rc.1 → 8.1.0

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

@@ -1,4 +1,4 @@
-import { mutateApplication, normalizePathEnd, pickFields } from '../../base/support/index.mjs';
+import { mutateData, normalizePathEnd, pickFields } from '../../base/support/index.mjs';
 import { databaseTypes, monitoringTypes, authenticationTypes, buildToolTypes, cacheTypes, websocketTypes, serviceDiscoveryTypes, searchEngineTypes, } from '../../../jdl/jhipster/index.mjs';
 import { prepareSqlApplicationProperties } from '../../spring-data-relational/support/index.mjs';
 import { CLIENT_DIST_DIR, CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, } from '../../generator-constants.mjs';
@@ -21,7 +21,7 @@ const NO_SEARCH_ENGINE = searchEngineTypes.NO;
  * all variables should be referred from config,
  */
 export const loadServerConfig = ({ config, application }) => {
-    mutateApplication(application, {
+    mutateData(application, {
         srcMainJava: SERVER_MAIN_SRC_DIR,
         srcMainResources: SERVER_MAIN_RES_DIR,
         srcMainWebapp: CLIENT_MAIN_SRC_DIR,
@@ -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}`,
@@ -59,7 +60,7 @@ export const loadServerConfig = ({ config, application }) => {
  * @param {import('./base-application/types.js').PlatformApplication} dest - destination context to use default is context
  */
 export const loadPlatformConfig = ({ config, application }) => {
-    mutateApplication(application, pickFields(config, ['serviceDiscoveryType', 'monitoring']));
+    mutateData(application, pickFields(config, ['serviceDiscoveryType', 'monitoring']));
 };
 export const loadDerivedServerAndPlatformProperties = ({ application }) => {
     if (!application.serviceDiscoveryType) {
@@ -121,7 +122,7 @@ export const loadDerivedServerConfig = ({ application }) => {
     application.databaseMigrationLiquibase = application.databaseMigration
         ? application.databaseMigration === 'liquibase'
         : application.databaseType === SQL;
-    mutateApplication(application, {
+    mutateData(application, {
         packageFolder: ({ packageName }) => `${packageName.replace(/\./g, '/')}/`,
         javaPackageSrcDir: ({ srcMainJava, packageFolder }) => normalizePathEnd(`${srcMainJava}${packageFolder}`),
         javaPackageTestDir: ({ srcTestJava, packageFolder }) => normalizePathEnd(`${srcTestJava}${packageFolder}`),

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

@@ -19,7 +19,7 @@
 import path from 'path';
 import { databaseTypes, searchEngineTypes } from '../../../jdl/jhipster/index.mjs';
 import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js';
-import { normalizePathEnd } from '../../base/support/index.mjs';
+import { mutateData, normalizePathEnd } from '../../base/support/index.mjs';
 import { hibernateSnakeCase } from './string.mjs';
 import { getDatabaseTypeData } from './database.mjs';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
@@ -39,10 +39,10 @@ export default function prepareEntity(entity) {
     entity.entityAbsolutePackage = entityAbsolutePackage;
     entity.entityAbsoluteFolder = entityAbsoluteFolder;
     entity.entityAbsoluteClass = `${entityAbsolutePackage}.domain.${persistClass}`;
-    if (entity.documentation) {
-        entity.entityJavadoc = formatDocAsJavaDoc(entity.documentation);
-        entity.entityApiDescription = formatDocAsApiDescription(entity.documentation);
-    }
+    mutateData(entity, {
+        entityJavadoc: ({ documentation }) => (documentation ? formatDocAsJavaDoc(documentation) : documentation),
+        entityApiDescription: ({ documentation }) => (documentation ? formatDocAsApiDescription(documentation) : documentation),
+    });
     if (isReservedTableName(entity.entityInstance, entity.prodDatabaseType ?? entity.databaseType) && entity.jhiPrefix) {
         entity.entityInstanceDbSafe = `${entity.jhiPrefix}${entity.entityClass}`;
     }
@@ -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/support/prepare-field.mjs

@@ -21,6 +21,7 @@ import * as _ from 'lodash-es';
 import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../jdl/jhipster/index.mjs';
 import { getUXConstraintName } from './database.mjs';
 import { hibernateSnakeCase } from './string.mjs';
+import { getJavaValueGeneratorForType } from './templates/field-values.mjs';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
 const TYPE_BYTES = fieldTypes.RelationalOnlyDBTypes.BYTES;
 const TYPE_BYTE_BUFFER = fieldTypes.RelationalOnlyDBTypes.BYTE_BUFFER;
@@ -139,5 +140,24 @@ export default function prepareField(entityWithConfig, field, generator) {
     else {
         field.javaFieldType = field.fieldType;
     }
+    if (field.fieldTypeInteger || field.fieldTypeLong || field.fieldTypeString || field.fieldTypeUUID) {
+        if (field.fieldTypeInteger) {
+            field.javaValueSample1 = '1';
+            field.javaValueSample2 = '2';
+        }
+        else if (field.fieldTypeLong) {
+            field.javaValueSample1 = '1L';
+            field.javaValueSample2 = '2L';
+        }
+        else if (field.fieldTypeString) {
+            field.javaValueSample1 = `"${field.fieldName}1"`;
+            field.javaValueSample2 = `"${field.fieldName}2"`;
+        }
+        else if (field.fieldTypeUUID) {
+            field.javaValueSample1 = 'UUID.fromString("23d8dc04-a48b-45d9-a01d-4b728f0ad4aa")';
+            field.javaValueSample2 = 'UUID.fromString("ad79f240-3727-46c3-b89f-2cf6ebd74367")';
+        }
+        field.javaValueGenerator = getJavaValueGeneratorForType(field.javaFieldType);
+    }
     field.filterableField = ![TYPE_BYTES, TYPE_BYTE_BUFFER].includes(field.fieldType);
 }

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

@@ -23,7 +23,8 @@ export const addEntitiesOtherRelationships = (entities) => {
     for (const entity of entities) {
         for (const relationship of entity.relationships ?? []) {
             if (!relationship.otherRelationship &&
-                (relationship.relationshipType === 'many-to-many' ||
+                (relationship.otherEntityRelationshipName ||
+                    relationship.relationshipType === 'many-to-many' ||
                     // OneToOne back reference is required due to filtering
                     (relationship.relationshipType === 'one-to-one' && entity.databaseType === 'sql') ||
                     (relationship.relationshipType === 'one-to-many' && entity.databaseType !== 'neo4j' && entity.databaseType !== 'no'))) {

package/dist/generators/server/support/templates/field-values.mjs

@@ -31,8 +31,11 @@ export const getJavaValueGeneratorForType = (type) => {
     if (type === UUID) {
         return 'UUID.randomUUID()';
     }
-    if (type === LONG || type === INTEGER) {
-        return 'count.incrementAndGet()';
+    if (type === INTEGER) {
+        return 'intCount.incrementAndGet()';
+    }
+    if (type === LONG) {
+        return 'longCount.incrementAndGet()';
     }
     throw new Error(`Java type ${type} does not have a random generator implemented`);
 };

package/dist/generators/server/templates/README.md.jhi.spring-boot.ejs

@@ -21,7 +21,6 @@
  EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
 -%>
 <&_ if (fragment.introSection) { -&>
-This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= documentationArchiveUrl %>](<%= documentationArchiveUrl %>).
   <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
 
 This is a "<%= applicationType %>" application intended to be part of a microservice architecture, please refer to the [Doing microservices with JHipster][] page of the documentation for more information.

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/package.json.ejs

@@ -25,11 +25,6 @@
   "cacheDirectories": [
     "node_modules"
   ],
-  "devDependencies": {
-    "prettier": "<%= nodeDependencies.prettier %>",
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>"
-  },
   "engines": {
     "node": ">=<%= nodeVersion %>"
   },

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>
@@ -758,7 +755,7 @@
                     <version>${maven-resources-plugin.version}</version>
                     <executions>
                         <execution>
-                            <id>default-resources</id>
+                            <id>config-resources</id>
                             <phase>validate</phase>
                             <goals>
                                 <goal>copy-resources</goal>
@@ -777,13 +774,6 @@
                                             <include>config/*.yml</include>
                                         </includes>
                                     </resource>
-                                    <resource>
-                                        <directory><%= SERVER_MAIN_RES_DIR %></directory>
-                                        <filtering>false</filtering>
-                                        <excludes>
-                                            <exclude>config/*.yml</exclude>
-                                        </excludes>
-                                    </resource>
                                 </resources>
                             </configuration>
                         </execution>

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())
@@ -62,7 +62,7 @@ _%>
      * @param criteria the criteria which the requested entities should match.
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and the count in body.
      */
-    @GetMapping("/<%= entityApiUrl %>/count")
+    @GetMapping("/count")
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Long><% if (reactive) { %>><% } %> count<%= entityClassPlural %>(<%= entityClass %>Criteria criteria) {
     <% if (!reactive) { %>
         log.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria);
@@ -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 = "false") 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 = "false") 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/dto/_dtoClass_.java.ejs

@@ -19,7 +19,7 @@
 package <%= entityAbsolutePackage %>.service.dto;
 
 import java.util.Objects;
-<%_ if (typeof javadoc !== 'undefined' || importApiModelProperty) { _%>
+<%_ if (entityApiDescription || importApiModelProperty) { _%>
 import io.swagger.v3.oas.annotations.media.Schema;
 <%_ } _%>
 <%_ if (anyFieldIsInstant) { _%>
@@ -65,7 +65,7 @@ import <%= `${otherEntity.entityAbsolutePackage}.service.dto.${otherEntity.dtoCl
 /**
  * A DTO for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity.
  */
-<%_ if (typeof javadoc !== 'undefined') { _%>
+<%_ if (entityApiDescription) { _%>
 @Schema(description = "<%- entityApiDescription %>")
 <%_ } _%>
 @SuppressWarnings("common-java:DuplicatedBlocks")

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;
   <%_ } _%>
@@ -130,7 +130,7 @@ import java.util.stream.StreamSupport;
  * REST controller for managing {@link <%= entityAbsoluteClass %>}.
  */
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/api/<%= entityApiUrl %>")
 <%_ if (databaseTypeSql && !viaService && !saveUserSnapshot) { _%>
 @Transactional
 <%_ } _%>
@@ -163,7 +163,7 @@ public class <%= entityClass %>Resource {
      * @return the {@link ResponseEntity} with status {@code 201 (Created)} and with body the new <%= instanceName %>, or with status {@code 400 (Bad Request)} if the <%= entityInstance %> has already an ID.
      * @throws URISyntaxException if the Location URI syntax is incorrect.
      */
-    @PostMapping("/<%= entityApiUrl %>")
+    @PostMapping("")
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> create<%= entityClass %>(<% if (anyPropertyHasValidation) { %>@Valid <% } %>@RequestBody <%= instanceType %> <%= instanceName %>) throws URISyntaxException {
         log.debug("REST request to save <%= entityClass %> : {}", <%= instanceName %>);
         if (<%= instanceName %>.get<%= primaryKey.nameCapitalized %>() != null) {
@@ -217,7 +217,7 @@ public class <%= entityClass %>Resource {
      * or with status {@code 500 (Internal Server Error)} if the <%= instanceName %> couldn't be updated.
      * @throws URISyntaxException if the Location URI syntax is incorrect.
      */
-    @PutMapping("/<%= entityApiUrl %>/{<%= primaryKey.name %>}")
+    @PutMapping("/{<%= primaryKey.name %>}")
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> update<%= entityClass %>(
         @PathVariable(value = "<%= primaryKey.name %>", required = false) final <%= primaryKey.type %> <%= primaryKey.name %>,
         <% if (anyPropertyHasValidation) { %>@Valid <% } %>@RequestBody <%= instanceType %> <%= instanceName %>
@@ -283,7 +283,7 @@ public class <%= entityClass %>Resource {
      * or with status {@code 500 (Internal Server Error)} if the <%= instanceName %> couldn't be updated.
      * @throws URISyntaxException if the Location URI syntax is incorrect.
      */
-    @PatchMapping(value = "/<%= entityApiUrl %>/{<%= primaryKey.name %>}", consumes = {"application/json", "application/merge-patch+json"})
+    @PatchMapping(value = "/{<%= primaryKey.name %>}", consumes = {"application/json", "application/merge-patch+json"})
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> partialUpdate<%= entityClass %>(
     @PathVariable(value = "<%= primaryKey.name %>", required = false) final <%= primaryKey.type %> <%= primaryKey.name %>,
     <% if (anyPropertyHasValidation) { %>@NotNull <% } %>@RequestBody <%= instanceType %> <%= instanceName %>) throws URISyntaxException {
@@ -360,9 +360,9 @@ public class <%= entityClass %>Resource {
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and the list of <%= entityInstancePlural %> in body.
      */
 <%_ if (reactive) { _%>
-    @GetMapping(value = "/<%= entityApiUrl %>", produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE)
 <%_ } else { _%>
-    @GetMapping("/<%= entityApiUrl %>")
+    @GetMapping("")
 <%_ } _%>
 <%_ if (databaseTypeSql && isUsingMapsId && !viaService) { _%>
     @Transactional(readOnly = true)
@@ -374,7 +374,7 @@ public class <%= entityClass %>Resource {
      * {@code GET  /<%= entityApiUrl %>} : get all the <%= entityInstancePlural %> as a stream.
      * @return the {@link Flux} of <%= entityInstancePlural %>.
      */
-    @GetMapping(value = "/<%= entityApiUrl %>", produces = MediaType.APPLICATION_NDJSON_VALUE)
+    @GetMapping(value = "", produces = MediaType.APPLICATION_NDJSON_VALUE)
   <%_ if (databaseTypeSql && isUsingMapsId && !viaService) { _%>
     @Transactional(readOnly = true)
   <%_ } _%>
@@ -394,11 +394,11 @@ public class <%= entityClass %>Resource {
      * @param id the id of the <%= instanceName %> to retrieve.
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the <%= instanceName %>, or with status {@code 404 (Not Found)}.
      */
-    @GetMapping("/<%= entityApiUrl %>/{id}")
+    @GetMapping("/{id}")
 <%_ 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 %>);
     }
@@ -410,8 +410,8 @@ public class <%= entityClass %>Resource {
      * @param id the id of the <%= instanceName %> to delete.
      * @return the {@link ResponseEntity} with status {@code 204 (NO_CONTENT)}.
      */
-    @DeleteMapping("/<%= entityApiUrl %>/{id}")
-    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Void><% if (reactive) { %>><% } %> delete<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
+    @DeleteMapping("/{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) { _%>
@@ -432,7 +432,7 @@ public class <%= entityClass %>Resource {
 <%_ if (searchEngineAny) { _%>
 
     /**
-     * {@code SEARCH  /_search/<%= entityApiUrl %>?query=:query} : search for the <%= entityInstance %> corresponding
+     * {@code SEARCH  /<%= entityApiUrl %>/_search?query=:query} : search for the <%= entityInstance %> corresponding
      * to the query.
      *
      * @param query the query of the <%= entityInstance %> search.
@@ -444,6 +444,6 @@ public class <%= entityClass %>Resource {
   <%_ } _%>
      * @return the result of the search.
      */
-    @GetMapping("/_search/<%= entityApiUrl %>")<%- include('../../_partials_entity_/search_template', {viaService}); -%>
+    @GetMapping("/_search")<%- include('../../_partials_entity_/search_template', {viaService}); -%>
 <%_ } _%>
 }

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

@@ -20,6 +20,7 @@ package <%= packageName %>.config;
 
 <%_ if (databaseTypeSql && !reactive) { _%>
 import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module.Feature;
 <%_ } _%>
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -50,7 +51,7 @@ public class JacksonConfiguration {
      */
     @Bean
     public Hibernate6Module hibernate6Module() {
-        return new Hibernate6Module();
+        return new Hibernate6Module().configure(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS, true);
     }
 <%_ } _%>
 }