generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs

@@ -31,6 +31,10 @@ if (isUsingMapsId) {
   mapsIdEntityInstance =  mapsIdEntity.charAt(0).toLowerCase() + mapsIdEntity.slice(1);
   mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`;
 }
+const hasUserRepository =
+  (requiresDeleteAllUsers && hasRelationshipWithBuiltInUser) ||
+  filterTestableRelationships.some(rel => rel.otherEntity.builtInUser) ||
+  (isUsingMapsId && (!dtoMapstruct && serviceNo) && mapsIdEntity === 'User');
 
 let callBlock = '';
 let callListBlock = '';
@@ -85,8 +89,8 @@ if(jpaMetamodelFiltering && reactive) {
 import <%= entityAbsolutePackage %>.repository.<%= relationship.otherEntityNameCapitalized %>Repository;
 <%_ });
  } _%>
-<%_ if (saveUserSnapshot) { _%>
-import <%= entityAbsolutePackage %>.repository.UserRepository;
+<%_ if (hasUserRepository) { _%>
+import <%= user.entityAbsolutePackage %>.repository.UserRepository;
 <%_ } _%>
 import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (databaseTypeSql && reactive) { _%>
@@ -114,9 +118,7 @@ import org.assertj.core.util.IterableUtil;
 import org.springframework.data.util.Streamable;
 import java.util.concurrent.TimeUnit;
 <%_ } _%>
-<%_ if ((databaseTypeSql && reactive) || searchEngineElasticsearch) { _%>
 import org.junit.jupiter.api.AfterEach;
-<%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
 <%_ if (skipJunitTests) { _%>
 import org.junit.jupiter.api.Disabled;
@@ -459,11 +461,11 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 
     @Autowired
     private <%= entityClass %>Repository <%= entityInstance %>Repository;
-<%_ if (isUsingMapsId && (!dtoMapstruct && serviceNo)) { _%>
+<%_ if (isUsingMapsId && (!dtoMapstruct && serviceNo) && mapsIdEntity !== 'User') { _%>
     @Autowired
     private <%= mapsIdEntity %>Repository <%= mapsIdRepoInstance %>;
 <%_ } _%>
-<%_ if (saveUserSnapshot) { _%>
+<%_ if (hasUserRepository) { _%>
 
     @Autowired
     private UserRepository userRepository;
@@ -503,8 +505,10 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 
     private <%= persistClass %> <%= persistInstance %>;
 
+    private <%= persistClass %> inserted<%= persistClass %>;
+
 <%_ if(jpaMetamodelFiltering && reactive) {
-filterTestableRelationships.forEach((relationship) => { _%>
+filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach((relationship) => { _%>
     @Autowired
     private <%= relationship.otherEntity.persistClass %>Repository <%= relationship.otherEntity.persistInstance %>Repository;
 <%_ });
@@ -620,19 +624,6 @@ _%>
   }); _%>
     }
 
-    @AfterEach
-    public void cleanup() {
-        deleteEntities(em);
-    }
-
-<%_ } _%>
-<%_ if (searchEngineElasticsearch) { _%>
-    @AfterEach
-    public void cleanupElasticSearchRepository() {
-        <%= entityInstance %>SearchRepository.deleteAll()<%= callBlock %>;
-        assertThat(<%= entityInstance %>SearchRepository.count()<%= callBlock %>).isEqualTo(0);
-    }
-
 <%_ } _%>
 <%_ if (reactive && authenticationUsesCsrf) { _%>
     @BeforeEach
@@ -643,12 +634,27 @@ _%>
 <%_ } _%>
     @BeforeEach
     public void initTest() {
-<%_ if (databaseTypeMongodb || databaseTypeCouchbase || databaseTypeCassandra || databaseTypeNeo4j) { _%>
-        <%= entityInstance %>Repository.deleteAll()<%= callBlock %>;
-<%_ } else if (databaseTypeSql && reactive) {  _%>
+        <%= persistInstance %> = createEntity(<% if (databaseTypeSql) { %>em<% } %>);
+    }
+
+    @AfterEach
+    public void cleanup() {
+        if (inserted<%= persistClass %> != null) {
+            <%= entityInstance %>Repository.delete(inserted<%= persistClass %>)<%= reactorBlock %>;
+<%_ if (searchEngineElasticsearch) { _%>
+            <%= entityInstance %>SearchRepository.delete(inserted<%= persistClass %>)<%= reactorBlock %>;
+<%_ } _%>
+            inserted<%= persistClass %> = null;
+        }
+<%_ if (databaseTypeSql && reactive) {  _%>
         deleteEntities(em);
 <%_ } _%>
-        <%= persistInstance %> = createEntity(<% if (databaseTypeSql) { %>em<% } %>);
+<%_ if (requiresDeleteAllUsers && hasUserRepository) { _%>
+  <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+  <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+<%_ } _%>
     }
 <%_ if (!readOnly) { _%>
 
@@ -718,13 +724,15 @@ _%>
 
         assert<%- persistClass %>MapsIdRelationshipPersistedValue(<%= persistInstance %>, returned<%- persistClass %>);
   <%_ } _%>
+
+        inserted<%= persistClass %> = returned<%- persistClass %>;
     }
 
     @Test<%= transactionalAnnotation %>
     void create<%= entityClass %>WithExistingId() throws Exception {
         // Create the <%= entityClass %> with an existing ID
   <%_ if ((primaryKey.typeUUID && databaseTypeSql) || !primaryKey.autoGenerate) { _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
   <%_ } else { _%>
         <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(<% if (primaryKey.typeUUID) { %>UUID.randomUUID()<% } else if (primaryKey.typeLong) { %>1L<% } else if (primaryKey.typeInteger) { %>1<% } else { %>"existing_id"<% } %>);
   <%_ } _%>
@@ -772,7 +780,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void update<%= entityClass %>MapsIdAssociationWithNewId() throws Exception {
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
     <%_ const alreadyGeneratedEntities = []; _%>
         long databaseSizeBeforeCreate = getRepositoryCount();
     <%_ if (searchEngineElasticsearch) { _%>
@@ -828,14 +836,14 @@ _%>
     <%_ if (databaseTypeCouchbase) { _%>
         SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
     <%_ } _%>
-        List<<%= persistClass %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
         assertSameRepositoryCount(databaseSizeBeforeCreate);
-        <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(<%= entityInstance %>List.size() - 1);
 
-        // Validate the id for MapsId, the ids must be same
-        // Uncomment the following line for assertion. However, please note that there is a known issue and uncommenting will fail the test.
-        // Please look at https://github.com/jhipster/generator-jhipster/issues/9100. You can modify this test as necessary.
-        // assertThat(test<%= entityClass %>.get<%= primaryKey.nameCapitalized %>()).isEqualTo(test<%= entityClass %>.get<%= mapsIdEntity %>().get<%= primaryKey.nameCapitalized %>());
+        /**
+         * Validate the id for MapsId, the ids must be same
+         * Uncomment the following line for assertion. However, please note that there is a known issue and uncommenting will fail the test.
+         * Please look at https://github.com/jhipster/generator-jhipster/issues/9100. You can modify this test as necessary.
+         * assertThat(test<%= entityClass %>.get<%= primaryKey.nameCapitalized %>()).isEqualTo(test<%= entityClass %>.get<%= mapsIdEntity %>().get<%= primaryKey.nameCapitalized %>());
+         */
     <%_ if (searchEngineElasticsearch) { _%>
         int searchDatabaseSizeAfter = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
         assertThat(searchDatabaseSizeAfter).isEqualTo(searchDatabaseSizeBefore);
@@ -886,7 +894,6 @@ _%>
         int searchDatabaseSizeAfter = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
         assertThat(searchDatabaseSizeAfter).isEqualTo(searchDatabaseSizeBefore);
         <%_ } _%>
-
     }
       <%_ } _%>
     <%_ } _%>
@@ -940,7 +947,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
   <%_ } _%>
 <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List
 <%_ if (reactive) { _%>
@@ -1027,7 +1034,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
   <%_ } _%>
 <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get the <%= entityInstance %>
 <%_ if (reactive) { _%>
@@ -1066,7 +1073,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void get<%= entityClassPlural %>ByIdFiltering() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         <%= primaryKey.type %> id = <%= persistInstance %>.get<%= primaryKey.nameCapitalized %>();
 
@@ -1085,7 +1092,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsEqualToSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> equals to
         default<%= entityClass %>Filtering(
@@ -1097,7 +1104,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsInShouldWork() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> in
         default<%= entityClass %>Filtering(
@@ -1109,7 +1116,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsNullOrNotNull() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is not null
         default<%= entityClass %>Filtering(
@@ -1122,7 +1129,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>ContainsSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> contains
         default<%= entityClass %>Filtering(
@@ -1134,7 +1141,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>NotContainsSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> does not contain
         default<%= entityClass %>Filtering(
@@ -1164,7 +1171,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsGreaterThanOrEqualToSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is greater than or equal to
         default<%= entityClass %>Filtering(
@@ -1176,7 +1183,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsLessThanOrEqualToSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is less than or equal to
         default<%= entityClass %>Filtering(
@@ -1188,7 +1195,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsLessThanSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is less than
         default<%= entityClass %>Filtering(
@@ -1200,7 +1207,7 @@ _%>
     @Test<%= transactionalAnnotation %>
     void getAll<%= entityClassPlural %>By<%= searchBy.fieldInJavaBeanMethod %>IsGreaterThanSomething() <% if (!reactive) { %>throws Exception <% } %>{
         // Initialize the database
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         // Get all the <%= entityInstance %>List where <%= searchBy.fieldName %> is greater than
         default<%= entityClass %>Filtering(
@@ -1246,7 +1253,7 @@ _%>
       <%_ } else { _%>
         <%= relationship.otherEntity.primaryKey.type %> <%= relationship.relationshipFieldName %>Id = <%= relationship.relationshipFieldName %>.get<%= relationship.otherEntity.primaryKey.nameCapitalized %>();
         <%= persistInstance %>.set<%= relationship.relationshipNameCapitalized %>Id(<%= relationship.relationshipFieldName %>Id);
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
       <%_ } _%>
     <%_ } _%>
     <%_ if(!reactive) { _%>
@@ -1420,7 +1427,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
         long databaseSizeBeforeUpdate = getRepositoryCount();
   <%_ if (searchEngineElasticsearch) { _%>
@@ -1620,7 +1627,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
   <%_ const fieldsToIncludeInPartialPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => faker.datatype.boolean())); _%>
 <%- include('/_global_partials_entity_/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInPartialPatchTest, saveMethod, callBlock, callListBlock}); -%>
@@ -1640,7 +1647,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
   <% const fieldsToIncludeInFullPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => true)); %>
 <%- include('/_global_partials_entity_/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInFullPatchTest, saveMethod, callBlock, callListBlock}); -%>
@@ -1777,7 +1784,7 @@ _%>
         <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
   <%_ if (searchEngineElasticsearch) { _%>
         <%= entityInstance %>Repository.save(<%= persistInstance %>)<%= callBlock %>;
         <%= entityInstance %>SearchRepository.save(<%= persistInstance %>)<%= callBlock %>;
@@ -1826,7 +1833,7 @@ _%>
         <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        <%= persistInstance %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
   <%_ if (searchEngineElasticsearch) { _%>
         <%= entityInstance %>SearchRepository.save(<%= persistInstance %>)<%= callBlock %>;
   <%_ } else if (searchEngineCouchbase) { _%>

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

@@ -124,11 +124,11 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies)
                     },
                     {
                         groupId: 'org.infinispan',
-                        artifactId: 'infinispan-commons-jakarta',
+                        artifactId: 'infinispan-commons',
                     },
                     {
                         groupId: 'org.infinispan',
-                        artifactId: 'infinispan-core-jakarta',
+                        artifactId: 'infinispan-core',
                     },
                     {
                         groupId: 'org.infinispan',

package/dist/generators/spring-cache/resources/gradle/libs.versions.toml

@@ -12,4 +12,4 @@ xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemca
 
 xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' }
 
-redisson = { module = 'org.redisson:redisson', version = '3.29.0' }
+redisson = { module = 'org.redisson:redisson', version = '3.32.0' }

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

@@ -250,7 +250,7 @@ public class CacheConfiguration {
 <%_ } _%>
 <%_ if (cacheProviderHazelcast) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
 
     private final Environment env;
   <%_ if (serviceDiscoveryAny) { _%>
@@ -389,7 +389,7 @@ public class CacheConfiguration {
 <%_ } _%>
 <%_ if (cacheProviderInfinispan) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
 
   <%_ if (serviceDiscoveryAny) { _%>
 
@@ -648,7 +648,7 @@ public class CacheConfiguration {
 <%_ } _%>
 <%_ if (cacheProviderMemcached) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
 
     @Bean
     public CacheManager memcachedCacheManager(JHipsterProperties jHipsterProperties, List<CacheFactory> caches)

package/dist/generators/spring-cloud/generators/gateway/command.js

@@ -1,5 +1,14 @@
 const command = {
-    configs: {},
+    configs: {
+        routes: {
+            description: 'Manually configured gateway routes',
+            cli: {
+                type: String,
+                hide: true,
+            },
+            scope: 'storage',
+        },
+    },
     import: [],
 };
 export default command;

package/dist/generators/spring-cloud/generators/gateway/generator.js

@@ -78,6 +78,19 @@ export default class GatewayGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
+    get preparing() {
+        return this.asPreparingTaskGroup({
+            prepareGateway({ application }) {
+                application.gatewayRoutes = (application.routes ?? []).map(routeDef => {
+                    const [route, host = route, serverPort = '8080'] = routeDef.split(':');
+                    return { route, serverPort, host };
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
     get writing() {
         return this.asWritingTaskGroup({
             async writing({ application }) {

package/dist/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.js

@@ -0,0 +1,6 @@
+export const jdlRoutesOptions = {
+    name: 'routes',
+    tokenType: 'quotedList',
+    type: 'quotedList',
+    tokenValuePattern: /^"[A-Za-z][A-Za-z0-9_]*(?::[A-Za-z][A-Za-z0-9_]+(?::[0-9]+)?)?"$/,
+};

package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_imperative.java.ejs

@@ -34,7 +34,7 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 @Component
 public class KafkaConsumer implements Consumer<String> {
 
-    private final Logger log = LoggerFactory.getLogger(KafkaConsumer.class);
+    private static final Logger log = LoggerFactory.getLogger(KafkaConsumer.class);
 
     private Map<String, SseEmitter> emitters = new HashMap<>();
 

package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_reactive.java.ejs

@@ -29,7 +29,7 @@ import reactor.core.publisher.Sinks;
 @Component
 public class KafkaConsumer implements Consumer<String> {
 
-    private final Logger log = LoggerFactory.getLogger(KafkaConsumer.class);
+    private static final Logger log = LoggerFactory.getLogger(KafkaConsumer.class);
 
     private Sinks.Many<String> sink = Sinks.many().unicast().onBackpressureBuffer();
 

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

@@ -33,7 +33,7 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
 
     private static final String PRODUCER_BINDING_NAME = "binding-out-0";
 
-    private final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
+    private static final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
     private final KafkaConsumer kafkaConsumer;
     private final StreamBridge streamBridge;
 

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

@@ -34,7 +34,7 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
 
     private static final String PRODUCER_BINDING_NAME = "binding-out-0";
 
-    private final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
+    private static final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
     private final KafkaConsumer kafkaConsumer;
     private final StreamBridge streamBridge;
 

package/dist/generators/spring-data-cassandra/generator.js

@@ -78,14 +78,14 @@ export default class CassandraGenerator extends BaseApplicationGenerator {
                 const { reactive, javaDependencies } = application;
                 const cassandraStarter = reactive ? 'spring-boot-starter-data-cassandra-reactive' : 'spring-boot-starter-data-cassandra';
                 source.addJavaDependencies?.([
-                    { groupId: 'com.datastax.oss', artifactId: 'java-driver-mapper-runtime' },
+                    { groupId: 'org.apache.cassandra', artifactId: 'java-driver-mapper-runtime' },
                     { groupId: 'commons-codec', artifactId: 'commons-codec' },
                     { groupId: 'org.springframework.boot', artifactId: cassandraStarter },
                     { groupId: 'org.lz4', artifactId: 'lz4-java', version: javaDependencies['lz4-java'] },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'cassandra' },
-                    { scope: 'annotationProcessor', groupId: 'com.datastax.oss', artifactId: 'java-driver-mapper-processor' },
+                    { scope: 'annotationProcessor', groupId: 'org.apache.cassandra', artifactId: 'java-driver-mapper-processor' },
                 ]);
             },
         });

package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs

@@ -82,7 +82,7 @@ public class DatabaseConfiguration extends AbstractCouchbaseConfiguration {
     private static final String CHANGELOG_COLLECTION = "changelog";
     private static final String TYPE_KEY = "type";
 
-    private final Logger log = LoggerFactory.getLogger(DatabaseConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(DatabaseConfiguration.class);
 
     private final JHipsterProperties jHipsterProperties;
     private final CouchbaseProperties couchbaseProperties;

package/dist/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs

@@ -24,10 +24,18 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.data.elasticsearch.repository.config.Enable<% if (reactive) { %>Reactive<% } %>ElasticsearchRepositories;
-import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<% } %>Neo4jRepository;
 <%_ } _%>
 
 import org.springframework.data.neo4j.repository.config.Enable<% if (reactive) { %>Reactive<% } %>Neo4jRepositories;
+<%_ if (reactive) { _%>
+
+import org.neo4j.driver.Driver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.neo4j.core.<% if (reactive) { %>Reactive<% } %>DatabaseSelectionProvider;
+import org.springframework.data.neo4j.core.transaction.<% if (reactive) { %>Reactive<% } %>Neo4jTransactionManager;
+import org.springframework.data.neo4j.repository.config.<% if (reactive) { %>Reactive<% } %>Neo4jRepositoryConfigurationExtension;
+import org.springframework.transaction.<% if (reactive) { %>Reactive<% } %>TransactionManager;
+<%_ } _%>
 
 @Configuration
 <%_ if (searchEngineElasticsearch) { _%>
@@ -38,4 +46,12 @@ import org.springframework.data.neo4j.repository.config.Enable<% if (reactive) {
 <%_ if (searchEngineElasticsearch) { _%>
 @Enable<% if (reactive) { %>Reactive<% } %>ElasticsearchRepositories("<%= packageName %>.repository.search")
 <%_ } _%>
-public class DatabaseConfiguration {}
+public class DatabaseConfiguration {
+<%_ if (reactive) { _%>
+
+     @Bean(<% if (reactive) { %>Reactive<% } %>Neo4jRepositoryConfigurationExtension.DEFAULT_TRANSACTION_MANAGER_BEAN_NAME)
+     public <% if (reactive) { %>Reactive<% } %>TransactionManager transactionManager(Driver driver, <% if (reactive) { %>Reactive<% } %>DatabaseSelectionProvider databaseNameProvider) {
+         return new <% if (reactive) { %>Reactive<% } %>Neo4jTransactionManager(driver, databaseNameProvider);
+     }
+<%_ } _%>
+}

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs

@@ -97,7 +97,7 @@ import java.util.UUID;
 public class DatabaseConfiguration {
 
 <%_ if (devDatabaseTypeH2Any) { _%>
-    private final Logger log = LoggerFactory.getLogger(DatabaseConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(DatabaseConfiguration.class);
 
     private final Environment env;
 

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs

@@ -67,7 +67,9 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC
                             Class<? extends SqlTestContainer> containerClass = (Class<? extends SqlTestContainer>) Class.forName(this.getClass().getPackageName() + ".<% if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypePostgresql) { %>PostgreSql<% } %>TestContainer");
                             prodTestContainer = beanFactory.createBean(containerClass);
                             beanFactory.registerSingleton(containerClass.getName(), prodTestContainer);
-                            // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer);
+                            /**
+                             * ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer);
+                             */
                         } catch (ClassNotFoundException e) {
                             throw new RuntimeException(e);
                         }

package/dist/generators/vue/entity-files-vue.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationTemplatesBlock, filterEntitiesAndPropertiesForClient, filterEntitiesForClient } from '../client/support/index.js';
+import { clientApplicationTemplatesBlock } from '../client/support/index.js';
 export const entityFiles = {
     client: [
         clientApplicationTemplatesBlock({
@@ -48,16 +48,16 @@ export const entityFiles = {
         },
     ],
 };
-export async function writeEntityFiles({ application, entities }) {
-    for (const entity of filterEntitiesAndPropertiesForClient(entities).filter(entity => !entity.skipClient && !entity.builtInUser)) {
+export async function writeEntityFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesAndPropertiesForClient ?? (entities => entities))(entities).filter(entity => !entity.skipClient && !entity.builtInUser)) {
         await this.writeFiles({
             sections: entityFiles,
             context: { ...application, ...entity },
         });
     }
 }
-export async function postWriteEntityFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtInUser)) {
+export async function postWriteEntityFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtInUser)) {
         if (!entity.embedded) {
             const { enableTranslation } = application;
             const { entityInstance, entityClass, entityAngularName, entityFolderName, entityFileName, entityUrl, microserviceName, readOnly, entityClassPlural, i18nKeyPrefix, pageTitle = enableTranslation ? `${i18nKeyPrefix}.home.title` : entityClassPlural, } = entity;
@@ -66,8 +66,8 @@ export async function postWriteEntityFiles({ application, entities }) {
         }
     }
 }
-export function cleanupEntitiesFiles({ application, entities }) {
-    for (const entity of filterEntitiesForClient(entities).filter(entity => !entity.builtInUser)) {
+export function cleanupEntitiesFiles({ control, application, entities }) {
+    for (const entity of (control.filterEntitiesForClient ?? (entities => entities))(entities).filter(entity => !entity.builtInUser)) {
         const { entityFolderName, entityFileName } = entity;
         if (this.isJhipsterVersionLessThan('8.0.0-beta.3')) {
             this.removeFile(`${application.clientTestDir}/spec/app/entities/${entityFolderName}/${entityFileName}.component.spec.ts`);