generator-jhipster 8.0.0 → 8.1.0

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

@@ -59,19 +59,13 @@ public class LogoutResource {
 
     private Map<String, String> prepareLogoutUri(ServerHttpRequest request, ClientRegistration clientRegistration, OidcIdToken idToken) {
         StringBuilder logoutUrl = new StringBuilder();
-        String issuerUri = clientRegistration.getProviderDetails().getIssuerUri();
-        if (issuerUri.contains("auth0.com")) {
-            logoutUrl.append(issuerUri.endsWith("/") ? issuerUri + "v2/logout" : issuerUri + "/v2/logout");
-        } else {
-            logoutUrl.append(clientRegistration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
-        }
+
+        logoutUrl.append(clientRegistration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
 
         String originUrl = request.getHeaders().getOrigin();
-        if (issuerUri.contains("auth0.com")) {
-            logoutUrl.append("?client_id=").append(clientRegistration.getClientId()).append("&returnTo=").append(originUrl);
-        } else {
-            logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
-        }
+
+        logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
+   
         return Map.of("logoutUrl", logoutUrl.toString());
     }
 }

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

@@ -59,7 +59,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.*;
 <%_ if (reactive) { _%>
 import org.springframework.web.server.ResponseStatusException;
-import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.util.ForwardedHeaderUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 <%_ } else {_%>
@@ -133,7 +133,7 @@ public class PublicUserResource {
 
         return userService.countManagedUsers()
             .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(userService.getAllPublicUsers(pageable)));
     }
   <%_ } else { _%>
@@ -181,7 +181,7 @@ public class PublicUserResource {
      * @return the result of the search.
      */
     @GetMapping("/users/_search/{query}")
-    public <% if(reactive) { %>Mono<<% } %>List<<%= user.dtoClass %>><% if(reactive) { %>><% } %> search(@PathVariable String query) {
+    public <% if(reactive) { %>Mono<<% } %>List<<%= user.dtoClass %>><% if(reactive) { %>><% } %> search(@PathVariable("query") String query) {
   <%_ if (searchEngineElasticsearch) { _%>
     <%_ if (reactive) { _%>
         return userSearchRepository.search(query).map(<%= user.dtoClass %>::new).collectList();

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

@@ -62,7 +62,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 <%_ if (reactive) { _%>
 import org.springframework.web.server.ResponseStatusException;
-import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.util.ForwardedHeaderUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 <%_ } else { _%>
@@ -270,7 +270,7 @@ public class UserResource {
 
         return userService.countManagedUsers()
             .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(userService.getAllManagedUsers(pageable)));
   <%_ } else { _%>
     public ResponseEntity<List<<%= user.adminUserDto %>>> getAllUsers(@org.springdoc.core.annotations.ParameterObject Pageable pageable) {
@@ -306,13 +306,13 @@ public class UserResource {
     @GetMapping("/users/{login}")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
 <%_ if (reactive) { _%>
-    public Mono<<%= user.adminUserDto %>> getUser(@PathVariable String login) {
+    public Mono<<%= user.adminUserDto %>> getUser(@PathVariable("login") String login) {
         log.debug("REST request to get User : {}", login);
         return userService.getUserWithAuthoritiesByLogin(login)
             .map(<%= user.adminUserDto %>::new)
             .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)));
 <%_ } else { _%>
-    public ResponseEntity<<%= user.adminUserDto %>> getUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
+    public ResponseEntity<<%= user.adminUserDto %>> getUser(@PathVariable("login") @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to get User : {}", login);
         return ResponseUtil.wrapOrNotFound(
             userService.getUserWithAuthoritiesByLogin(login)
@@ -329,12 +329,12 @@ public class UserResource {
     @DeleteMapping("/users/{login}")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
 <%_ if (reactive) { _%>
-    public Mono<ResponseEntity<Void>> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
+    public Mono<ResponseEntity<Void>> deleteUser(@PathVariable("login") @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);
         return userService.deleteUser(login)
         .then(Mono.just(ResponseEntity.noContent().headers(HeaderUtil.createAlert( applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build()));
 <%_ } else { _%>
-    public ResponseEntity<Void> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
+    public ResponseEntity<Void> deleteUser(@PathVariable("login") @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);
         userService.deleteUser(login);
         return ResponseEntity.noContent().headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build();

package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs

@@ -142,6 +142,10 @@ management:
       export:
         enabled: true
         step: 60
+  observations:
+    key-values:
+      application: ${spring.application.name}
+  metrics:
     enable:
       http: true
       jvm: true
@@ -153,13 +157,10 @@ management:
         all: true
       percentiles:
         all: 0, 0.5, 0.75, 0.95, 0.99, 1.0
-    tags:
-      application: ${spring.application.name}
-    web:
-      server:
-        request:
-          autotime:
-            enabled: true
+    data:
+      repository:
+        autotime:
+          enabled: true
 
 <%_ if (databaseTypeMongodb) { _%>
 mongock:

package/dist/generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs

@@ -28,7 +28,7 @@ import static com.tngtech.archunit.core.domain.JavaClass.Predicates.belongToAnyO
 import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
 
 <%_
-  const hasClientLayer = !reactive && (applicationTypeMicroservice || applicationTypeGateway);
+  const hasClientLayer = feignClient;
   const hasDomainLayer = !databaseTypeNo;
   const hasConstants = !skipUserManagement || databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j;
 _%>

package/dist/generators/server/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs

@@ -152,9 +152,6 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.transaction.annotation.Transactional;
   <%_ } _%>
 <%_ } _%>
-<%_ if (anyFieldIsBlobDerived) { _%>
-import org.springframework.util.Base64Utils;
-<%_ } _%>
 <%_ if (reactive && (implementsEagerLoadApis || searchEngineElasticsearch)) { _%>
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -190,6 +187,9 @@ import java.time.temporal.ChronoUnit;
 <%_ if (!reactive && implementsEagerLoadApis) { _%>
 import java.util.ArrayList;
 <%_ } _%>
+<%_ if (anyFieldIsBlobDerived) { _%>
+import java.util.Base64;
+<%_ } _%>
 <%_ if (searchEngineElasticsearch && !reactive) { _%>
 import java.util.Collections;
   <%_ if (paginationNo) { _%>
@@ -933,7 +933,7 @@ _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))<%= !reactive ? ')' : '' %>
   <%_ } _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= field.fieldName %>").value(hasItem(<%
-  if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64Utils.encodeToString(<% } else
+  if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64.getEncoder().encodeToString(<% } else
   if (field.fieldTypeZonedDateTime) { %>sameInstant(<% } else
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
@@ -1020,7 +1020,7 @@ _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.<%= field.fieldName %>ContentType").value(<%= reactive ? 'is(' : '' %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))
   <%_ } _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.<%= field.fieldName %>").value(<%= reactive ? 'is(' : '' %><%
-  if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64Utils.encodeToString(<% } else
+  if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64.getEncoder().encodeToString(<% } else
   if (field.fieldTypeZonedDateTime) { %>sameInstant(<% } else
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
@@ -1259,7 +1259,7 @@ _%>
             .jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))
       <%_ } _%>
             .jsonPath("$.[*].<%= field.fieldName %>").value(hasItem(<% if
-      (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64Utils.encodeToString(<% } else
+      (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64.getEncoder().encodeToString(<% } else
       if (field.fieldTypeZonedDateTime) { %>sameInstant(<% } else
       if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
       if (field.fieldTypeBinary && !field.blobContentTypeText) { %><% if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
@@ -1301,7 +1301,7 @@ _%>
             .andExpect(jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)))
     <%_ } _%>
             .andExpect(jsonPath("$.[*].<%= field.fieldName %>").value(hasItem(<%
-    if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64Utils.encodeToString(<% } else
+    if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64.getEncoder().encodeToString(<% } else
     if (field.fieldTypeZonedDateTime) { %>sameInstant(<% } else
     if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
     if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
@@ -1831,7 +1831,7 @@ _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))<%= !reactive ? ')' : '' %>
   <%_ } _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= field.fieldName %>").value(hasItem(<%
-  if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64Utils.encodeToString(<% } else
+  if (field.fieldTypeBinary && !field.blobContentTypeText) { %>Base64.getEncoder().encodeToString(<% } else
   if (field.fieldTypeZonedDateTime) { %>sameInstant(<% } else
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%

package/dist/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs

@@ -45,11 +45,11 @@ public class ExceptionTranslatorTestController {
     }
 
     @GetMapping("/missing-servlet-request-part")
-    public void missingServletRequestPartException(@RequestPart String part) {
+    public void missingServletRequestPartException(@RequestPart("part") String part) {
     }
 
     @GetMapping("/missing-servlet-request-parameter")
-    public void missingServletRequestParameterException(@RequestParam String param) {
+    public void missingServletRequestParameterException(@RequestParam("param") String param) {
     }
 
     @GetMapping("/access-denied")

package/dist/generators/spring-cache/internal/dependencies.mjs

@@ -139,7 +139,7 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies)
                     javaxCacheApi,
                     {
                         groupId: 'org.infinispan',
-                        artifactId: 'infinispan-hibernate-cache-v60',
+                        artifactId: 'infinispan-hibernate-cache-v62',
                     },
                     {
                         groupId: 'org.infinispan',

package/dist/generators/spring-cache/templates/gradle/cache.gradle.ejs

@@ -24,7 +24,7 @@ dependencies {
   implementation "com.hazelcast:hazelcast-spring:${hazelcastSpringVersion}"
 <%_ } _%>
 <%_ if (cacheProviderInfinispan) { _%>
-  implementation "org.infinispan:infinispan-hibernate-cache-v60"
+  implementation "org.infinispan:infinispan-hibernate-cache-v62"
   implementation "org.infinispan:infinispan-spring-boot3-starter-embedded"
   implementation "org.infinispan:infinispan-commons-jakarta"
   implementation "org.infinispan:infinispan-core-jakarta"

package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheFactoryConfiguration.java.ejs

@@ -19,7 +19,7 @@
 package <%= packageName %>.config;
 
 import org.hibernate.service.ServiceRegistry;
-import org.infinispan.hibernate.cache.v60.InfinispanRegionFactory;
+import org.infinispan.hibernate.cache.v62.InfinispanRegionFactory;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.springframework.stereotype.Component;
 

package/dist/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs

@@ -43,7 +43,7 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
     }
 
     @PostMapping("/publish")
-    public void publish(@RequestParam String message) {
+    public void publish(@RequestParam("message") String message) {
         log.debug("REST request the message : {} to send to Kafka topic ", message);
         streamBridge.send(PRODUCER_BINDING_NAME, message);
     }

package/dist/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs

@@ -44,7 +44,7 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
     }
 
     @PostMapping("/publish")
-    public Mono<ResponseEntity<Void>> publish(@RequestParam String message) {
+    public Mono<ResponseEntity<Void>> publish(@RequestParam("message") String message) {
         log.debug("REST request the message : {} to send to Kafka topic", message);
         streamBridge.send(PRODUCER_BINDING_NAME, message);
         return Mono.just(ResponseEntity.noContent().build());

package/dist/generators/spring-cloud-stream/templates/src/test/java/_package_/web/rest/KafkaResourceIT_reactive.java.ejs

@@ -35,9 +35,11 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.cloud.stream.binder.test.InputDestination;
 import org.springframework.cloud.stream.binder.test.OutputDestination;
+import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
 import org.springframework.http.MediaType;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
@@ -50,6 +52,7 @@ import org.springframework.util.MimeTypeUtils;
 @WithMockUser
 @EmbeddedKafka
 @IntegrationTest
+@ImportAutoConfiguration(TestChannelBinderConfiguration.class)
 class <%= upperFirstCamelCaseBaseName %>KafkaResourceIT {
     private static String KAFKA_API = "/api/<%= dasherizedBaseName %>-kafka/{command}";
 

package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.elastic_search.ejs

@@ -45,7 +45,7 @@
 
 <%_ for (const relationship of relationships) { -%>
   <&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
-    <% // just break the cycle // in the reactive area, we already have the annotation in place
+    <% /* just break the cycle in the reactive area, we already have the annotation in place */
       if (!relationship.ownerSide && !reactive) { %>
         @org.springframework.data.annotation.Transient
     <% } %>

package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.java.ejs

@@ -19,7 +19,7 @@
 package <%= entityAbsolutePackage %>.repository.search;
 
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
-import <%= entityAbsolutePackage %>.repository.<%= persistClass %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 
 <%_ if (!paginationNo) { _%>
   <%_ if (!reactive) { _%>

package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/repository/search/UserSearchRepository.java.ejs

@@ -19,7 +19,7 @@
 package <%= packageName %>.repository.search;
 
 import <%= user.entityAbsoluteClass %>;
-import <%= packageName %>.repository.<%= user.persistClass %>Repository;
+import <%= packageName %>.repository.<%= user.entityClass %>Repository;
 
 <%_ if (reactive) { _%>
 import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchTemplate;
@@ -49,7 +49,7 @@ import java.util.UUID;
 import static org.springframework.data.elasticsearch.client.elc.QueryBuilders.queryStringQuery;
 
 /**
- * Spring Data Elasticsearch repository for the User entity.
+ * Spring Data Elasticsearch repository for the <%= user.persistClass %> entity.
  */
 public interface UserSearchRepository extends <% if (reactive) {%>Reactive<% } %>ElasticsearchRepository<<%= user.persistClass %>, <%= user.primaryKey.type %>>, UserSearchRepositoryInternal {
 }
@@ -70,7 +70,7 @@ class UserSearchRepositoryInternalImpl implements UserSearchRepositoryInternal {
     @Override
     public Flux<<%= user.persistClass %>> search(String query) {
         NativeQuery nativeQuery = new NativeQuery(QueryStringQuery.of(qs -> qs.query(query))._toQuery());
-        return reactiveElasticsearchTemplate.search(nativeQuery, User.class).map(SearchHit::getContent);
+        return reactiveElasticsearchTemplate.search(nativeQuery, <%= user.persistClass %>.class).map(SearchHit::getContent);
     }
 }
 <%_ } else { _%>
@@ -105,7 +105,7 @@ class UserSearchRepositoryInternalImpl implements UserSearchRepositoryInternal {
     public Stream<<%= user.persistClass %>> search(String query) {
         NativeQuery nativeQuery = new NativeQuery(QueryStringQuery.of(qs -> qs.query(query))._toQuery());
         return elasticsearchTemplate
-            .search(nativeQuery, User.class)
+            .search(nativeQuery, <%= user.persistClass %>.class)
             .map(SearchHit::getContent)
             .stream();
     }

package/dist/generators/spring-data-neo4j/generator.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_NEO4J } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_NEO4J } from '../generator-list.mjs';
 import writeTask from './files.mjs';
 import cleanupTask from './cleanup.mjs';
 import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.mjs';
@@ -28,6 +28,8 @@ export default class Neo4jGenerator extends BaseApplicationGenerator {
         }
         if (!this.delegateToBlueprint) {
             await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            const javaGenerator = await this.dependsOnJHipster(GENERATOR_JAVA);
+            javaGenerator.useJacksonIdentityInfo = true;
         }
     }
     get composing() {
@@ -57,6 +59,46 @@ export default class Neo4jGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
+    get configuringEachEntity() {
+        return this.asConfiguringEachEntityTaskGroup({
+            async configuringEachEntity({ entityConfig }) {
+                if (entityConfig.dto && entityConfig.dto !== 'no') {
+                    this.log.warn(`The DTO option is not supported for Neo4j database. Neo4j persists the entire constellation, DTO causes the constelation to be incomplete. DTO is found in entity ${entityConfig.name}.`);
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.CONFIGURING_EACH_ENTITY]() {
+        return this.delegateTasksToBlueprint(() => this.configuringEachEntity);
+    }
+    get preparingEachEntity() {
+        return this.asPreparingEachEntityTaskGroup({
+            prepareEntity({ entity }) {
+                entity.relationships.forEach(relationship => {
+                    if (relationship.persistableRelationship === undefined) {
+                        relationship.persistableRelationship = true;
+                    }
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
+        return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
+    }
+    get default() {
+        return this.asDefaultTaskGroup({
+            async checkUserRelationship({ entities }) {
+                entities.forEach(entity => {
+                    if (entity.relationships.some(relationship => relationship.otherEntity.builtInUser)) {
+                        this.log.warn(`Relationship with User entity should be avoided for Neo4j database. Neo4j persists the entire constelation, related User entity will be updated causing security problems. Relationship with User entity is found in entity ${entity.name}.`);
+                    }
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.DEFAULT]() {
+        return this.delegateTasksToBlueprint(() => this.default);
+    }
     get writing() {
         return this.asWritingTaskGroup({
             cleanupTask,

package/dist/generators/spring-data-neo4j/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_neo4j.ejs

@@ -57,7 +57,7 @@ import org.springframework.data.neo4j.core.schema.Relationship;
     <%_ if (relationship.relationshipLeftSide) { _%>
     @Relationship(value = "HAS_<%= this._.toUpper(this._.snakeCase(relationship.relationshipName)) %>", direction = Relationship.Direction.OUTGOING)
     <%_ } else { _%>
-    @Relationship(value = "IS_<%= this._.toUpper(this._.snakeCase(relationship.relationshipName)) %>_<%= this._.toUpper(this._.snakeCase(relationship.otherRelationship.relationshipName)) %>", direction = Relationship.Direction.INCOMING)
+    @Relationship(value = "HAS_<%= this._.toUpper(this._.snakeCase(relationship.otherRelationship.relationshipName)) %>", direction = Relationship.Direction.INCOMING)
     <%_ } _%>
 <&_ } -&>
 <%_ } -%>

package/dist/generators/spring-data-relational/README.md

@@ -0,0 +1,7 @@
+# SQL/spring-data-relational sub-generador
+
+Adds support to spring-data-relational and provides sql related utilities.
+
+## Customizing
+
+Customizing basics can be found at [Customizing](../app/README.md#customizing)

package/dist/generators/spring-data-relational/generator.mjs

@@ -24,7 +24,7 @@ import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.mjs';
 import { isReservedTableName } from '../../jdl/jhipster/reserved-keywords.js';
 import { databaseTypes } from '../../jdl/jhipster/index.mjs';
 import { getDBCExtraOption, getJdbcUrl, getR2dbcUrl } from './support/index.mjs';
-import { getCommonMavenDefinition, getDatabaseTypeMavenDefinition, getH2MavenDefinition, getImperativeMavenDefinition, getReactiveMavenDefinition, } from './internal/dependencies.mjs';
+import { getCommonMavenDefinition, getDatabaseDriverForDatabase, getDatabaseTypeMavenDefinition, getH2MavenDefinition, getImperativeMavenDefinition, getReactiveMavenDefinition, } from './internal/dependencies.mjs';
 import command from './command.mjs';
 const { SQL } = databaseTypes;
 export default class SqlGenerator extends BaseApplicationGenerator {
@@ -62,6 +62,7 @@ export default class SqlGenerator extends BaseApplicationGenerator {
                 const anyApp = application;
                 anyApp.devDatabaseExtraOptions = getDBCExtraOption(anyApp.devDatabaseType);
                 anyApp.prodDatabaseExtraOptions = getDBCExtraOption(anyApp.prodDatabaseType);
+                anyApp.prodDatabaseDriver = getDatabaseDriverForDatabase(application.prodDatabaseType);
             },
         });
     }

package/dist/generators/spring-data-relational/internal/dependencies.mjs

@@ -22,6 +22,27 @@ const testcontainerFileForDB = {
     mysql: 'MysqlTestContainer.java',
     postgresql: 'PostgreSqlTestContainer.java',
 };
+const databaseArtifactForDB = {
+    mariadb: {
+        jdbc: { groupId: 'org.mariadb.jdbc', artifactId: 'mariadb-java-client' },
+        // maria-r2dbc driver is failing.
+        // r2dbc: { groupId: 'org.mariadb', artifactId: 'r2dbc-mariadb' },
+        r2dbc: { groupId: 'io.asyncer', artifactId: 'r2dbc-mysql' },
+    },
+    mssql: {
+        jdbc: { groupId: 'com.microsoft.sqlserver', artifactId: 'mssql-jdbc' },
+        r2dbc: { groupId: 'io.r2dbc', artifactId: 'r2dbc-mssql' },
+    },
+    mysql: {
+        jdbc: { groupId: 'com.mysql', artifactId: 'mysql-connector-j' },
+        r2dbc: { groupId: 'io.asyncer', artifactId: 'r2dbc-mysql' },
+    },
+    postgresql: {
+        jdbc: { groupId: 'org.postgresql', artifactId: 'postgresql' },
+        r2dbc: { groupId: 'org.postgresql', artifactId: 'r2dbc-postgresql' },
+    },
+};
+export const getDatabaseDriverForDatabase = (databaseType) => databaseArtifactForDB[databaseType];
 export const getCommonMavenDefinition = ({ javaDependencies }) => ({
     properties: [
         { property: 'jaxb-runtime.version', value: javaDependencies['jaxb-runtime'] },
@@ -98,34 +119,34 @@ export const getDatabaseTypeMavenDefinition = (databaseType, { inProfile }) => {
         mariadb: {
             jdbc: {
                 dependencies: [
-                    { inProfile, groupId: 'org.mariadb.jdbc', artifactId: 'mariadb-java-client' },
+                    { inProfile, ...databaseArtifactForDB.mariadb.jdbc },
                     { groupId: 'org.testcontainers', artifactId: 'mariadb', scope: 'test' },
                 ],
             },
             r2dbc: {
-                dependencies: [{ inProfile, groupId: 'org.mariadb', artifactId: 'r2dbc-mariadb' }],
+                dependencies: [{ inProfile, ...databaseArtifactForDB.mariadb.r2dbc }],
             },
         },
         mssql: {
             jdbc: {
                 dependencies: [
-                    { inProfile, groupId: 'com.microsoft.sqlserver', artifactId: 'mssql-jdbc' },
+                    { inProfile, ...databaseArtifactForDB.mssql.jdbc },
                     { groupId: 'org.testcontainers', artifactId: 'mssqlserver', scope: 'test' },
                 ],
             },
             r2dbc: {
-                dependencies: [{ inProfile, groupId: 'io.r2dbc', artifactId: 'r2dbc-mssql' }],
+                dependencies: [{ inProfile, ...databaseArtifactForDB.mssql.r2dbc }],
             },
         },
         mysql: {
             jdbc: {
                 dependencies: [
-                    { inProfile, groupId: 'com.mysql', artifactId: 'mysql-connector-j' },
+                    { inProfile, ...databaseArtifactForDB.mysql.jdbc },
                     { groupId: 'org.testcontainers', artifactId: 'mysql', scope: 'test' },
                 ],
             },
             r2dbc: {
-                dependencies: [{ inProfile, groupId: 'io.asyncer', artifactId: 'r2dbc-mysql' }],
+                dependencies: [{ inProfile, ...databaseArtifactForDB.mysql.r2dbc }],
             },
         },
         oracle: {
@@ -140,12 +161,12 @@ export const getDatabaseTypeMavenDefinition = (databaseType, { inProfile }) => {
         postgresql: {
             jdbc: {
                 dependencies: [
-                    { inProfile, groupId: 'org.postgresql', artifactId: 'postgresql' },
+                    { inProfile, ...databaseArtifactForDB.postgresql.jdbc },
                     { groupId: 'org.testcontainers', artifactId: 'postgresql', scope: 'test' },
                 ],
             },
             r2dbc: {
-                dependencies: [{ inProfile, groupId: 'org.postgresql', artifactId: 'r2dbc-postgresql' }],
+                dependencies: [{ inProfile, ...databaseArtifactForDB.postgresql.r2dbc }],
             },
         },
     };

package/dist/generators/spring-data-relational/support/database-data.mjs

@@ -75,6 +75,10 @@ const databaseData = {
         defaultUsername: 'root',
         constraintNameMaxLength: 64,
         tableNameMaxLength: 64,
+        r2dbc: {
+            // TODO switch to mariadb if r2dbc-mariadb is reinstated
+            protocolSuffix: 'mysql://',
+        },
     },
     [MYSQL]: {
         name: 'MySQL',

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs

@@ -21,27 +21,22 @@ package <%= packageName %>.repository;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.stream.Stream;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.r2dbc.convert.R2dbcConverter;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.data.r2dbc.core.StatementMapper;
-import org.springframework.data.r2dbc.mapping.OutboundRow;
 import org.springframework.data.r2dbc.query.UpdateMapper;
+import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.relational.core.sql.Condition;
-import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
-import org.springframework.data.relational.core.sql.Conditions;
+import org.springframework.data.relational.core.sql.Column;
 import org.springframework.data.relational.core.sql.OrderByField;
 import org.springframework.data.relational.core.sql.Select;
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectFromAndJoin;
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectFromAndJoinCondition;
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectOrdered;
-import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.core.sql.Table;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 import org.springframework.r2dbc.core.Parameter;
@@ -240,11 +235,57 @@ public class EntityManager {
         for (Sort.Order order : sortToUse) {
 
             String propertyName = order.getProperty();
-            OrderByField orderByField = OrderByField.from(table.column(propertyName).as(EntityManager.ALIAS_PREFIX + propertyName));
+            OrderByField orderByField = !propertyName.contains(".")
+                ? OrderByField.from(table.column(propertyName).as(EntityManager.ALIAS_PREFIX + propertyName))
+                : createOrderByField(propertyName);
 
             fields.add(order.isAscending() ? orderByField.asc() : orderByField.desc());
         }
 
         return fields;
     }
+
+    /**
+     * Creates an OrderByField instance for sorting a query by the specified property.
+     *
+     * @param propertyName The full property name in the format "tableName.columnName".
+     * @return An OrderByField instance for sorting by the specified property.
+     */
+    private static OrderByField createOrderByField(String propertyName) {
+        // Split the propertyName into table name and column name
+        String[] parts = propertyName.split("\\.");
+        String tableName = parts[0];
+        String columnName = parts[1];
+
+        // Create and return an OrderByField instance
+        return OrderByField.from(
+            // Create a column with the given name and alias it with the table name and column name
+            Column.aliased(
+                columnName,
+                // Create a table alias with the same name as the table
+                Table.aliased(camelCaseToSnakeCase(tableName), tableName),
+                // Use a composite alias of "tableName_columnName"
+                String.format("%s_%s", tableName, columnName)
+            )
+        );
+    }
+
+    /**
+     * Converts a camel case string to snake case.
+     *
+     * @param input The camel case string to be converted to snake case.
+     * @return The input string converted to snake case.
+     */
+    public static String camelCaseToSnakeCase(String input) {
+        // Regular Expression
+        String regex = "([a-z])([A-Z]+)";
+
+        // Replacement string
+        String replacement = "$1_$2";
+
+        // Replace the given regex
+        // with replacement string
+        // and convert it to lower case.
+        return input.replaceAll(regex, replacement).toLowerCase();
+    }
 }