generator-jhipster 8.2.1 → 8.4.0

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

@@ -111,7 +111,7 @@ import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
 import com.fasterxml.jackson.databind.ObjectMapper;
 <%_ if (searchEngineElasticsearch) { _%>
 import org.assertj.core.util.IterableUtil;
-import org.apache.commons.collections4.IterableUtils;
+import org.springframework.data.util.Streamable;
 import java.util.concurrent.TimeUnit;
 <%_ } _%>
 <%_ if ((databaseTypeSql && reactive) || searchEngineElasticsearch) { _%>
@@ -1474,7 +1474,7 @@ _%>
         await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
             int searchDatabaseSizeAfter = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
             assertThat(searchDatabaseSizeAfter).isEqualTo(searchDatabaseSizeBefore);
-            List<<%= persistClass %>> <%= entityInstance %>SearchList = IterableUtils.toList(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
+            List<<%= persistClass %>> <%= entityInstance %>SearchList = Streamable.of(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>).toList();
             <%= persistClass %> test<%= entityClass %>Search = <%= entityInstance %>SearchList.get(searchDatabaseSizeAfter - 1);
 
     <%_ if (reactive && databaseTypeSql) { _%>

package/dist/generators/spring-cache/generator.js

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_CACHE, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 import { createNeedleCallback } from '../base/support/needles.js';
@@ -25,14 +24,17 @@ import { getCacheProviderMavenDefinition } from './internal/dependencies.js';
 export default class SpringCacheGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_CACHE);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get preparing() {
         return this.asPreparingTaskGroup({
+            loadDependabot({ application }) {
+                this.loadJavaDependenciesFromGradleCatalog(application.javaDependencies, true);
+            },
             addNeedles({ source, application }) {
                 if (application.cacheProviderEhcache ||
                     application.cacheProviderCaffeine ||
@@ -120,17 +122,20 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
                 const { javaDependencies } = application;
                 const { cacheProvider, enableHibernateCache } = application;
                 const dependencies = [{ groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-cache' }];
+                const versions = [];
                 const definition = getCacheProviderMavenDefinition(cacheProvider, javaDependencies);
+                versions.push(...(definition.base.versions ?? []));
                 dependencies.push(...definition.base.dependencies);
                 if (enableHibernateCache && definition.hibernateCache) {
+                    versions.push(...(definition.hibernateCache.versions ?? []));
                     dependencies.push(...definition.hibernateCache.dependencies);
                 }
-                source.addJavaDependencies?.(dependencies, { gradleFile: 'buildSrc/src/main/groovy/jhipster.spring-cache-conventions.gradle' });
+                source.addJavaDefinition?.({ dependencies, versions }, { gradleFile: 'buildSrc/src/main/groovy/jhipster.spring-cache-conventions.gradle' });
             },
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
     get postWritingEntities() {
         return this.asPostWritingEntitiesTaskGroup({
@@ -147,6 +152,6 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING_ENTITIES]() {
-        return this.asPostWritingEntitiesTaskGroup(this.delegateTasksToBlueprint(() => this.postWritingEntities));
+        return this.delegateTasksToBlueprint(() => this.postWritingEntities);
     }
 }

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

@@ -43,6 +43,7 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies)
                     {
                         groupId: 'org.redisson',
                         artifactId: 'redisson',
+                        version: javaDependencies.redisson,
                     },
                 ],
             },
@@ -139,19 +140,23 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies)
         },
         memcached: {
             base: {
+                versions: [{ name: 'xmemcached-provider', version: javaDependencies['xmemcached-provider'] }],
                 dependencies: [
                     javaxCacheApi,
                     {
                         groupId: 'com.google.code.simple-spring-memcached',
                         artifactId: 'spring-cache',
+                        versionRef: 'xmemcached-provider',
                     },
                     {
                         groupId: 'com.google.code.simple-spring-memcached',
                         artifactId: 'xmemcached-provider',
+                        versionRef: 'xmemcached-provider',
                     },
                     {
                         groupId: 'com.googlecode.xmemcached',
                         artifactId: 'xmemcached',
+                        version: javaDependencies.xmemcached,
                     },
                 ],
             },

package/dist/generators/spring-cache/resources/build.gradle

@@ -0,0 +1 @@
+// required by dependabot

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

@@ -0,0 +1,15 @@
+[libraries]
+# caffeine
+typesafe = { module = 'com.typesafe:config', version = '1.4.3' }
+
+# hazelcast
+hazelcast-hibernate53 = { module = 'com.hazelcast:hazelcast-hibernate53', version = '5.1.0' }
+
+hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.4.0' }
+
+# memcached
+xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemcached-provider', version = '4.1.3' }
+
+xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' }
+
+redisson = { module = 'org.redisson:redisson', version = '3.29.0' }

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

@@ -736,6 +736,10 @@ public class CacheConfiguration {
         URI redisUri = URI.create(jHipsterProperties.getCache().getRedis().getServer()[0]);
 
         Config config = new Config();
+  <%_ if (databaseTypeSql) { _%>
+        // Fix Hibernate lazy initialization https://github.com/jhipster/generator-jhipster/issues/22889
+        config.setCodec(new org.redisson.codec.SerializationCodec());
+  <%_ } _%>
         if (jHipsterProperties.getCache().getRedis().isCluster()) {
             ClusterServersConfig clusterServersConfig = config
                 .useClusterServers()

package/dist/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainersSpringContextCustomizerFactory.java.ejs

@@ -26,9 +26,11 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextConfigurationAttributes;
 import org.springframework.test.context.ContextCustomizer;
 import org.springframework.test.context.ContextCustomizerFactory;
+import org.springframework.test.context.MergedContextConfiguration;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.test.util.TestPropertyValues;
 
@@ -41,21 +43,35 @@ public class RedisTestContainersSpringContextCustomizerFactory implements Contex
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
 
-        return (context, mergedConfig) -> {
-            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-            TestPropertyValues testValues = TestPropertyValues.empty();
-            EmbeddedRedis redisAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedRedis.class);
-            if (null != redisAnnotation) {
-                log.debug("detected the EmbeddedRedis annotation on class {}", testClass.getName());
-                log.info("Warming up the redis database");
-                if (null == redisBean) {
-                    redisBean = beanFactory.createBean(RedisTestContainer.class);
-                    beanFactory.registerSingleton(RedisTestContainer.class.getName(), redisBean);
-                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(RedisTestContainer.class.getName(), redisBean);
+        return new ContextCustomizer() {
+            @Override
+            public void customizeContext(ConfigurableApplicationContext context,
+                    MergedContextConfiguration mergedConfig) {
+                ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+                TestPropertyValues testValues = TestPropertyValues.empty();
+                EmbeddedRedis redisAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedRedis.class);
+                if (null != redisAnnotation) {
+                    log.debug("detected the EmbeddedRedis annotation on class {}", testClass.getName());
+                    log.info("Warming up the redis database");
+                    if (null == redisBean) {
+                        redisBean = beanFactory.createBean(RedisTestContainer.class);
+                        beanFactory.registerSingleton(RedisTestContainer.class.getName(), redisBean);
+                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(RedisTestContainer.class.getName(), redisBean);
+                    }
+                    testValues = testValues.and("jhipster.cache.redis.server=redis://" + redisBean.getRedisContainer().getContainerIpAddress() + ":" + redisBean.getRedisContainer().getMappedPort(6379));
                 }
-                testValues = testValues.and("jhipster.cache.redis.server=redis://" + redisBean.getRedisContainer().getContainerIpAddress() + ":" + redisBean.getRedisContainer().getMappedPort(6379));
+                testValues.applyTo(context);
+            }
+
+            @Override
+            public int hashCode() {
+                return RedisTestContainer.class.getName().hashCode();
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                return this.hashCode() == obj.hashCode();
             }
-            testValues.applyTo(context);
         };
     }
 }

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

@@ -0,0 +1,5 @@
+const command = {
+    configs: {},
+    import: [],
+};
+export default command;

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

@@ -0,0 +1,146 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import BaseApplicationGenerator from '../../../base-application/index.js';
+import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from '../../../java/support/files.js';
+const WAIT_TIMEOUT = 3 * 60000;
+export default class GatewayGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+            await this.dependsOnJHipster('jhipster:java:build-tool');
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get prompting() {
+        return this.asPromptingTaskGroup({
+            async promptCommand({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PROMPTING]() {
+        return this.delegateTasksToBlueprint(() => this.prompting);
+    }
+    get configuring() {
+        return this.asConfiguringTaskGroup({
+            reactiveByDefault() {
+                this.jhipsterConfig.reactive = this.jhipsterConfig.reactive ?? true;
+                if (this.jhipsterConfig.reactive === false) {
+                    const message = 'Spring Cloud Gateway MVC support is experimental and not officially supported.';
+                    if (!this.experimental) {
+                        throw new Error(`${message} To use it, run the generator with the --experimental flag.`);
+                    }
+                    this.log.warn(message);
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.CONFIGURING]() {
+        return this.delegateTasksToBlueprint(() => this.configuring);
+    }
+    get loading() {
+        return this.asLoadingTaskGroup({
+            async loadConfig({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [
+                        javaMainPackageTemplatesBlock({
+                            condition: ctx => ctx.reactive && ctx.authenticationTypeJwt,
+                            templates: ['security/jwt/JWTRelayGatewayFilterFactory.java'],
+                        }),
+                        javaMainPackageTemplatesBlock({
+                            condition: ctx => ctx.reactive && ctx.serviceDiscoveryAny,
+                            templates: ['web/rest/vm/RouteVM.java', 'web/rest/GatewayResource.java', 'web/filter/ModifyServersOpenApiFilter.java'],
+                        }),
+                        javaTestPackageTemplatesBlock({
+                            condition: ctx => ctx.reactive && ctx.serviceDiscoveryAny,
+                            templates: ['web/filter/ModifyServersOpenApiFilterTest.java'],
+                        }),
+                    ],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            addDependencies({ application, source }) {
+                const { reactive } = application;
+                source.addJavaDependencies([
+                    { groupId: 'org.springframework.cloud', artifactId: `spring-cloud-starter-gateway${reactive ? '' : '-mvc'}` },
+                ]);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
+    get postWritingEntities() {
+        return this.asPostWritingEntitiesTaskGroup({
+            packageJsonE2eScripts({ application, entities }) {
+                if (application.applicationTypeGateway) {
+                    const { serverPort, lowercaseBaseName } = application;
+                    const microservices = [...new Set(entities.map(entity => entity.microserviceName))].filter(Boolean).map(ms => ms.toLowerCase());
+                    const scriptsStorage = this.packageJson.createStorage('scripts');
+                    const waitServices = microservices
+                        .concat(lowercaseBaseName)
+                        .map(ms => `npm run ci:server:await:${ms}`)
+                        .join(' && ');
+                    scriptsStorage.set({
+                        [`ci:server:await:${lowercaseBaseName}`]: `wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:$npm_package_config_backend_port/management/health`,
+                        ...Object.fromEntries(microservices.map(ms => [
+                            `ci:server:await:${ms}`,
+                            `wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:${serverPort}/services/${ms}/management/health/readiness`,
+                        ])),
+                        'ci:server:await': `echo "Waiting for services to start" && ${waitServices} && echo "Services started"`,
+                    });
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING_ENTITIES]() {
+        return this.delegateTasksToBlueprint(() => this.postWritingEntities);
+    }
+}

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

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';

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

@@ -17,14 +17,13 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.js';
 export default class KafkaGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_CLOUD_STREAM);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+            await this.dependsOnBootstrapApplicationServer();
         }
     }
     get composing() {

package/dist/generators/spring-cloud-stream/generators/kafka/generator.js

@@ -25,7 +25,7 @@ export default class KafkaGenerator extends BaseApplicationGenerator {
             await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnBootstrapAplicationServer();
+            await this.dependsOnBootstrapApplicationServer();
         }
     }
     get writing() {
@@ -96,6 +96,6 @@ export default class KafkaGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs

@@ -23,10 +23,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.test.context.ContextConfigurationAttributes;
 import org.springframework.test.context.ContextCustomizer;
 import org.springframework.test.context.ContextCustomizerFactory;
+import org.springframework.test.context.MergedContextConfiguration;
 import org.testcontainers.containers.KafkaContainer;
 
 public class KafkaTestContainersSpringContextCustomizerFactory implements ContextCustomizerFactory {
@@ -38,20 +40,34 @@ public class KafkaTestContainersSpringContextCustomizerFactory implements Contex
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
 
-        return (context, mergedConfig) -> {
-            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-            TestPropertyValues testValues = TestPropertyValues.empty();
-            EmbeddedKafka kafkaAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedKafka.class);
-            if (null != kafkaAnnotation) {
-                log.debug("detected the EmbeddedKafka annotation on class {}", testClass.getName());
-                log.info("Warming up the kafka broker");
-                if (null == kafkaBean) {
-                    kafkaBean = beanFactory.createBean(KafkaTestContainer.class);
-                    beanFactory.registerSingleton(KafkaTestContainer.class.getName(), kafkaBean);
+        return new ContextCustomizer() {
+            @Override
+            public void customizeContext(ConfigurableApplicationContext context,
+                    MergedContextConfiguration mergedConfig) {
+                ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+                TestPropertyValues testValues = TestPropertyValues.empty();
+                EmbeddedKafka kafkaAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedKafka.class);
+                if (null != kafkaAnnotation) {
+                    log.debug("detected the EmbeddedKafka annotation on class {}", testClass.getName());
+                    log.info("Warming up the kafka broker");
+                    if (null == kafkaBean) {
+                        kafkaBean = beanFactory.createBean(KafkaTestContainer.class);
+                        beanFactory.registerSingleton(KafkaTestContainer.class.getName(), kafkaBean);
+                    }
+                    testValues = testValues.and("spring.cloud.stream.kafka.binder.brokers=" + kafkaBean.getKafkaContainer().getHost() + ':' + kafkaBean.getKafkaContainer().getMappedPort(KafkaContainer.KAFKA_PORT));
                 }
-                testValues = testValues.and("spring.cloud.stream.kafka.binder.brokers=" + kafkaBean.getKafkaContainer().getHost() + ':' + kafkaBean.getKafkaContainer().getMappedPort(KafkaContainer.KAFKA_PORT));
+                testValues.applyTo(context);
+            }
+
+            @Override
+            public int hashCode() {
+                return KafkaTestContainer.class.getName().hashCode();
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                return this.hashCode() == obj.hashCode();
             }
-            testValues.applyTo(context);
         };
     }
 }

package/dist/generators/spring-cloud-stream/generators/pulsar/generator.js

@@ -24,7 +24,7 @@ export default class PulsarGenerator extends BaseApplicationGenerator {
             await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnBootstrapAplicationServer();
+            await this.dependsOnBootstrapApplicationServer();
         }
     }
     get writing() {
@@ -73,6 +73,6 @@ export default class PulsarGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

package/dist/generators/spring-cloud-stream/generators/pulsar/templates/src/test/java/_package_/config/PulsarTestContainersSpringContextCustomizerFactory.java.ejs

@@ -24,11 +24,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 
 import org.springframework.test.context.ContextConfigurationAttributes;
 import org.springframework.test.context.ContextCustomizer;
 import org.springframework.test.context.ContextCustomizerFactory;
+import org.springframework.test.context.MergedContextConfiguration;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.test.util.TestPropertyValues;
 
@@ -41,25 +43,39 @@ public class PulsarTestContainersSpringContextCustomizerFactory implements Conte
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
 
-        return (context, mergedConfig) -> {
-            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-            TestPropertyValues testValues = TestPropertyValues.empty();
-            EmbeddedPulsar pulsarAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedPulsar.class);
-            if (null != pulsarAnnotation) {
-                log.debug("detected the EmbeddedPulsar annotation on class {}", testClass.getName());
-                log.info("Warming up the pulsar database");
-                if (null == pulsarBean) {
-                    pulsarBean = beanFactory.createBean(PulsarTestContainer.class);
-                    beanFactory.registerSingleton(PulsarTestContainer.class.getName(), pulsarBean);
-                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(PulsarTestContainer.class.getName(), pulsarBean);
+        return new ContextCustomizer() {
+            @Override
+            public void customizeContext(ConfigurableApplicationContext context,
+                    MergedContextConfiguration mergedConfig) {
+                ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+                TestPropertyValues testValues = TestPropertyValues.empty();
+                EmbeddedPulsar pulsarAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedPulsar.class);
+                if (null != pulsarAnnotation) {
+                    log.debug("detected the EmbeddedPulsar annotation on class {}", testClass.getName());
+                    log.info("Warming up the pulsar database");
+                    if (null == pulsarBean) {
+                        pulsarBean = beanFactory.createBean(PulsarTestContainer.class);
+                        beanFactory.registerSingleton(PulsarTestContainer.class.getName(), pulsarBean);
+                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(PulsarTestContainer.class.getName(), pulsarBean);
+                    }
+                    testValues = 
+                        testValues.and(
+                            "spring.pulsar.client.service-url=" + pulsarBean.getPulsarContainer().getPulsarBrokerUrl(),
+                            "spring.pulsar.administration.service-url=" + pulsarBean.getPulsarContainer().getHttpServiceUrl()
+                        );
                 }
-                testValues = 
-                    testValues.and(
-                        "spring.pulsar.client.service-url=" + pulsarBean.getPulsarContainer().getPulsarBrokerUrl(),
-                        "spring.pulsar.administration.service-url=" + pulsarBean.getPulsarContainer().getHttpServiceUrl()
-                    );
+                testValues.applyTo(context);
+            }
+
+            @Override
+            public int hashCode() {
+                return PulsarTestContainer.class.getName().hashCode();
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                return this.hashCode() == obj.hashCode();
             }
-            testValues.applyTo(context);
         };
     }
 }

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

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeCassandraFilesTask from './files.js';
 import cleanupCassandraFilesTask from './cleanup.js';
 import writeCassandraEntityFilesTask, { cleanupCassandraEntityFilesTask } from './entity-files.js';
@@ -26,10 +25,10 @@ const { NO: NO_PAGINATION } = PaginationTypes;
 export default class CassandraGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_DATA_CASSANDRA);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get configuringEachEntity() {
@@ -76,13 +75,13 @@ export default class CassandraGenerator extends BaseApplicationGenerator {
                 });
             },
             addDependencies({ application, source }) {
-                const { reactive } = application;
+                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: 'commons-codec', artifactId: 'commons-codec' },
                     { groupId: 'org.springframework.boot', artifactId: cassandraStarter },
-                    { groupId: 'org.lz4', artifactId: 'lz4-java' },
+                    { 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' },
@@ -92,6 +91,6 @@ export default class CassandraGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }