generator-jhipster 8.2.1 → 8.4.0

package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs

@@ -54,6 +54,10 @@ import tech.jhipster.web.filter.CookieCsrfFilter;
 <%_ if (!skipClient) { _%>
 import <%= packageName %>.web.filter.SpaWebFilter;
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+<%_ } _%>
 <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%>
 import org.springframework.security.config.http.SessionCreationPolicy;
 <%_ } _%>
@@ -84,6 +88,9 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority;
   <%_ } _%>
 import java.util.*;
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+import java.util.function.Supplier;
+<%_ } _%>
 <%_ if (authenticationTypeSession) { _%>
 import org.springframework.http.HttpStatus;
 import org.springframework.security.web.authentication.HttpStatusEntryPoint;
@@ -94,8 +101,7 @@ import org.springframework.security.web.authentication.RememberMeServices;
   <%_ } _%>
 <%_ } _%>
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
-import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
-import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
+import org.springframework.security.web.csrf.*;
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
@@ -104,7 +110,7 @@ import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
 import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationEntryPoint;
 import org.springframework.security.oauth2.server.resource.web.access.BearerTokenAccessDeniedHandler;
 <%_ } _%>
-<%_ if (authenticationTypeOauth2 && applicationTypeMonolith) { _%>
+<%_ if (authenticationTypeOauth2 && !applicationTypeMicroservice) { _%>
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import <%= packageName %>.security.oauth2.CustomClaimConverter;
@@ -112,6 +118,9 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter;
 <%_ if(!skipClient) { _%>
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+import org.springframework.util.StringUtils;
+<%_ } _%>
 import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
 import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
 
@@ -126,7 +135,7 @@ public class SecurityConfiguration {
 
     private final Environment env;
 <%_ } _%>
-    
+
     private final JHipsterProperties jHipsterProperties;
 <%_ if (authenticationTypeSession && generateUserManagement) { _%>
 
@@ -141,7 +150,7 @@ public class SecurityConfiguration {
     public SecurityConfiguration(<% if (devDatabaseTypeH2Any) { %>Environment env, <% } %><% if (authenticationTypeSession && generateUserManagement) { %>RememberMeServices rememberMeServices, <% } %> JHipsterProperties jHipsterProperties) {
 <%_ if (devDatabaseTypeH2Any) { _%>
         this.env = env;
-<%_ } _%>       
+<%_ } _%>
 <%_ if (authenticationTypeSession && generateUserManagement) { _%>
         this.rememberMeServices = rememberMeServices;
 <%_ } _%>
@@ -164,8 +173,7 @@ public class SecurityConfiguration {
             .csrf(csrf -> csrf
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
                 .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-                // See https://stackoverflow.com/q/74447118/65681
-                .csrfTokenRequestHandler(new CsrfTokenRequestAttributeHandler()))
+                .csrfTokenRequestHandler(new SpaCsrfTokenRequestHandler()))
 <%_ } else { _%>
                 .disable())
 <%_ } _%>
@@ -221,6 +229,18 @@ public class SecurityConfiguration {
 <%_ } _%>
                     .requestMatchers(mvc.pattern("/api/admin/**")).hasAuthority(AuthoritiesConstants.ADMIN)
                     .requestMatchers(mvc.pattern("/api/**")).authenticated()
+<%_ if (applicationTypeGateway) { _%>
+  <%_ if (microfrontend) { _%>
+                    // microfrontend resources are loaded by webpack without authentication, they need to be public
+                    .requestMatchers(mvc.pattern("/services/*/*.js")).permitAll()
+                    .requestMatchers(mvc.pattern("/services/*/*.txt")).permitAll()
+                    .requestMatchers(mvc.pattern("/services/*/*.json")).permitAll()
+                    .requestMatchers(mvc.pattern("/services/*/*.js.map")).permitAll()
+  <%_ } _%>
+                    .requestMatchers(mvc.pattern("/services/*/management/health/readiness")).permitAll()
+                    .requestMatchers(mvc.pattern("/services/*/v3/api-docs")).hasAuthority(AuthoritiesConstants.ADMIN)
+                    .requestMatchers(mvc.pattern("/services/**")).authenticated()
+<%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
                     .requestMatchers(mvc.pattern("/websocket/**")).authenticated()
 <%_ } _%>
@@ -267,9 +287,9 @@ public class SecurityConfiguration {
 				.accessDeniedHandler(new BearerTokenAccessDeniedHandler()))
             .oauth2ResourceServer(oauth2 -> oauth2.jwt(withDefaults()));
 <%_ } else if (authenticationTypeOauth2) { _%>
-  <%_ if (applicationTypeMonolith) { _%>
+  <%_ if (!applicationTypeMicroservice) { _%>
             .oauth2Login(oauth2 -> oauth2.loginPage("/").userInfoEndpoint(userInfo -> userInfo.oidcUserService(this.oidcUserService())))
-  <%_ } else if (applicationTypeMicroservice) { _%>
+  <%_ } else { _%>
             .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
   <%_ } _%>
             .oauth2ResourceServer(oauth2 -> oauth2
@@ -352,4 +372,46 @@ public class SecurityConfiguration {
         return jwtDecoder;
     }
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+
+    /**
+     * Custom CSRF handler to provide BREACH protection.
+     *
+     * @see <a href="https://docs.spring.io/spring-security/reference/servlet/exploits/csrf.html#csrf-integration-javascript-spa">Spring Security Documentation - Integrating with CSRF Protection</a>
+     * @see <a href="https://github.com/jhipster/generator-jhipster/pull/25907">JHipster - use customized SpaCsrfTokenRequestHandler to handle CSRF token</a>
+     * @see <a href="https://stackoverflow.com/q/74447118/65681">CSRF protection not working with Spring Security 6</a>
+     */
+    static final class SpaCsrfTokenRequestHandler extends CsrfTokenRequestAttributeHandler {
+        private final CsrfTokenRequestHandler delegate = new XorCsrfTokenRequestAttributeHandler();
+
+        @Override
+        public void handle(HttpServletRequest request, HttpServletResponse response, Supplier<CsrfToken> csrfToken) {
+            /*
+             * Always use XorCsrfTokenRequestAttributeHandler to provide BREACH protection of
+             * the CsrfToken when it is rendered in the response body.
+             */
+            this.delegate.handle(request, response, csrfToken);
+        }
+
+        @Override
+        public String resolveCsrfTokenValue(HttpServletRequest request, CsrfToken csrfToken) {
+            /*
+             * If the request contains a request header, use CsrfTokenRequestAttributeHandler
+             * to resolve the CsrfToken. This applies when a single-page application includes
+             * the header value automatically, which was obtained via a cookie containing the
+             * raw CsrfToken.
+             */
+            if (StringUtils.hasText(request.getHeader(csrfToken.getHeaderName()))) {
+                return super.resolveCsrfTokenValue(request, csrfToken);
+            }
+            /*
+             * In all other cases (e.g. if the request contains a request parameter), use
+             * XorCsrfTokenRequestAttributeHandler to resolve the CsrfToken. This applies
+             * when a server-side rendered form includes the _csrf request parameter as a
+             * hidden input.
+             */
+            return this.delegate.resolveCsrfTokenValue(request, csrfToken);
+        }
+    }
+<%_ } _%>
 }

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:
@@ -234,7 +245,7 @@ spring:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
     # Otherwise, it will be filled in by <%= buildTool %> when building the JAR file
     # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
-    active: #spring.profiles.active#
+    active: '@spring.profiles.active@'
     group:
       dev:
         - dev

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

@@ -30,7 +30,7 @@ spring:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
     # Otherwise, it will be filled in by <%= buildTool %> when building the JAR file
     # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
-    active: #spring.profiles.active#
+    active: '@spring.profiles.active@'
   cloud:
 <%_ if (serviceDiscoveryConsul) { _%>
     consul:

package/dist/generators/server/templates/src/main/resources/static/index_microservices.html.ejs

@@ -72,9 +72,9 @@
 </head>
 <body>
 <div class="container">
-  <h1>Welcome, Java Hipster!</h1>
+  <h1>Welcome, <%- hipsterName %>!</h1>
 
-  <p>This application is a microservice, which has been generated using <a href="https://www.jhipster.tech/" rel="noopener noreferrer">JHipster</a>.</p>
+  <p>This application is a microservice, which has been generated using <a href="<%- hipsterDocumentationLink %>" rel="noopener noreferrer">JHipster</a>.</p>
 
   <ul>
 <%_ if (microfrontend) { %>
@@ -107,15 +107,15 @@
   </h2>
 
   <ul>
-    <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener noreferrer">JHipster homepage</a></li>
-    <li><a href="https://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener noreferrer">JHipster on Stack Overflow</a></li>
-    <li><a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener noreferrer">JHipster bug tracker</a></li>
-    <li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">JHipster public chat room</a></li>
-    <li><a href="https://twitter.com/jhipster" target="_blank" rel="noopener noreferrer">follow @jhipster on Twitter</a></li>
+    <li><a href="<%- hipsterDocumentationLink %>" target="_blank" rel="noopener noreferrer">JHipster homepage</a></li>
+    <li><a href="<%- hipsterStackoverflowLink %>" target="_blank" rel="noopener noreferrer">JHipster on Stack Overflow</a></li>
+    <li><a href="<%- hipsterBugTrackerLink %>" target="_blank" rel="noopener noreferrer">JHipster bug tracker</a></li>
+    <li><a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">JHipster public chat room</a></li>
+    <li><a href="<%- hipsterTwitterLink %>" target="_blank" rel="noopener noreferrer">follow @jhipster on Twitter</a></li>
   </ul>
 
   <p>
-    <span>If you like JHipster, don't forget to give us a star on</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">GitHub</a>!
+    <span>If you like JHipster, don't forget to give us a star on</span> <a href="<%- hipsterProjectLink %>" target="_blank" rel="noopener noreferrer">GitHub</a>!
   </p>
 
 </div>

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/cleanup.js

@@ -197,4 +197,7 @@ export default asWritingTask(function cleanupTask(taskParam) {
             this.removeFile('gradle/sonar.gradle');
         }
     }
+    if (this.isJhipsterVersionLessThan('8.4.0')) {
+        this.removeFile(`${application.javaPackageSrcDir}config/LocaleConfiguration.java`);
+    }
 });

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,43 @@ 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',
+            }),
+        },
+        defaultPackaging: {
+            description: 'Default packaging for the application',
+            cli: {
+                type: String,
+                hide: true,
+            },
+            choices: ['jar', 'war'],
+            default: 'jar',
+            scope: 'storage',
+        },
+    },
+    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: [
         {
@@ -445,11 +410,6 @@ export const baseServerFiles = {
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/Constants.java'],
         },
-        {
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: [data => `config/LocaleConfiguration_${data.imperativeOrReactive}.java`],
-        },
     ],
     serverJavaDomain: [
         {
@@ -537,4 +497,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));