generator-jhipster 8.2.1 → 8.3.0

package/dist/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs

@@ -42,10 +42,13 @@ public class SpaWebFilter extends OncePerRequestFilter {
 <%_ if (devDatabaseTypeH2Any) { _%>            
             !path.startsWith("/h2-console") &&
 <%_ } _%>
-<%_ if (authenticationTypeOauth2 && applicationTypeMonolith) { _%>
+<%_ if (authenticationTypeOauth2 && (applicationTypeGateway || applicationTypeMonolith)) { _%>
             !path.startsWith("/login") &&
             !path.startsWith("/oauth2") &&
 <%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+            !path.startsWith("/services") &&
+<%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
             !path.startsWith("/websocket") &&
 <%_ } _%>

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

@@ -69,7 +69,7 @@ eureka:
       git-branch: ${git.branch:}
       context-path: ${server.servlet.context-path:}
 <%_ } _%>
-<%_ if (applicationTypeGateway || (applicationTypeMicroservice && reactive)) { _%>
+<%_ if ((applicationTypeGateway || applicationTypeMicroservice) && reactive) { _%>
 reactive:
   feign:
     circuit:
@@ -99,7 +99,7 @@ management:
         include:
           - configprops
           - env
-<% if (applicationTypeGateway && reactive) { -%>
+<% if (applicationTypeGateway) { -%>
           - gateway
 <% } -%>
           - health
@@ -175,7 +175,7 @@ spring:
 <%_ } _%>
   application:
     name: <%= baseName %>
-<%_ if (serviceDiscoveryConsul || (applicationTypeGateway && reactive) || messageBrokerKafka) { _%>
+<%_ if (serviceDiscoveryConsul || applicationTypeGateway || messageBrokerKafka) { _%>
   cloud:
   <%_ if (serviceDiscoveryConsul) { _%>
     consul:
@@ -187,8 +187,9 @@ spring:
         watch:
           enabled: false
   <%_ } _%>
-  <%_ if (applicationTypeGateway && reactive) { _%>
+  <%_ if (applicationTypeGateway) { _%>
     gateway:
+    <%_ if (reactive) { _%>
       default-filters:
         - <% if (authenticationTypeJwt) { %>JWTRelay<% } else { %>TokenRelay<% } %>
       discovery:
@@ -207,6 +208,16 @@ spring:
       httpclient:
         pool:
           max-connections: 1000
+    <%_ } else { _%>
+      mvc:
+        routes:
+          - id: <%= lowercaseBaseName %>_route
+            uri: lb://<%= lowercaseBaseName %>:<%= serverPort %>
+            predicates:
+              - Path=/services/<%= lowercaseBaseName %>/**
+            filters:
+              - RewritePath=/services/<%= lowercaseBaseName %>/?(?<segment>.*), /$\{segment}
+    <%_ } _%>
   <%_ } _%>
   <%_ if (messageBrokerKafka) { _%>
     function:

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

@@ -52,7 +52,6 @@ import <%= packageName %>.config.TestSecurityConfiguration;
 <%_ if (cacheProviderRedis) { _%>
 import org.junit.jupiter.api.extension.ExtendWith;
 <%_ } _%>
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.lang.annotation.ElementType;
@@ -88,7 +87,6 @@ import java.lang.annotation.Target;
 <%_ if (databaseTypeSql) { _%>
 @EmbeddedSQL
 <%_ } _%>
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public @interface IntegrationTest {
 <%_ if (reactive) { _%>
     // 5s is Spring's default https://github.com/spring-projects/spring-framework/blob/main/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java#L106

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

@@ -25,10 +25,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;
 
@@ -49,56 +51,79 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
 
-        return (context, mergedConfig) -> {
-            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-            TestPropertyValues testValues = TestPropertyValues.empty();
-<%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
-            EmbeddedCouchbase couchbaseAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCouchbase.class);
-            if (null != couchbaseAnnotation) {
-                log.debug("detected the EmbeddedCouchbase annotation on class {}", testClass.getName());
-                log.info("Warming up the Couchbase database");
-                if (null == couchbaseBean) {
-                    couchbaseBean = beanFactory.createBean(CouchbaseTestContainer.class);
-                    beanFactory.registerSingleton(CouchbaseTestContainer.class.getName(), couchbaseBean);
-                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(CouchbaseTestContainer.class.getName(), couchbaseBean);
-                }
-                testValues = testValues.and("spring.couchbase.connection-string=" + couchbaseBean.getCouchbaseContainer().getConnectionString());
-                testValues = testValues.and("spring.couchbase.username=" + couchbaseBean.getCouchbaseContainer().getUsername());
-                testValues = testValues.and("spring.couchbase.password=" + couchbaseBean.getCouchbaseContainer().getPassword());
-                testValues = testValues.and("jhipster.database.couchbase.bucket-name=" + couchbaseBean.getBucketName());
-                testValues = testValues.and("jhipster.database.couchbase.scope-name=testScope");
-            }
-<%_ } _%>
-<%_ if (databaseTypeMongodb) { _%>
-                EmbeddedMongo mongoAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedMongo.class);
-                if (null != mongoAnnotation) {
-                    log.debug("detected the EmbeddedMongo annotation on class {}", testClass.getName());
-                    log.info("Warming up the mongo database");
-                    if (null == mongoDbBean) {
-                        mongoDbBean = beanFactory.createBean(MongoDbTestContainer.class);
-                        beanFactory.registerSingleton(MongoDbTestContainer.class.getName(), mongoDbBean);
-                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(MongoDbTestContainer.class.getName(), mongoDbBean);
+        return new ContextCustomizer() {
+            @Override
+            public void customizeContext(ConfigurableApplicationContext context,
+                    MergedContextConfiguration mergedConfig) {
+                ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+                TestPropertyValues testValues = TestPropertyValues.empty();
+    <%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
+                EmbeddedCouchbase couchbaseAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCouchbase.class);
+                if (null != couchbaseAnnotation) {
+                    log.debug("detected the EmbeddedCouchbase annotation on class {}", testClass.getName());
+                    log.info("Warming up the Couchbase database");
+                    if (null == couchbaseBean) {
+                        couchbaseBean = beanFactory.createBean(CouchbaseTestContainer.class);
+                        beanFactory.registerSingleton(CouchbaseTestContainer.class.getName(), couchbaseBean);
+                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(CouchbaseTestContainer.class.getName(), couchbaseBean);
                     }
-                    testValues = testValues.and("spring.data.mongodb.uri=" + mongoDbBean.getMongoDBContainer().getReplicaSetUrl());
+                    testValues = testValues.and("spring.couchbase.connection-string=" + couchbaseBean.getCouchbaseContainer().getConnectionString());
+                    testValues = testValues.and("spring.couchbase.username=" + couchbaseBean.getCouchbaseContainer().getUsername());
+                    testValues = testValues.and("spring.couchbase.password=" + couchbaseBean.getCouchbaseContainer().getPassword());
+                    testValues = testValues.and("jhipster.database.couchbase.bucket-name=" + couchbaseBean.getBucketName());
+                    testValues = testValues.and("jhipster.database.couchbase.scope-name=testScope");
                 }
-<%_ } _%>
-<%_ if (searchEngineElasticsearch) { _%>
-            EmbeddedElasticsearch elasticsearchAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedElasticsearch.class);
-            if (null != elasticsearchAnnotation) {
-                log.debug("detected the EmbeddedElasticsearch annotation on class {}", testClass.getName());
-                log.info("Warming up the elastic database");
-                if (null == elasticsearchBean) {
-                    elasticsearchBean = beanFactory.createBean(ElasticsearchTestContainer.class);
-                    beanFactory.registerSingleton(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
-                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
+    <%_ } _%>
+    <%_ if (databaseTypeMongodb) { _%>
+                    EmbeddedMongo mongoAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedMongo.class);
+                    if (null != mongoAnnotation) {
+                        log.debug("detected the EmbeddedMongo annotation on class {}", testClass.getName());
+                        log.info("Warming up the mongo database");
+                        if (null == mongoDbBean) {
+                            mongoDbBean = beanFactory.createBean(MongoDbTestContainer.class);
+                            beanFactory.registerSingleton(MongoDbTestContainer.class.getName(), mongoDbBean);
+                            // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(MongoDbTestContainer.class.getName(), mongoDbBean);
+                        }
+                        testValues = testValues.and("spring.data.mongodb.uri=" + mongoDbBean.getMongoDBContainer().getReplicaSetUrl());
+                    }
+    <%_ } _%>
+    <%_ if (searchEngineElasticsearch) { _%>
+                EmbeddedElasticsearch elasticsearchAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedElasticsearch.class);
+                if (null != elasticsearchAnnotation) {
+                    log.debug("detected the EmbeddedElasticsearch annotation on class {}", testClass.getName());
+                    log.info("Warming up the elastic database");
+                    if (null == elasticsearchBean) {
+                        elasticsearchBean = beanFactory.createBean(ElasticsearchTestContainer.class);
+                        beanFactory.registerSingleton(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
+                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
+                    }
+                    testValues =
+                        testValues.and(
+                            "spring.elasticsearch.uris=http://" + elasticsearchBean.getElasticsearchContainer().getHttpHostAddress()
+                        );
                 }
-                testValues =
-                    testValues.and(
-                        "spring.elasticsearch.uris=http://" + elasticsearchBean.getElasticsearchContainer().getHttpHostAddress()
-                    );
+    <%_ } _%>
+                testValues.applyTo(context);
+            }
+    
+            @Override
+            public int hashCode() {
+                return
+                <%_ if (databaseTypeMongodb) { _%>
+                    MongoDbTestContainer.class.getName().hashCode() <% if (searchEngineElasticsearch || databaseTypeCouchbase || searchEngineCouchbase) { %> + <% } else { %>;<% } %>
+                <%_ } _%>
+                <%_ if (searchEngineElasticsearch) { _%>
+                    ElasticsearchTestContainer.class.getName().hashCode() <% if (databaseTypeCouchbase || searchEngineCouchbase) { %> + <% } else { %>;<% } %>
+                <%_ } _%>
+                <%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
+                    CouchbaseTestContainer.class.getName().hashCode();
+                <%_ } _%>
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                return this.hashCode() == obj.hashCode();
             }
-<%_ } _%>
-            testValues.applyTo(context);
         };
     }
 }

package/dist/generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs

@@ -5,8 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.test.annotation.DirtiesContext;
-
 import <%= packageName %>.config.SecurityConfiguration;
 import <%= packageName %>.config.SecurityJwtConfiguration;
 import <%= packageName %>.config.WebConfigurer;
@@ -72,7 +70,6 @@ import org.springframework.boot.test.context.SpringBootTest;
     }
 )
 <%_ } _%>
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public @interface AuthenticationIntegrationTest {
 
 }

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

@@ -63,7 +63,7 @@ mongock:
 spring:
   application:
     name: <%= baseName %>
-<%_ if (applicationTypeGateway && reactive) { _%>
+<%_ if (applicationTypeGateway) { _%>
   autoconfigure:
     exclude:
       - org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration

package/dist/generators/spring-boot/command.js

@@ -1,4 +1,5 @@
-import { GENERATOR_SERVER } from '../generator-list.js';
+import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.js';
+import { APPLICATION_TYPE_MICROSERVICE } from '../../jdl/index.js';
 const command = {
     options: {
         fakeKeytool: {
@@ -9,6 +10,34 @@ const command = {
             hide: true,
         },
     },
-    import: [GENERATOR_SERVER],
+    configs: {
+        feignClient: {
+            description: 'Generate a feign client',
+            cli: {
+                type: Boolean,
+            },
+            prompt: {
+                type: 'confirm',
+                message: 'Do you want to generate a feign client?',
+                when: currentAnswer => currentAnswer.applicationType === APPLICATION_TYPE_MICROSERVICE &&
+                    currentAnswer.reactive !== undefined &&
+                    !currentAnswer.reactive,
+            },
+            default: false,
+        },
+        syncUserWithIdp: {
+            description: 'Allow relationships with User for oauth2 applications',
+            cli: {
+                type: Boolean,
+            },
+            prompt: gen => ({
+                type: 'confirm',
+                message: 'Do you want to allow relationships with User entity?',
+                when: ({ authenticationType }) => (authenticationType ?? gen.jhipsterConfigWithDefaults.authenticationType) === 'oauth2',
+            }),
+            default: false,
+        },
+    },
+    import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL],
 };
 export default command;

package/dist/generators/spring-boot/entity-files.js

@@ -191,8 +191,8 @@ export function writeFiles() {
         },
         async writeServerFiles({ application, entities }) {
             const rootTemplatesPath = application.reactive
-                ? ['reactive', '', '../../server/templates/', '../../java/templates/']
-                : ['', '../../server/templates/', '../../java/templates/'];
+                ? ['reactive', '', '../../server/templates/', '../../java/generators/domain/templates/']
+                : ['', '../../server/templates/', '../../java/generators/domain/templates/'];
             for (const entity of entities.filter(entity => !entity.skipServer)) {
                 if (entity.builtInUser) {
                     await this.writeFiles({

package/dist/generators/spring-boot/files.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, GRADLE_BUILD_SRC_MAIN_DIR, } from '../generator-constants.js';
+import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js';
 import { addSectionsCondition, mergeSections } from '../base/support/index.js';
 import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir, moveToSrcMainResourcesDir } from '../java/support/index.js';
 const imperativeConfigFiles = {
@@ -226,28 +226,6 @@ const jwtFiles = {
         },
     ],
 };
-const gatewayFiles = {
-    gatewayFiles: [
-        {
-            condition: generator => generator.authenticationTypeJwt,
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: ['security/jwt/JWTRelayGatewayFilterFactory.java'],
-        },
-        {
-            condition: generator => generator.serviceDiscoveryAny,
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: ['web/rest/vm/RouteVM.java', 'web/rest/GatewayResource.java', 'web/filter/ModifyServersOpenApiFilter.java'],
-        },
-        {
-            condition: generator => generator.serviceDiscoveryAny,
-            path: `${SERVER_TEST_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageTestDir,
-            templates: ['web/filter/ModifyServersOpenApiFilterTest.java'],
-        },
-    ],
-};
 const swaggerFiles = {
     swagger: [
         {
@@ -270,12 +248,6 @@ const swaggerFiles = {
  * For any other config an object { file:.., method:.., template:.. } can be used
  */
 export const baseServerFiles = {
-    jib: [
-        {
-            path: 'src/main/docker/jib/',
-            templates: ['entrypoint.sh'],
-        },
-    ],
     readme: [
         {
             templates: ['README.md.jhi.spring-boot'],
@@ -289,7 +261,7 @@ export const baseServerFiles = {
     ],
     serverBuild: [
         {
-            templates: ['checkstyle.xml', '.devcontainer/devcontainer.json', '.devcontainer/Dockerfile'],
+            templates: ['.devcontainer/devcontainer.json', '.devcontainer/Dockerfile'],
         },
         {
             condition: generator => generator.buildToolGradle,
@@ -301,19 +273,12 @@ export const baseServerFiles = {
                 'gradle/profile_prod.gradle',
                 'gradle/war.gradle',
                 'gradle/zipkin.gradle',
-                `${GRADLE_BUILD_SRC_MAIN_DIR}/jhipster.code-quality-conventions.gradle`,
-                `${GRADLE_BUILD_SRC_MAIN_DIR}/jhipster.docker-conventions.gradle`,
             ],
         },
         {
             condition: generator => generator.buildToolMaven,
             templates: ['pom.xml'],
         },
-        {
-            condition: generator => generator.useNpmWrapper,
-            transform: false,
-            templates: ['npmw', 'npmw.cmd'],
-        },
     ],
     serverResource: [
         {
@@ -537,4 +502,4 @@ export const baseServerFiles = {
         },
     ],
 };
-export const serverFiles = mergeSections(baseServerFiles, addSectionsCondition(jwtFiles, context => context.authenticationTypeJwt), addSectionsCondition(oauth2Files, context => context.authenticationTypeOauth2), addSectionsCondition(gatewayFiles, context => context.applicationTypeGateway), addSectionsCondition(accountFiles, context => context.generateAuthenticationApi), addSectionsCondition(userManagementFiles, context => context.generateUserManagement), addSectionsCondition(imperativeConfigFiles, context => !context.reactive), addSectionsCondition(reactiveConfigFiles, context => context.reactive), addSectionsCondition(swaggerFiles, context => context.enableSwaggerCodegen));
+export const serverFiles = mergeSections(baseServerFiles, addSectionsCondition(jwtFiles, context => context.authenticationTypeJwt), addSectionsCondition(oauth2Files, context => context.authenticationTypeOauth2), addSectionsCondition(accountFiles, context => context.generateAuthenticationApi), addSectionsCondition(userManagementFiles, context => context.generateUserManagement), addSectionsCondition(imperativeConfigFiles, context => !context.reactive), addSectionsCondition(reactiveConfigFiles, context => context.reactive), addSectionsCondition(swaggerFiles, context => context.enableSwaggerCodegen));

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

@@ -18,18 +18,18 @@
  */
 import os from 'node:os';
 import chalk from 'chalk';
-import { kebabCase, sortedUniqBy } from 'lodash-es';
+import { sortedUniqBy } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_SERVER, GENERATOR_SPRING_CACHE, GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_SPRING_DATA_MONGODB, GENERATOR_SPRING_DATA_NEO4J, GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_SPRING_WEBSOCKET, } from '../generator-list.js';
+import { GENERATOR_CUCUMBER, GENERATOR_DOCKER, GENERATOR_FEIGN_CLIENT, GENERATOR_GATLING, GENERATOR_LANGUAGES, GENERATOR_SERVER, GENERATOR_SPRING_CACHE, GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_SPRING_DATA_MONGODB, GENERATOR_SPRING_DATA_NEO4J, GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_SPRING_WEBSOCKET, } from '../generator-list.js';
 import { serverFiles } from './files.js';
 import cleanupTask from './cleanup.js';
 import { ADD_SPRING_MILESTONE_REPOSITORY } from '../generator-constants.js';
 import { addSpringFactory, getJavaValueGeneratorForType, getPrimaryKeyValue, getSpecificationBuildForType, insertContentIntoApplicationProperties, javaBeanCase, } from '../server/support/index.js';
 import { addJavaAnnotation, generateKeyStore } from '../java/support/index.js';
 import { createNeedleCallback, mutateData } from '../base/support/index.js';
-import { APPLICATION_TYPE_MICROSERVICE, applicationTypes, cacheTypes, databaseTypes, fieldTypes, messageBrokerTypes, searchEngineTypes, websocketTypes, } from '../../jdl/index.js';
+import { APPLICATION_TYPE_MICROSERVICE, applicationTypes, cacheTypes, databaseTypes, fieldTypes, messageBrokerTypes, searchEngineTypes, testFrameworkTypes, websocketTypes, } from '../../jdl/index.js';
 import { writeFiles as writeEntityFiles } from './entity-files.js';
-import { getPomVersionProperties } from '../maven/support/index.js';
+import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js';
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS, NO: NO_CACHE } = cacheTypes;
 const { NO: NO_WEBSOCKET, SPRING_WEBSOCKET } = websocketTypes;
 const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL } = databaseTypes;
@@ -37,6 +37,7 @@ const { MICROSERVICE, GATEWAY } = applicationTypes;
 const { KAFKA, PULSAR } = messageBrokerTypes;
 const { ELASTICSEARCH } = searchEngineTypes;
 const { BYTES: TYPE_BYTES, BYTE_BUFFER: TYPE_BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes;
+const { CUCUMBER, GATLING } = testFrameworkTypes;
 export default class SpringBootGenerator extends BaseApplicationGenerator {
     fakeKeytool;
     async beforeQueue() {
@@ -45,6 +46,8 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
         }
         if (!this.delegateToBlueprint) {
             await this.dependsOnJHipster(GENERATOR_SERVER);
+            await this.dependsOnJHipster('jhipster:java:domain');
+            await this.dependsOnJHipster('jhipster:java:build-tool');
         }
     }
     get initializing() {
@@ -57,30 +60,26 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     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({
-            forceReactiveGateway() {
-                if (this.jhipsterConfig.applicationType === GATEWAY) {
-                    if (this.jhipsterConfig.reactive !== undefined && !this.jhipsterConfig.reactive) {
-                        this.log.warn('Non reactive gateway is not supported. Switching to reactive.');
-                    }
-                    this.jhipsterConfig.reactive = true;
-                }
-            },
             checks() {
                 const config = this.jhipsterConfigWithDefaults;
                 if (config.enableHibernateCache && [NO_CACHE, MEMCACHED].includes(config.cacheProvider)) {
                     this.log.verboseInfo(`Disabling hibernate cache for cache provider ${config.cacheProvider}`);
                     this.jhipsterConfig.enableHibernateCache = false;
                 }
-                if (config.websocket && config.websocket !== NO_WEBSOCKET) {
-                    if (config.reactive) {
-                        throw new Error('Spring Websocket is not supported with reactive applications.');
-                    }
-                    if (config.applicationType === MICROSERVICE) {
-                        throw new Error('Spring Websocket is not supported with microservice applications.');
-                    }
-                }
             },
             feignMigration() {
                 const { reactive, applicationType, feignClient } = this.jhipsterConfigWithDefaults;
@@ -107,7 +106,28 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     get composing() {
         return this.asComposingTaskGroup({
             async composing() {
-                const { databaseType, messageBroker, searchEngine, websocket, cacheProvider } = this.jhipsterConfigWithDefaults;
+                const { applicationType, databaseType, messageBroker, searchEngine, websocket, cacheProvider, skipClient, clientFramework, enableTranslation, testFrameworks, feignClient, } = this.jhipsterConfigWithDefaults;
+                await this.composeWithJHipster(GENERATOR_DOCKER);
+                await this.composeWithJHipster('jhipster:java:jib');
+                await this.composeWithJHipster('jhipster:java:code-quality');
+                if (!skipClient && clientFramework !== 'no') {
+                    await this.composeWithJHipster('jhipster:java:node');
+                }
+                if (applicationType === GATEWAY) {
+                    await this.composeWithJHipster('jhipster:spring-cloud:gateway');
+                }
+                if (enableTranslation) {
+                    await this.composeWithJHipster(GENERATOR_LANGUAGES);
+                }
+                if (testFrameworks?.includes(CUCUMBER)) {
+                    await this.composeWithJHipster(GENERATOR_CUCUMBER);
+                }
+                if (testFrameworks?.includes(GATLING)) {
+                    await this.composeWithJHipster(GENERATOR_GATLING);
+                }
+                if (feignClient) {
+                    await this.composeWithJHipster(GENERATOR_FEIGN_CLIENT);
+                }
                 if (databaseType === SQL) {
                     await this.composeWithJHipster(GENERATOR_SPRING_DATA_RELATIONAL);
                 }
@@ -143,19 +163,33 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
+            checksWebsocket({ application }) {
+                const { websocket } = application;
+                if (websocket && websocket !== NO_WEBSOCKET) {
+                    if (application.reactive) {
+                        throw new Error('Spring Websocket is not supported with reactive applications.');
+                    }
+                    if (application.applicationType === MICROSERVICE) {
+                        throw new Error('Spring Websocket is not supported with microservice applications.');
+                    }
+                }
+            },
             loadSpringBootBom({ application }) {
-                const pomFile = this.readTemplate(this.jhipsterTemplatePath('../resources/spring-boot-dependencies.pom'))?.toString();
                 if (this.useVersionPlaceholders) {
-                    application.javaDependencies['spring-boot'] = "'SPRING-BOOT-VERSION'";
-                    application.springBootDependencies = {};
+                    application.springBootDependencies = {
+                        'spring-boot-dependencies': "'SPRING-BOOT-VERSION'",
+                    };
                 }
                 else {
-                    application.springBootDependencies = this.prepareDependencies(getPomVersionProperties(pomFile), value => `'${kebabCase(value).toUpperCase()}-VERSION'`);
+                    const pomFile = this.readTemplate(this.jhipsterTemplatePath('../resources/spring-boot-dependencies.pom')).toString();
+                    const pom = parseMavenPom(pomFile);
+                    application.springBootDependencies = this.prepareDependencies(getPomVersionProperties(pom), 'java');
                     application.javaDependencies['spring-boot'] = application.springBootDependencies['spring-boot-dependencies'];
+                    Object.assign(application.javaManagedProperties, pom.project.properties);
                 }
             },
             prepareForTemplates({ application }) {
-                const SPRING_BOOT_VERSION = application.javaDependencies['spring-boot'];
+                const SPRING_BOOT_VERSION = application.springBootDependencies['spring-boot-dependencies'];
                 application.addSpringMilestoneRepository =
                     (application.backendType ?? 'Java') === 'Java' &&
                         (ADD_SPRING_MILESTONE_REPOSITORY || SPRING_BOOT_VERSION.includes('M') || SPRING_BOOT_VERSION.includes('RC'));
@@ -300,7 +334,7 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
             async writeFiles({ application }) {
                 return this.writeFiles({
                     sections: serverFiles,
-                    rootTemplatesPath: ['', '../../server/templates/', '../../java/templates/'],
+                    rootTemplatesPath: ['', '../../server/templates/', '../../java/generators/domain/templates/'],
                     context: application,
                 });
             },
@@ -329,20 +363,47 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
     get postWriting() {
         return this.asPostWritingTaskGroup({
             addJHipsterBomDependencies({ application, source }) {
+                const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, jhipsterDependenciesVersion, messageBrokerAny } = application;
+                const { serviceDiscoveryAny } = application;
+                if (application.buildToolMaven) {
+                    source.addMavenProperty?.({
+                        property: 'spring-boot.version',
+                        // eslint-disable-next-line no-template-curly-in-string
+                        value: '${project.parent.version}',
+                    });
+                }
                 source.addJavaDependencies?.([
-                    {
-                        groupId: 'tech.jhipster',
-                        artifactId: 'jhipster-dependencies',
-                        version: application.jhipsterDependenciesVersion,
-                        type: 'pom',
-                        scope: 'import',
-                    },
-                    { groupId: 'tech.jhipster', artifactId: 'jhipster-framework' },
+                    { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: jhipsterDependenciesVersion },
                 ]);
+                if (applicationTypeGateway || applicationTypeMicroservice || serviceDiscoveryAny || messageBrokerAny) {
+                    source.addJavaDependencies?.([
+                        {
+                            groupId: 'org.springframework.cloud',
+                            artifactId: 'spring-cloud-dependencies',
+                            type: 'pom',
+                            scope: 'import',
+                            version: javaDependencies['spring-cloud-dependencies'],
+                        },
+                    ]);
+                }
             },
             addSpringdoc({ application, source }) {
                 const springdocDependency = `springdoc-openapi-starter-${application.reactive ? 'webflux' : 'webmvc'}-api`;
-                source.addJavaDependencies?.([{ groupId: 'org.springdoc', artifactId: springdocDependency }]);
+                source.addJavaDependencies?.([
+                    { groupId: 'org.springdoc', artifactId: springdocDependency, version: application.javaDependencies.springdoc },
+                ]);
+            },
+            addFeignReactor({ application, source }) {
+                const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, reactive } = application;
+                if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) {
+                    const groupId = 'com.playtika.reactivefeign';
+                    source.addJavaDependencies?.([
+                        { groupId, artifactId: 'feign-reactor-bom', type: 'pom', scope: 'import', version: javaDependencies['feign-reactor-bom'] },
+                        { groupId, artifactId: 'feign-reactor-cloud' },
+                        { groupId, artifactId: 'feign-reactor-spring-configuration' },
+                        { groupId, artifactId: 'feign-reactor-webclient' },
+                    ]);
+                }
             },
             addSpringSnapshotRepository({ application, source }) {
                 if (application.buildToolMaven) {
@@ -403,7 +464,7 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
         });
     }
     get [BaseApplicationGenerator.END]() {
-        return this.asEndTaskGroup(this.delegateTasksToBlueprint(() => this.end));
+        return this.delegateTasksToBlueprint(() => this.end);
     }
     /**
      * @private