generator-jhipster 8.2.1 → 8.4.0

package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs

@@ -26,11 +26,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;
 import org.testcontainers.containers.CassandraContainer;
@@ -43,25 +45,39 @@ public class CassandraTestContainersSpringContextCustomizerFactory implements Co
 
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
-        return (context, mergedConfig) -> {
-            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-            TestPropertyValues testValues = TestPropertyValues.empty();
-            EmbeddedCassandra cassandraAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCassandra.class);
-            if (null != cassandraAnnotation) {
-                log.debug("detected the EmbeddedCassandra annotation on class {}", testClass.getName());
-                log.info("Warming up the cassandra database");
-                if (null == cassandraBean) {
-                    cassandraBean = beanFactory.createBean(CassandraTestContainer.class);
-                    beanFactory.registerSingleton(CassandraTestContainer.class.getName(), cassandraBean);
-                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(CassandraTestContainer.class.getName(), cassandraBean);
+        return new ContextCustomizer() {
+            @Override
+            public void customizeContext(ConfigurableApplicationContext context,
+                    MergedContextConfiguration mergedConfig) {
+                ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+                TestPropertyValues testValues = TestPropertyValues.empty();
+                EmbeddedCassandra cassandraAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCassandra.class);
+                if (null != cassandraAnnotation) {
+                    log.debug("detected the EmbeddedCassandra annotation on class {}", testClass.getName());
+                    log.info("Warming up the cassandra database");
+                    if (null == cassandraBean) {
+                        cassandraBean = beanFactory.createBean(CassandraTestContainer.class);
+                        beanFactory.registerSingleton(CassandraTestContainer.class.getName(), cassandraBean);
+                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(CassandraTestContainer.class.getName(), cassandraBean);
+                    }
+                    testValues = testValues.and("spring.cassandra.port=" +  cassandraBean.getCassandraContainer().getMappedPort(CassandraContainer.CQL_PORT))
+                        .and("spring.cassandra.contact-points=" +  cassandraBean.getCassandraContainer().getHost())
+                        .and("spring.cassandra.keyspace-name=" + DEFAULT_KEYSPACE_NAME)
+                        .and("spring.cassandra.local-datacenter=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getAllHosts().iterator().next().getDatacenter())
+                        .and("spring.cassandra.session-name=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getClusterName());
                 }
-                testValues = testValues.and("spring.cassandra.port=" +  cassandraBean.getCassandraContainer().getMappedPort(CassandraContainer.CQL_PORT))
-                    .and("spring.cassandra.contact-points=" +  cassandraBean.getCassandraContainer().getHost())
-                    .and("spring.cassandra.keyspace-name=" + DEFAULT_KEYSPACE_NAME)
-                    .and("spring.cassandra.local-datacenter=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getAllHosts().iterator().next().getDatacenter())
-                    .and("spring.cassandra.session-name=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getClusterName());
+                testValues.applyTo(context);
+            }
+
+            @Override
+            public int hashCode() {
+                return CassandraTestContainer.class.getName().hashCode();
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                return this.hashCode() == obj.hashCode();
             }
-            testValues.applyTo(context);
         };
     }
 }

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

@@ -17,16 +17,15 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeCouchbaseFilesTask, { cleanupCouchbaseFilesTask } from './files.js';
 import writeCouchbaseEntityFilesTask, { cleanupCouchbaseEntityFilesTask } from './entity-files.js';
 export default class CouchbaseGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_DATA_COUCHBASE);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get writing() {
@@ -70,6 +69,6 @@ export default class CouchbaseGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

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

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeElasticsearchFilesTask from './files.js';
 import cleanupElasticsearchFilesTask from './cleanup.js';
 import writeElasticsearchEntityFilesTask, { cleanupElasticsearchEntityFilesTask } from './entity-files.js';
@@ -25,10 +24,10 @@ import { mutateData } from '../base/support/index.js';
 export default class ElasticsearchGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_DATA_ELASTICSEARCH);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get preparingEachEntity() {
@@ -73,7 +72,6 @@ export default class ElasticsearchGenerator extends BaseApplicationGenerator {
                 source.addJavaDependencies?.([
                     { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-data-elasticsearch' },
                     { scope: 'test', groupId: 'org.awaitility', artifactId: 'awaitility' },
-                    { scope: 'test', groupId: 'org.apache.commons', artifactId: 'commons-collections4' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'elasticsearch' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },
@@ -82,6 +80,6 @@ export default class ElasticsearchGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

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

@@ -17,17 +17,16 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_DATA_MONGODB, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeMongodbFilesTask from './files.js';
 import cleanupMongodbFilesTask from './cleanup.js';
 import writeMongodbEntityFilesTask, { cleanupMongodbEntityFilesTask } from './entity-files.js';
 export default class MongoDBGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_DATA_MONGODB);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get writing() {
@@ -57,8 +56,9 @@ export default class MongoDBGenerator extends BaseApplicationGenerator {
                 });
             },
             addDependencies({ application, source }) {
-                const { reactive } = application;
+                const { reactive, javaDependencies } = application;
                 source.addJavaDependencies?.([
+                    { groupId: 'io.mongock', artifactId: 'mongock-bom', type: 'pom', version: javaDependencies['mongock-bom'], scope: 'import' },
                     { groupId: 'io.mongock', artifactId: 'mongock-springboot-v3' },
                     { groupId: 'org.springframework.boot', artifactId: `spring-boot-starter-data-mongodb${reactive ? '-reactive' : ''}` },
                     { groupId: 'io.mongock', artifactId: reactive ? 'mongodb-reactive-driver' : 'mongodb-springdata-v4-driver' },
@@ -85,6 +85,6 @@ export default class MongoDBGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

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

@@ -17,17 +17,17 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_NEO4J } from '../generator-list.js';
+import { GENERATOR_JAVA, GENERATOR_LIQUIBASE } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.js';
 export default class Neo4jGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_DATA_NEO4J);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
             const javaGenerator = await this.dependsOnJHipster(GENERATOR_JAVA);
             javaGenerator.useJacksonIdentityInfo = true;
         }
@@ -133,12 +133,18 @@ export default class Neo4jGenerator extends BaseApplicationGenerator {
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'neo4j' },
                 ]);
                 if (!application.databaseMigrationLiquibase) {
-                    source.addJavaDependencies?.([{ groupId: 'eu.michael-simons.neo4j', artifactId: 'neo4j-migrations-spring-boot-starter' }]);
+                    source.addJavaDependencies?.([
+                        {
+                            groupId: 'eu.michael-simons.neo4j',
+                            artifactId: 'neo4j-migrations-spring-boot-starter',
+                            version: application.javaDependencies['neo4j-migrations-spring-boot-starter'],
+                        },
+                    ]);
                 }
             },
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

package/dist/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainersSpringContextCustomizerFactory.java.ejs

@@ -23,11 +23,13 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+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.boot.test.util.TestPropertyValues;
 
 public class Neo4jTestContainersSpringContextCustomizerFactory implements ContextCustomizerFactory {
@@ -39,25 +41,39 @@ public class Neo4jTestContainersSpringContextCustomizerFactory implements Contex
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
 
-        return (context, mergedConfig) -> {
-            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-            TestPropertyValues testValues = TestPropertyValues.empty();
-            EmbeddedNeo4j neo4jAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedNeo4j.class);
-            if (null != neo4jAnnotation) {
-                log.debug("detected the EmbeddedNeo4j annotation on class {}", testClass.getName());
-                log.info("Warming up the neo4j database");
-                if (null == neo4jBean) {
-                    neo4jBean = beanFactory.createBean(Neo4jTestContainer.class);
-                    beanFactory.registerSingleton(Neo4jTestContainer.class.getName(), neo4jBean);
+        return new ContextCustomizer() {
+            @Override
+            public void customizeContext(ConfigurableApplicationContext context,
+                    MergedContextConfiguration mergedConfig) {
+                ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+                TestPropertyValues testValues = TestPropertyValues.empty();
+                EmbeddedNeo4j neo4jAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedNeo4j.class);
+                if (null != neo4jAnnotation) {
+                    log.debug("detected the EmbeddedNeo4j annotation on class {}", testClass.getName());
+                    log.info("Warming up the neo4j database");
+                    if (null == neo4jBean) {
+                        neo4jBean = beanFactory.createBean(Neo4jTestContainer.class);
+                        beanFactory.registerSingleton(Neo4jTestContainer.class.getName(), neo4jBean);
+                    }
+
+                    String boltUrl = neo4jBean.getNeo4jContainer().getBoltUrl();
+                    testValues = testValues.and("spring.neo4j.uri=" + boltUrl);
+    <%_ if (databaseMigrationLiquibase) { _%>
+                    testValues = testValues.and("spring.liquibase.url=jdbc:neo4j:" + boltUrl);
+    <%_ } _%>
                 }
+                testValues.applyTo(context);
+            }
+
+            @Override
+            public int hashCode() {
+                return Neo4jTestContainer.class.getName().hashCode();
+            }
 
-                String boltUrl = neo4jBean.getNeo4jContainer().getBoltUrl();
-                testValues = testValues.and("spring.neo4j.uri=" + boltUrl);
-<%_ if (databaseMigrationLiquibase) { _%>
-                testValues = testValues.and("spring.liquibase.url=jdbc:neo4j:" + boltUrl);
-<%_ } _%>
+            @Override
+            public boolean equals(Object obj) {
+                return this.hashCode() == obj.hashCode();
             }
-            testValues.applyTo(context);
         };
     }
 }

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

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_LIQUIBASE, GENERATOR_SERVER } from '../generator-list.js';
+import { GENERATOR_LIQUIBASE } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.js';
@@ -25,21 +25,20 @@ import { isReservedTableName } from '../../jdl/jhipster/reserved-keywords.js';
 import { databaseTypes } from '../../jdl/jhipster/index.js';
 import { getDBCExtraOption, getJdbcUrl, getR2dbcUrl } from './support/index.js';
 import { getDatabaseDriverForDatabase, getDatabaseTypeMavenDefinition, getH2MavenDefinition } from './internal/dependencies.js';
-import command from './command.js';
 const { SQL } = databaseTypes;
 export default class SqlGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_DATA_RELATIONAL);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_SERVER);
