generator-jhipster 8.0.0-rc.1 → 8.0.0

package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs

@@ -22,13 +22,6 @@ const { DefinePlugin } = require('webpack');
 <%_ } _%>
 <&_ } -&>
 <&_ if (fragment.moduleFederationSection) { -&>
-<%_ if (applicationTypeGateway) { _%>
-        remotes: {
-  <%_ for (const microfrontend of microfrontends) { _%>
-          '@<%= microfrontend.lowercaseBaseName %>': `<%= microfrontend.lowercaseBaseName %>@/<%= microfrontend.endpointPrefix %>/remoteEntry.js`,
-  <%_ } _%>
-        },
-<%_ } _%>
 <%_ if (applicationTypeMicroservice) { _%>
         exposes: {
           './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/menu',
@@ -36,57 +29,19 @@ const { DefinePlugin } = require('webpack');
         },
 <%_ } _%>
         shared: {
-          ...Object.fromEntries(Object.entries(packageJson.dependencies).map(([module, version]) => ([module, { requiredVersion: version, singleton: true, shareScope: 'default' }]))),
-          'app/config/constants': {
-            singleton: true,
-            import: 'app/config/constants',
-            requiredVersion: appVersion,
-          },
-          'app/config/store': {
-            singleton: true,
-            import: 'app/config/store',
-            requiredVersion: appVersion,
-          },
-          'app/shared/error/error-boundary-routes': {
-            singleton: true,
-            import: 'app/shared/error/error-boundary-routes',
-            requiredVersion: appVersion,
-          },
-          'app/shared/layout/menus/menu-components': {
-            singleton: true,
-            import: 'app/shared/layout/menus/menu-components',
-            requiredVersion: appVersion,
-          },
-          'app/shared/layout/menus/menu-item': {
-            singleton: true,
-            import: 'app/shared/layout/menus/menu-item',
-            requiredVersion: appVersion,
-          },
-          'app/shared/reducers': {
-            singleton: true,
-            import: 'app/shared/reducers',
-            requiredVersion: appVersion,
-          },
-          'app/shared/reducers/locale': {
-            singleton: true,
-            import: 'app/shared/reducers/locale',
-            requiredVersion: appVersion,
-          },
-          'app/shared/reducers/reducer.utils': {
-            singleton: true,
-            import: 'app/shared/reducers/reducer.utils',
-            requiredVersion: appVersion,
-          },
-          'app/shared/util/date-utils': {
-            singleton: true,
-            import: 'app/shared/util/date-utils',
-            requiredVersion: appVersion,
-          },
-          'app/shared/util/entity-utils': {
-            singleton: true,
-            import: 'app/shared/util/entity-utils',
-            requiredVersion: appVersion,
-          },
+          ...shareDependencies(),
+          ...shareMappings(
+            'app/config/constants',
+            'app/config/store',
+            'app/shared/error/error-boundary-routes',
+            'app/shared/layout/menus/menu-components',
+            'app/shared/layout/menus/menu-item',
+            'app/shared/reducers',
+            'app/shared/reducers/locale',
+            'app/shared/reducers/reducer.utils',
+            'app/shared/util/date-utils',
+            'app/shared/util/entity-utils',
+          ),
         },
 <&_ } -&>
 <&_ if (fragment.pluginsSection) { -&>

package/dist/generators/server/generator.mjs

@@ -67,7 +67,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     projectVersion;
     fakeKeytool;
     command = command;
-    async beforeQueue(useNpmWrapper = true) {
+    async beforeQueue() {
         if (!this.fromBlueprint) {
             loadStoredAppOptions.call(this);
             await this.composeWithBlueprints(GENERATOR_SERVER);
@@ -76,9 +76,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
             await this.dependsOnJHipster(GENERATOR_COMMON);
             await this.dependsOnJHipster(GENERATOR_JAVA);
-            if (useNpmWrapper) {
-                this.useNpmWrapperInstallTask();
-            }
         }
     }
     get initializing() {
@@ -270,6 +267,18 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.asPreparingTaskGroup(this.delegateTasksToBlueprint(() => this.preparing));
     }
+    get postPreparing() {
+        return this.asPostPreparingTaskGroup({
+            useNpmWrapper({ application }) {
+                if (application.useNpmWrapper) {
+                    this.useNpmWrapperInstallTask();
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.postPreparing);
+    }
     get configuringEachEntity() {
         return this.asConfiguringEachEntityTaskGroup({
             configureMicroservice({ application, entityConfig }) {

package/dist/generators/server/resources/Dockerfile

@@ -13,10 +13,10 @@ LABEL ALIAS=consul-config-loader
 FROM postgres:16.0
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:22.0.4
+FROM quay.io/keycloak/keycloak:22.0.5
 LABEL ALIAS=keycloak
 
-FROM mysql:8.1.0
+FROM mysql:8.2.0
 
 FROM mariadb:11.1.2
 
@@ -31,14 +31,14 @@ FROM cassandra:3.11.14
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.12.0
+FROM neo4j:5.13.0
 
-FROM hazelcast/management-center:5.3.2
+FROM hazelcast/management-center:5.3.3
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.21-alpine
+FROM memcached:1.6.22-alpine
 
-FROM redis:7.2.1
+FROM redis:7.2.2
 
 FROM confluentinc/cp-kafka:7.5.1
 LABEL ALIAS=kafka
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:10.1.5
+FROM grafana/grafana:10.2.0
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8

package/dist/generators/server/resources/gradle/libs.versions.toml

@@ -13,6 +13,6 @@ gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plu
 
 gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.15.1' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11.3' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.12' }
 
 gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.6' }

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

@@ -15,45 +15,45 @@
         <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.2</hazelcast-spring.version>
+        <hazelcast-spring.version>5.3.5</hazelcast-spring.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-        <jaxb-runtime.version>4.0.3</jaxb-runtime.version>
+        <jaxb-runtime.version>4.0.4</jaxb-runtime.version>
         <junit-platform-launcher.version>1.10.0</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>
         <picocli.version>4.7.5</picocli.version>
         <spring-pulsar.version>0.2.0</spring-pulsar.version>
-        <typesafe.version>1.4.2</typesafe.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>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
-        <frontend-maven-plugin.version>1.14.0</frontend-maven-plugin.version>
+        <frontend-maven-plugin.version>1.14.2</frontend-maven-plugin.version>
         <gatling-maven-plugin.version>4.6.0</gatling-maven-plugin.version>
-        <git-commit-id-maven-plugin.version>6.0.0</git-commit-id-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>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-        <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-        <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
-        <maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
+        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
+        <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
         <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.1.2</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>3.2.1</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-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.1.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.2.1</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>
-        <properties-maven-plugin.version>1.2.0</properties-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>
     </properties>

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,
@@ -59,7 +59,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 +121,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}`;
     }

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/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

@@ -758,7 +758,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 +777,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

@@ -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(required = false) String filter<% } %><% if (implementsEagerLoadApis && fieldsContainNoOwnerOneToOne) { %>,<% } %><% if (implementsEagerLoadApis) { %>@RequestParam(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(required = false) String filter<% } %><% if (implementsEagerLoadApis) { %>, @RequestParam(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())

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_/web/rest/_entityClass_Resource.java.ejs

@@ -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,7 +394,7 @@ 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)
 <%_ } _%>
@@ -410,7 +410,7 @@ 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}")
+    @DeleteMapping("/{id}")
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Void><% if (reactive) { %>><% } %> delete<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
         log.debug("REST request to delete <%= entityClass %> : {}", id);
 <%- include('../../_partials_entity_/delete_template', {viaService: viaService, fromResource: true}); -%>
@@ -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);
     }
 <%_ } _%>
 }

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

@@ -182,7 +182,7 @@ public class SecurityConfiguration {
                 // prettier-ignore
                 authz
 <%_ if (!skipClient) { _%>
-                    .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll()
+                    .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.txt"), mvc.pattern("/*.json"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll()
                     .requestMatchers(mvc.pattern("/*.ico"), mvc.pattern("/*.png"), mvc.pattern("/*.svg"), mvc.pattern("/*.webapp")).permitAll()
   <%_ if (clientFrameworkVue) { _%>
                     .requestMatchers(mvc.pattern("/assets/**")).permitAll()

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

@@ -285,6 +285,8 @@ public class SecurityConfiguration {
   <%_ if (microfrontend) { _%>
                     // microfrontend resources are loaded by webpack without authentication, they need to be public
                     .pathMatchers("/services/*/*.js").permitAll()
+                    .pathMatchers("/services/*/*.txt").permitAll()
+                    .pathMatchers("/services/*/*.json").permitAll()
                     .pathMatchers("/services/*/*.js.map").permitAll()
   <%_ } _%>
                     .pathMatchers("/services/*/management/health/readiness").permitAll()

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

@@ -29,7 +29,9 @@ 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;
@@ -60,6 +62,10 @@ public class MailService {
 
     private final SpringTemplateEngine templateEngine;
 
+    @Autowired
+    @Lazy
+    private MailService self;
+
     public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender,
             MessageSource messageSource, SpringTemplateEngine templateEngine) {
 
@@ -101,26 +107,26 @@ public class MailService {
         context.setVariable(BASE_URL, jHipsterProperties.getMail().getBaseUrl());
         String content = templateEngine.process(templateName, context);
         String subject = messageSource.getMessage(titleKey, null, locale);
-        sendEmail(user.getEmail(), subject, content, false, true);
+        self.sendEmail(user.getEmail(), subject, content, false, true);
     }
 <%_ if (!authenticationTypeOauth2) { _%>
 
     @Async
     public void sendActivationEmail(<%= user.persistClass %> user) {
         log.debug("Sending activation email to '{}'", user.getEmail());
-        sendEmailFromTemplate(user, "mail/activationEmail", "email.activation.title");
+        self.sendEmailFromTemplate(user, "mail/activationEmail", "email.activation.title");
     }
 
     @Async
     public void sendCreationEmail(<%= user.persistClass %> user) {
         log.debug("Sending creation email to '{}'", user.getEmail());
-        sendEmailFromTemplate(user, "mail/creationEmail", "email.activation.title");
+        self.sendEmailFromTemplate(user, "mail/creationEmail", "email.activation.title");
     }
 
     @Async
     public void sendPasswordResetMail(<%= user.persistClass %> user) {
         log.debug("Sending password reset email to '{}'", user.getEmail());
-        sendEmailFromTemplate(user, "mail/passwordResetEmail", "email.reset.title");
+        self.sendEmailFromTemplate(user, "mail/passwordResetEmail", "email.reset.title");
     }
 <%_ } _%>
 }