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

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

@@ -0,0 +1,140 @@
+import { normalizePathEnd } 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';
+import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../../server/options/index.mjs';
+const { SQL, MONGODB, COUCHBASE, NEO4J, CASSANDRA } = databaseTypes;
+const NO_DATABASE = databaseTypes.NO;
+const { PROMETHEUS, ELK } = monitoringTypes;
+const { OAUTH2, SESSION } = authenticationTypes;
+const { CAFFEINE, EHCACHE, REDIS, HAZELCAST, INFINISPAN, MEMCACHED } = cacheTypes;
+const { GRADLE, MAVEN } = buildToolTypes;
+const { SPRING_WEBSOCKET } = websocketTypes;
+const { CONSUL, EUREKA } = serviceDiscoveryTypes;
+const { ELASTICSEARCH } = searchEngineTypes;
+const NO_CACHE = cacheTypes.NO;
+const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
+const NO_SEARCH_ENGINE = searchEngineTypes.NO;
+/**
+ * Load server configs into application.
+ * all variables should be set to dest,
+ * all variables should be referred from config,
+ */
+export const loadServerConfig = ({ config, application }) => {
+    application.packageName = config.packageName;
+    application.packageFolder = config.packageFolder && normalizePathEnd(config.packageFolder);
+    application.serverPort = config.serverPort;
+    application.srcMainJava = SERVER_MAIN_SRC_DIR;
+    application.srcMainResources = SERVER_MAIN_RES_DIR;
+    application.srcMainWebapp = CLIENT_MAIN_SRC_DIR;
+    application.srcTestJava = SERVER_TEST_SRC_DIR;
+    application.srcTestResources = SERVER_TEST_RES_DIR;
+    application.srcTestJavascript = CLIENT_TEST_SRC_DIR;
+    application.buildTool = config.buildTool;
+    application.databaseType = config.databaseType;
+    application.databaseMigration = config.databaseMigration;
+    application.devDatabaseType = config.devDatabaseType;
+    application.prodDatabaseType = config.prodDatabaseType;
+    application.incrementalChangelog = config.incrementalChangelog;
+    application.reactive = config.reactive;
+    application.searchEngine = config.searchEngine;
+    application.cacheProvider = config.cacheProvider;
+    application.enableHibernateCache = config.enableHibernateCache;
+    application.serviceDiscoveryType = config.serviceDiscoveryType;
+    application.enableSwaggerCodegen = config.enableSwaggerCodegen;
+    application.messageBroker = config.messageBroker;
+    application.websocket = config.websocket;
+    application.embeddableLaunchScript = config.embeddableLaunchScript;
+    application.enableGradleEnterprise = config.enableGradleEnterprise;
+    if (config.gradleEnterpriseHost) {
+        if (config.gradleEnterpriseHost.startsWith('https://')) {
+            application.gradleEnterpriseHost = config.gradleEnterpriseHost;
+        }
+        else {
+            application.gradleEnterpriseHost = `https://${config.gradleEnterpriseHost}`;
+        }
+    }
+};
+/**
+ * @param {Object} config - config to load config from
+ * @param {import('./base-application/types.js').PlatformApplication} dest - destination context to use default is context
+ */
+export const loadPlatformConfig = ({ config, application }) => {
+    application.serviceDiscoveryType = config.serviceDiscoveryType;
+    application.monitoring = config.monitoring;
+};
+export const loadDerivedServerAndPlatformProperties = ({ application }) => {
+    if (!application.serviceDiscoveryType) {
+        application.serviceDiscoveryType = NO_SERVICE_DISCOVERY;
+    }
+    application.serviceDiscoveryAny = application.serviceDiscoveryType !== NO_SERVICE_DISCOVERY;
+    application.serviceDiscoveryConsul = application.serviceDiscoveryType === CONSUL;
+    application.serviceDiscoveryEureka = application.serviceDiscoveryType === EUREKA;
+};
+/**
+ * @param {import('./bootstrap-application-server/types').SpringBootApplication} dest - destination context to use default is context
+ * @param {import('./base-application/types.js').PlatformApplication} dest - destination context to use default is context
+ */
+export const loadDerivedPlatformConfig = ({ application }) => {
+    application.monitoringElk = application.monitoring === ELK;
+    application.monitoringPrometheus = application.monitoring === PROMETHEUS;
+    loadDerivedServerAndPlatformProperties({ application });
+};
+/**
+ * @param {import('./bootstrap-application-server/types').SpringBootApplication} dest - destination context to use default is context
+ */
+export const loadDerivedServerConfig = ({ application }) => {
+    if (!application.packageFolder) {
+        application.packageFolder = `${application.packageName.replace(/\./g, '/')}/`;
+    }
+    application.prodDatabaseTypePostgres = undefined;
+    application.prodDatabaseTypeMssql = undefined;
+    application.devDatabaseTypeH2Any = undefined;
+    application.prodDatabaseTypeMariadb = undefined;
+    application.javaPackageSrcDir = normalizePathEnd(`${application.srcMainJava}${application.packageFolder}`);
+    application.javaPackageTestDir = normalizePathEnd(`${application.srcTestJava}${application.packageFolder}`);
+    application.communicationSpringWebsocket = application.websocket === SPRING_WEBSOCKET;
+    if (!application.searchEngine) {
+        application.searchEngine = NO_SEARCH_ENGINE;
+    }
+    application.searchEngineNo = application.searchEngine === NO_SEARCH_ENGINE;
+    application.searchEngineAny = !application.searchEngineNo;
+    application.searchEngineCouchbase = application.searchEngine === COUCHBASE;
+    application.searchEngineElasticsearch = application.searchEngine === ELASTICSEARCH;
+    if (!application.messageBroker) {
+        application.messageBroker = MESSAGE_BROKER_NO;
+    }
+    application.messageBrokerKafka = application.messageBroker === MESSAGE_BROKER_KAFKA;
+    application.messageBrokerPulsar = application.messageBroker === MESSAGE_BROKER_PULSAR;
+    application.messageBrokerAny = application.messageBroker && application.messageBroker !== MESSAGE_BROKER_NO;
+    application.buildToolGradle = application.buildTool === GRADLE;
+    application.buildToolMaven = application.buildTool === MAVEN;
+    application.buildToolUnknown = !application.buildToolGradle && !application.buildToolMaven;
+    application.temporaryDir = application.buildToolGradle ? 'build/' : 'target/';
+    const buildDestinationDir = `${application.temporaryDir}${application.buildToolGradle ? 'resources/main/' : 'classes/'}`;
+    application.clientDistDir = `${buildDestinationDir}${CLIENT_DIST_DIR}`;
+    application.cacheProviderNo = !application.cacheProvider || application.cacheProvider === NO_CACHE;
+    application.cacheProviderCaffeine = application.cacheProvider === CAFFEINE;
+    application.cacheProviderEhcache = application.cacheProvider === EHCACHE;
+    application.cacheProviderHazelcast = application.cacheProvider === HAZELCAST;
+    application.cacheProviderInfinispan = application.cacheProvider === INFINISPAN;
+    application.cacheProviderMemcached = application.cacheProvider === MEMCACHED;
+    application.cacheProviderRedis = application.cacheProvider === REDIS;
+    application.cacheProviderAny = application.cacheProvider && application.cacheProvider !== NO_CACHE;
+    application.databaseTypeNo = application.databaseType === NO_DATABASE;
+    application.databaseTypeSql = application.databaseType === SQL;
+    application.databaseTypeCassandra = application.databaseType === CASSANDRA;
+    application.databaseTypeCouchbase = application.databaseType === COUCHBASE;
+    application.databaseTypeMongodb = application.databaseType === MONGODB;
+    application.databaseTypeNeo4j = application.databaseType === NEO4J;
+    application.databaseTypeAny = !application.databaseTypeNo;
+    application.databaseMigrationLiquibase = application.databaseMigration
+        ? application.databaseMigration === 'liquibase'
+        : application.databaseType === SQL;
+    application.imperativeOrReactive = application.reactive ? 'reactive' : 'imperative';
+    application.authenticationUsesCsrf = [OAUTH2, SESSION].includes(application.authenticationType);
+    if (application.databaseTypeSql) {
+        prepareSqlApplicationProperties({ application });
+    }
+    loadDerivedServerAndPlatformProperties({ application });
+};

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

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import { formatDocAsSingleLine } from '../../base-application/support/index.mjs';
 const escapeDoubleQuotes = text => {
     if (text.includes('"')) {

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

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export * from './config.mjs';
 export * from './doc.mjs';
 export * from './database.mjs';
 export * from './dependabot-maven.mjs';

package/dist/generators/server/support/key-store.mjs

@@ -1,6 +1,6 @@
-import { execa } from 'execa';
 import { mkdir, lstat } from 'fs/promises';
 import { dirname } from 'path';
+import { execa } from 'execa';
 /**
  * Generate a KeyStore.
  */

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

@@ -27,14 +27,14 @@ const NO_SEARCH_ENGINE = searchEngineTypes.NO;
 const { POSTGRESQL, MYSQL, MARIADB, COUCHBASE, SQL } = databaseTypes;
 export default function prepareEntity(entity) {
     const { entityPackage, packageName, packageFolder, persistClass } = entity;
-    let { entityAbsolutePackage = packageName, entityAbsoluteFolder = packageFolder, entityJavaPackageFolder = packageFolder } = entity;
+    let { entityAbsolutePackage = packageName, entityAbsoluteFolder = packageFolder, entityJavaPackageFolder } = entity;
     if (entityPackage) {
         entityJavaPackageFolder = `${entityPackage.replace(/\./g, '/')}/`;
         entityAbsolutePackage = [packageName, entityPackage].join('.');
         entityAbsoluteFolder = path.join(packageFolder, entityJavaPackageFolder);
     }
     entityAbsoluteFolder = normalizePathEnd(entityAbsoluteFolder);
-    entity.entityJavaPackageFolder = entityJavaPackageFolder;
+    entity.entityJavaPackageFolder = entityJavaPackageFolder ?? '';
     entity.entityAbsolutePackage = entityAbsolutePackage;
     entity.entityAbsoluteFolder = entityAbsoluteFolder;
     entity.entityAbsoluteClass = `${entityAbsolutePackage}.domain.${persistClass}`;
@@ -49,8 +49,8 @@ export function loadRequiredConfigDerivedProperties(entity) {
     entity.jhiTablePrefix = hibernateSnakeCase(entity.jhiPrefix);
     entity.searchEngineCouchbase = entity.searchEngine === COUCHBASE;
     entity.searchEngineElasticsearch = entity.searchEngine === ELASTICSEARCH;
-    entity.searchEngineAny = ![undefined, NO_SEARCH_ENGINE].includes(entity.searchEngine);
-    entity.searchEngineNo = [undefined, NO_SEARCH_ENGINE].includes(entity.searchEngine);
+    entity.searchEngineAny = entity.searchEngine && entity.searchEngine !== NO_SEARCH_ENGINE;
+    entity.searchEngineNo = !entity.searchEngineAny;
 }
 export function preparePostEntityServerDerivedProperties(entity) {
     const { databaseType, reactive } = entity;

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

@@ -25,7 +25,7 @@ export const addEntitiesOtherRelationships = (entities) => {
             if (!relationship.otherRelationship &&
                 (relationship.relationshipType === 'many-to-many' ||
                     // OneToOne back reference is required due to filtering
-                    relationship.relationshipType === 'one-to-one' ||
+                    (relationship.relationshipType === 'one-to-one' && entity.databaseType === 'sql') ||
                     (relationship.relationshipType === 'one-to-many' && entity.databaseType !== 'neo4j' && entity.databaseType !== 'no'))) {
                 if (relationship.otherEntity.builtIn) {
                     result.warning.push(`Ignoring '${entity.name}' definitions as it is using a built-in Entity '${relationship.otherEntityName}': 'otherEntityRelationshipName' is set with value '${relationship.otherEntityRelationshipName}' at relationship '${relationship.relationshipName}' but no back-reference was found`);

package/dist/generators/server/support/spring-factories.mjs

@@ -1,17 +1,12 @@
-import _ from 'lodash';
-const { escapeRegExp } = _;
+import properties from 'dot-properties';
 // eslint-disable-next-line import/prefer-default-export
 export const addSpringFactory = ({ key, value }) => content => {
-    const match = content?.match(`${escapeRegExp(key)}(\\w*)=`);
-    if (match) {
-        const matchEnd = match.index + match[0].length;
-        content = `${content.slice(0, matchEnd)}\\
-${value},${content.slice(matchEnd)}`;
+    const obj = properties.parse(content ?? '');
+    const oldContent = obj[key];
+    const factories = (oldContent?.split(',') ?? []).map(val => val.trim());
+    if (factories.includes(value)) {
+        return content;
     }
-    else {
-        content = `${content ? `${content.trimEnd()}\n\n` : ''}${key}=\\
-${value}
-`;
-    }
-    return content;
+    obj[key] = [...factories, value].join(',');
+    return properties.stringify(obj);
 };

package/dist/generators/server/templates/.devcontainer/devcontainer.json.ejs

@@ -8,34 +8,39 @@
       // Update the VARIANT arg to pick a Java version: 17, 19
       // Append -bullseye or -buster to pin to an OS version.
       // Use the -bullseye variants on local arm64/Apple Silicon.
-      "VARIANT": "17",
+      "VARIANT": "<%= JAVA_VERSION %>-bullseye",
       // Options
-      "INSTALL_MAVEN": "<%= buildToolMaven %>",
-      "INSTALL_GRADLE": "<%= buildToolGradle %>",
-      "NODE_VERSION": "lts/*"
+      // maven and gradle wrappers are used by default, we don't need them installed globally
+      // "INSTALL_MAVEN": "<%= buildToolMaven %>",
+      // "INSTALL_GRADLE": "<%= buildToolGradle %>",
+      "NODE_VERSION": "<%= nodeVersion %>"
     }
   },
 
-  // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "java.home": "/docker-java-home"
-  },
+  "customizations": {
+    "vscode": {
+      // Set *default* container specific settings.json values on container create.
+      "settings": {
+        "java.jdt.ls.java.home": "/docker-java-home"
+      },
 
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": [
 <%_ if(clientFrameworkAngular) { _%>
-    "angular.ng-template",
+        "angular.ng-template",
 <%_ } _%>
 <%_ if(!skipClient) { _%>
-    "christian-kohler.npm-intellisense",
-    "firsttris.vscode-jest-runner",
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "dbaeumer.vscode-eslint",
+        "christian-kohler.npm-intellisense",
+        "firsttris.vscode-jest-runner",
+        "ms-vscode.vscode-typescript-tslint-plugin",
+        "dbaeumer.vscode-eslint",
 <%_ } _%>
-    "vscjava.vscode-java-pack",
-    "pivotal.vscode-boot-dev-pack",
-    "esbenp.prettier-vscode"
-	],
+        "vscjava.vscode-java-pack",
+        "pivotal.vscode-boot-dev-pack",
+        "esbenp.prettier-vscode"
+	    ],
+    },
+  },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [

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

@@ -32,6 +32,7 @@ plugins {
     id "com.github.node-gradle.node"
 <%_ } _%>
     id "org.sonarqube"
+    id "com.diffplug.spotless"
     id "io.spring.nohttp"
     id "com.github.andygoossens.gradle-modernizer-plugin"
 <%_ if (gatlingTests) { _%>
@@ -61,6 +62,14 @@ ext {
 
 apply from: "gradle/docker.gradle"
 apply from: "gradle/sonar.gradle"
+
+spotless {
+    java {
+        target 'src/*/java/**/*.java'
+        // removeUnusedImports()
+    }
+}
+
 <%_ if (enableSwaggerCodegen) { _%>
 apply from: "gradle/swagger.gradle"
 <%_ } _%>
@@ -266,7 +275,7 @@ if (addSpringMilestoneRepository) { _%>
   <%_ if (reactive) { _%>
     implementation "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}"
   <%_ } else { _%>
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate6"
   <%_ } _%>
 <%_ } _%>
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"

package/dist/generators/server/templates/entity/src/main/java/package/common/inject_template.ejs

@@ -20,7 +20,9 @@
   const beans = [];
   if (viaService) {
     beans.push({class: `${entityClass}Service`, instance: `${entityInstance}Service`});
-    beans.push({class: `${entityClass}Repository`, instance: `${entityInstance}Repository`});
+    if (!readOnly) {
+      beans.push({class: `${entityClass}Repository`, instance: `${entityInstance}Repository`});
+    }
     if (queryService && !reactive) {
       beans.push({class: `${entityClass}QueryService`, instance: `${entityInstance}QueryService`});
     }

package/dist/generators/server/templates/entity/src/main/java/package/common/patch_template.ejs

@@ -32,6 +32,7 @@ _%>
   <%_ } _%>
 <%_ } else { %>
 <%- returnPrefix %> <%= entityInstance %>Repository.findById(<%= instanceName %>.get<%= primaryKey.nameCapitalized %>())
+  <%_ if (dtoMapstruct || fields.filter(field => !field.id && !field.transient).length > 0) { _%>
     .map(existing<%= entityClass %> -> {
   <%_ if (dtoMapstruct) { _%>
        <%= mapper %>.partialUpdate(existing<%= entityClass %>, <%= instanceName %>);
@@ -49,6 +50,7 @@ _%>
   <% } %>
     return existing<%= entityClass %>;
     })
+  <%_ } %>
   <% if (!updatableEntity) { %>// <%} %>.<%= mapOrFlatMap %>(<%= entityInstance %>Repository::save)
   <%_ if (searchEngineElasticsearch) { _%>
     .<%= mapOrFlatMap %>(saved<%= entityClass %> -> {

package/dist/generators/server/templates/entity/src/main/java/package/service/_EntityClass_Service.java.ejs

@@ -56,7 +56,7 @@ import java.util.UUID;
 <%_ } _%>
 
 /**
- * Service Interface for managing {@link <% if (dtoMapstruct) { %><%= entityAbsolutePackage %>.domain.<% } %><%= persistClass %>}.
+ * Service Interface for managing {@link <%= entityAbsoluteClass %>}.
  */
 public interface <%= entityClass %>Service {
 

package/dist/generators/server/templates/entity/src/main/java/package/service/criteria/_EntityClass_Criteria.java.ejs

@@ -46,7 +46,7 @@ filterVariables.push({ filterType : oauthAwareReferenceFilterType,
 });
 _%>
 /**
- * Criteria class for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity. This class is used
+ * Criteria class for the {@link <%= entityAbsoluteClass %>} entity. This class is used
  * in {@link <%= entityAbsolutePackage %>.web.rest.<%= entityClass %>Resource} to receive all the possible filtering options from
  * the Http GET request parameters.
  * For example the following could be a valid request:

package/dist/generators/server/templates/entity/src/main/java/package/service/impl/_EntityClass_ServiceImpl.java.ejs

@@ -87,13 +87,9 @@ import java.util.stream.Collectors;
 <%_ if (fieldsContainNoOwnerOneToOne || (paginationNo && searchEngineElasticsearch)) { _%>
 import java.util.stream.StreamSupport;
 <%_ } _%>
-<%_ if (searchEngineElasticsearch) { _%>
-
-import static org.springframework.data.elasticsearch.client.elc.QueryBuilders.*;
-<%_ } _%>
 
 /**
- * Service Implementation for managing {@link <%= persistClass %>}.
+ * Service Implementation for managing {@link <%= entityAbsoluteClass %>}.
  */
 @Service<% if (databaseTypeSql) { %>
 @Transactional<% } %>
@@ -198,9 +194,9 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     public <% if (paginationNo) { %><%= listOrFlux %><% } else { %><%= pageOrFlux %><% } %><<%= instanceType %>> findByCriteria(<%= entityClass %>Criteria criteria<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
         log.debug("Request to get all <%= entityClassPlural %> by Criteria");
     <%_ if (paginationNo) { _%>
-        return <%= entityInstance %>Repository.findByCriteria(criteria, null);
+        return <%= entityInstance %>Repository.findByCriteria(criteria, null)<% if (dtoMapstruct) { %>.map(<%= entityToDtoReference  %>)<% } %>;
     <%_ } else { _%>
-        return <%= entityInstance %>Repository.findByCriteria(criteria, pageable);
+        return <%= entityInstance %>Repository.findByCriteria(criteria, pageable)<% if (dtoMapstruct) { %>.map(<%= entityToDtoReference  %>)<% } %>;
     <%_ } _%>
     }
 

package/dist/generators/server/templates/entity/src/main/java/package/web/rest/_EntityClass_Resource.java.ejs

@@ -125,13 +125,9 @@ import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
   <%_ } _%>
 <%_ } _%>
-<%_ if (searchEngineElasticsearch && !reactive) { _%>
-
-import static org.springframework.data.elasticsearch.client.elc.QueryBuilders.*;
-<%_ } _%>
 
 /**
- * REST controller for managing {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>}.
+ * REST controller for managing {@link <%= entityAbsoluteClass %>}.
  */
 @RestController
 @RequestMapping("/api")
@@ -157,7 +153,7 @@ public class <%= entityClass %>Resource {
     const instanceName = restInstance;
     const mapper = entityInstance  + 'Mapper';
     const entityToDtoReference = mapper + '::' + 'toDto';
-    _%><%- include('../../common/inject_template', {viaService: viaService, constructorName: entityClass + 'Resource', queryService: jpaMetamodelFiltering, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: true, reactive: reactive}); -%>
+    _%><%- include('../../common/inject_template', {readOnly: readOnly, viaService: viaService, constructorName: entityClass + 'Resource', queryService: jpaMetamodelFiltering, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: true, reactive: reactive}); -%>
 <%_ if (!readOnly) { _%>
 
     /**

package/dist/generators/server/templates/entity/src/test/java/package/web/rest/_EntityClass_ResourceIT.java.ejs

@@ -757,7 +757,7 @@ _%>
     <%_ break; } _%>
 
         // Load the <%= entityInstance %>
-        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.get()' %>;
+        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.orElseThrow()' %>;
         assertThat(updated<%= persistClass %>).isNotNull();
     <%_ if (databaseTypeSql && !reactive) { _%>
         // Disconnect from session so that the updates on updated<%= persistClass %> are not directly saved in db
@@ -1391,7 +1391,7 @@ _%>
   <%_ } _%>
 
         // Update the <%= entityInstance %>
-        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.get()' %>;
+        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.orElseThrow()' %>;
   <%_ if (databaseTypeSql && !reactive) { _%>
         // Disconnect from session so that the updates on updated<%= persistClass %> are not directly saved in db
         em.detach(updated<%= persistClass %>);

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

@@ -26,6 +26,20 @@ sourceSets {
 }
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
+
+configurations {
+  all {
+    resolutionStrategy {
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-core:${hibernateVersion}"
+<%_ if (enableHibernateCache && (cacheProviderEhcache || cacheProviderCaffeine || cacheProviderRedis)) { _%>
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-jcache:${hibernateVersion}"
+<%_ } _%>
+    }
+  }
+}
+
 dependencies {
     developmentOnly "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
   <%_ if (devDatabaseTypeH2Any) { _%>
@@ -37,7 +51,7 @@ dependencies {
   <%_ } _%>
   <%_ if (devDatabaseTypeMysql) { _%>
     <%_ if (reactive) { _%>
-    implementation ("io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>")
+    implementation ("io.asyncer:r2dbc-mysql")
     <%_ } _%>
     implementation "com.mysql:mysql-connector-j"
   <%_ } _%>
@@ -49,9 +63,7 @@ dependencies {
   <%_ } _%>
   <%_ if (devDatabaseTypeMariadb) { _%>
     <%_ if (reactive) { _%>
-    // TODO drop version once spring-boot 3.1.0 is released https://github.com/spring-projects/spring-boot/issues/34625
-    // implementation "org.mariadb:r2dbc-mariadb:<%- javaDependencies['r2dbc-mariadb'] %>"
-    implementation "io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>"
+    implementation "org.mariadb:r2dbc-mariadb"
     <%_ } _%>
     implementation "org.mariadb.jdbc:mariadb-java-client"
   <%_ } _%>

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

@@ -26,10 +26,24 @@ sourceSets {
 }
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
+
+configurations {
+  all {
+    resolutionStrategy {
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-core:${hibernateVersion}"
+<%_ if (enableHibernateCache && (cacheProviderEhcache || cacheProviderCaffeine || cacheProviderRedis)) { _%>
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-jcache:${hibernateVersion}"
+<%_ } _%>
+    }
+  }
+}
+
 dependencies {
   <%_ if (prodDatabaseTypeMysql) { _%>
     <%_ if (reactive) { _%>
-    implementation "io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>"
+    implementation "io.asyncer:r2dbc-mysql"
     <%_ } _%>
     implementation "com.mysql:mysql-connector-j"
     testImplementation "org.testcontainers:mysql"
@@ -43,9 +57,7 @@ dependencies {
   <%_ } _%>
   <%_ if (prodDatabaseTypeMariadb) { _%>
     <%_ if (reactive) { _%>
-    // TODO drop version once spring-boot 3.1.0 is released https://github.com/spring-projects/spring-boot/issues/34625
-    // implementation "org.mariadb:r2dbc-mariadb:<%- javaDependencies['r2dbc-mariadb'] %>"
-    implementation "io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>"
+    implementation "org.mariadb:r2dbc-mariadb"
     <%_ } _%>
     implementation "org.mariadb.jdbc:mariadb-java-client"
     testImplementation "org.testcontainers:mariadb"

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

@@ -31,7 +31,7 @@ openApiGenerate {
     apiFilesConstrainedTo = [""]
     modelFilesConstrainedTo = [""]
     supportingFilesConstrainedTo = ["ApiUtil.java"]
-    configOptions = [delegatePattern: "true", title: "<%= dasherizedBaseName %>"<% if (reactive) {  %>, reactive: "true"<% } %>]
+    configOptions = [delegatePattern: "true", title: "<%= dasherizedBaseName %>"<% if (reactive) {  %>, reactive: "true"<% } %>, useSpringBoot3: "true"]
     validateSpec = true
     importMappings = [Problem:"org.springframework.http.ProblemDetail"]
 }

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

@@ -70,6 +70,7 @@ gitPropertiesPluginVersion=<%- javaDependencies['gradle-git-properties'] %>
 gradleNodePluginVersion=<%- javaDependencies['node-gradle'] %>
 <%_ } _%>
 sonarqubePluginVersion=<%- javaDependencies['gradle-sonarqube'] %>
+spotlessPluginVersion=<%- javaDependencies['spotless-gradle-plugin'] %>
 <%_ if (enableSwaggerCodegen) { _%>
 openapiPluginVersion=<%- javaDependencies['openapi-generator-maven-plugin'] %>
 <%_ } _%>