+            await this.dependsOnJHipster('jhipster:java:domain');
         }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            loadOptions() {
-                this.parseJHipsterOptions(command.options);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
         });
     }
@@ -183,7 +182,7 @@ export default class SqlGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
     /**
      * @private

package/dist/generators/spring-data-relational/support/h2-reserved-keywords.js

@@ -0,0 +1,22 @@
+/**
+ * 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 const h2ReservedKeywords = ['KEY'];
+export const isReservedH2Keyword = (keyword) => {
+    return h2ReservedKeywords.includes(keyword.toUpperCase());
+};

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

@@ -30,10 +30,12 @@ import org.slf4j.LoggerFactory;
 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;
 
@@ -45,41 +47,54 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC
 
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
-
-        return (context, mergedConfig) -> {
-            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-            TestPropertyValues testValues = TestPropertyValues.empty();
-            EmbeddedSQL sqlAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedSQL.class);
-<%_ if (prodDatabaseType !== devDatabaseType) { _%>
-            boolean usingTestProdProfile = Arrays.asList(context.getEnvironment().getActiveProfiles()).contains("test" + JHipsterConstants.SPRING_PROFILE_PRODUCTION);
-            if (null != sqlAnnotation && usingTestProdProfile) {
-<%_ } else { _%>
-            if (null != sqlAnnotation) {
-<%_ } _%>
-                log.debug("detected the EmbeddedSQL annotation on class {}", testClass.getName());
-                log.info("Warming up the sql database");
-                if (null == prodTestContainer) {
-                    try {
-                        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);
-                    } catch (ClassNotFoundException e) {
-                        throw new RuntimeException(e);
+        return new ContextCustomizer() {
+            @Override
+            public void customizeContext(ConfigurableApplicationContext context,
+                    MergedContextConfiguration mergedConfig) {
+                ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+                TestPropertyValues testValues = TestPropertyValues.empty();
+                EmbeddedSQL sqlAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedSQL.class);
+    <%_ if (prodDatabaseType !== devDatabaseType) { _%>
+                boolean usingTestProdProfile = Arrays.asList(context.getEnvironment().getActiveProfiles()).contains("test" + JHipsterConstants.SPRING_PROFILE_PRODUCTION);
+                if (null != sqlAnnotation && usingTestProdProfile) {
+    <%_ } else { _%>
+                if (null != sqlAnnotation) {
+    <%_ } _%>
+                    log.debug("detected the EmbeddedSQL annotation on class {}", testClass.getName());
+                    log.info("Warming up the sql database");
+                    if (null == prodTestContainer) {
+                        try {
+                            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);
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
                     }
+    <%_ if (reactive) { _%>
+                    testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMariadb) { %>.replace("mariadb", "mysql")<% } else if (prodDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- prodDatabaseExtraOptions %>");
+                    testValues = testValues.and("spring.r2dbc.username=" + prodTestContainer.getTestContainer().getUsername());
+                    testValues = testValues.and("spring.r2dbc.password=" + prodTestContainer.getTestContainer().getPassword());
+                    testValues = testValues.and("spring.liquibase.url=" + prodTestContainer.getTestContainer().getJdbcUrl()  + "<%- prodDatabaseExtraOptions %>");
+    <%_ } else { _%>
+                    testValues = testValues.and("spring.datasource.url=" + prodTestContainer.getTestContainer().getJdbcUrl() + "<%- prodDatabaseExtraOptions %>");
+                    testValues = testValues.and("spring.datasource.username=" + prodTestContainer.getTestContainer().getUsername());
+                    testValues = testValues.and("spring.datasource.password=" + prodTestContainer.getTestContainer().getPassword());
+    <%_ } _%>
                 }
-<%_ if (reactive) { _%>
-                testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMariadb) { %>.replace("mariadb", "mysql")<% } else if (prodDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- prodDatabaseExtraOptions %>");
-                testValues = testValues.and("spring.r2dbc.username=" + prodTestContainer.getTestContainer().getUsername());
-                testValues = testValues.and("spring.r2dbc.password=" + prodTestContainer.getTestContainer().getPassword());
-                testValues = testValues.and("spring.liquibase.url=" + prodTestContainer.getTestContainer().getJdbcUrl()  + "<%- prodDatabaseExtraOptions %>");
-<%_ } else { _%>
-                testValues = testValues.and("spring.datasource.url=" + prodTestContainer.getTestContainer().getJdbcUrl() + "<%- prodDatabaseExtraOptions %>");
-                testValues = testValues.and("spring.datasource.username=" + prodTestContainer.getTestContainer().getUsername());
-                testValues = testValues.and("spring.datasource.password=" + prodTestContainer.getTestContainer().getPassword());
-<%_ } _%>
+                testValues.applyTo(context);
+            }
+
+            @Override
+            public int hashCode() {
+                return SqlTestContainer.class.getName().hashCode();
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                return this.hashCode() == obj.hashCode();
             }
-            testValues.applyTo(context);
         };
     }
 }

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

@@ -17,16 +17,15 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SPRING_WEBSOCKET, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 export default class SpringWebsocketGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_WEBSOCKET);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get writing() {

package/dist/generators/upgrade/generator.js

@@ -24,11 +24,9 @@ import semver from 'semver';
 import { ResetMode } from 'simple-git';
 import BaseGenerator from '../base/index.js';
 import { packageJson } from '../../lib/index.js';
-import statistics from '../statistics.js';
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
 import { GIT_VERSION_NOT_ALLOW_MERGE_UNRELATED_HISTORIES, UPGRADE_BRANCH } from './support/index.js';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.js';
-import command from './command.js';
 /* Constants used throughout */
 const GENERATOR_JHIPSTER = 'generator-jhipster';
 const GENERATOR_APP = 'app';
@@ -63,8 +61,10 @@ export default class UpgradeGenerator extends BaseGenerator {
                 this.log.log(chalk.green('For advanced options, please use the jhipster-migrate blueprint (https://github.com/jhipster/generator-jhipster-migrate/)'));
                 this.log.log('');
             },
-            parseCommand() {
-                this.parseJHipsterOptions(command.options);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
+            initializeOptions() {
                 if (this.silent) {
                     this.spawnStdio = 'ignore';
                 }
@@ -135,9 +135,6 @@ export default class UpgradeGenerator extends BaseGenerator {
     }
     get default() {
         return this.asDefaultTaskGroup({
-            insight() {
-                statistics.sendSubGenEvent('generator', 'upgrade');
-            },
             async prepareUpgradeBranch() {
                 const git = this.createGit();
                 // Checkout upgrade branch

package/dist/generators/vue/generator.js

@@ -18,8 +18,8 @@
  */
 import { relative } from 'path';
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
 import { isFileStateModified } from 'mem-fs-editor/state';
+import { camelCase, startCase } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { GENERATOR_VUE, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.js';
@@ -35,7 +35,7 @@ const TYPE_BOOLEAN = CommonDBTypes.BOOLEAN;
 export default class VueGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_VUE);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             await this.dependsOnJHipster(GENERATOR_CLIENT);
@@ -108,7 +108,7 @@ export default class VueGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
-        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+        return this.delegateTasksToBlueprint(() => this.default);
     }
     get writing() {
         return this.asWritingTaskGroup({
@@ -179,7 +179,7 @@ export default class VueGenerator extends BaseApplicationGenerator {
      * @param {string} entityTranslationKeyMenu - i18n key for entity entry in menu
      * @param {string} entityTranslationValue - i18n value for entity entry in menu
      */
-    addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu = _.camelCase(routerName), entityTranslationValue = _.startCase(routerName)) {
+    addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu = camelCase(routerName), entityTranslationValue = startCase(routerName)) {
         this.needleApi.clientVue.addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue);
     }
     /**