generator-jhipster 8.5.0 → 8.7.0

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

@@ -0,0 +1,212 @@
+<%#
+ 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.
+-%>
+package <%= packageName %>.web.rest.errors;
+
+import <%= packageName %>.IntegrationTest;
+import org.hamcrest.core.AnyOf;
+import org.hamcrest.core.IsEqual;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithMockUser;
+<%_ if (authenticationUsesCsrf) { _%>
+import org.junit.jupiter.api.BeforeEach;
+
+<%_ } _%>
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.reactive.server.WebTestClient;
+<%_ if (authenticationUsesCsrf) { _%>
+
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
+<%_ } _%>
+
+/**
+ * Integration tests {@link ExceptionTranslator} controller advice.
+ */
+@WithMockUser
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
+@IntegrationTest
+class ExceptionTranslatorIT {
+
+    @Autowired
+    private WebTestClient webTestClient;
+<%_ if (authenticationUsesCsrf) { _%>
+
+    @BeforeEach
+    public void setupCsrf() {
+        webTestClient = webTestClient.mutateWith(csrf());
+    }
+<%_ } _%>
+<%_ if (!databaseTypeNo && !databaseTypeCassandra) { _%>
+
+    @Test
+    void testConcurrencyFailure() {
+        webTestClient
+            .get()
+            .uri("/api/exception-translator-test/concurrency-failure")
+            .exchange()
+            .expectStatus()
+            .isEqualTo(HttpStatus.CONFLICT)
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo(ErrorConstants.ERR_CONCURRENCY_FAILURE);
+    }
+<%_ } _%>
+
+    @Test
+    void testMethodArgumentNotValid() {
+        webTestClient
+            .post()
+            .uri("/api/exception-translator-test/method-argument")
+            .contentType(MediaType.APPLICATION_JSON)
+            .bodyValue("{}")
+            .exchange()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo(ErrorConstants.ERR_VALIDATION)
+            .jsonPath("$.fieldErrors.[0].objectName")
+            .isEqualTo("test")
+            .jsonPath("$.fieldErrors.[0].field")
+            .isEqualTo("test")
+            .jsonPath("$.fieldErrors.[0].message")
+            .isEqualTo("must not be null");
+    }
+
+    @Test
+    void testMissingRequestPart() {
+        webTestClient
+            .get()
+            .uri("/api/exception-translator-test/missing-servlet-request-part")
+            .exchange()
+            .expectStatus()
+            .isBadRequest()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo("error.http.400");
+    }
+
+    @Test
+    void testMissingRequestParameter() {
+        webTestClient
+            .get()
+            .uri("/api/exception-translator-test/missing-servlet-request-parameter")
+            .exchange()
+            .expectStatus()
+            .isBadRequest()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo("error.http.400");
+    }
+
+    @Test
+    void testAccessDenied() {
+        webTestClient
+            .get()
+            .uri("/api/exception-translator-test/access-denied")
+            .exchange()
+            .expectStatus()
+            .isForbidden()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo("error.http.403")
+            .jsonPath("$.detail")
+            .isEqualTo("test access denied!");
+    }
+
+    @Test
+    void testUnauthorized() {
+        webTestClient
+            .get()
+            .uri("/api/exception-translator-test/unauthorized")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo("error.http.401")
+            .jsonPath("$.path")
+            .isEqualTo("/api/exception-translator-test/unauthorized")
+            .jsonPath("$.detail")
+            .value(AnyOf.anyOf(IsEqual.equalTo("test authentication failed!"), IsEqual.equalTo("Invalid credentials")));
+    }
+
+    @Test
+    void testMethodNotSupported() {
+        webTestClient
+            .post()
+            .uri("/api/exception-translator-test/access-denied")
+            .exchange()
+            .expectStatus()
+            .isEqualTo(HttpStatus.METHOD_NOT_ALLOWED)
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo("error.http.405")
+            .jsonPath("$.detail")
+            .isEqualTo("405 METHOD_NOT_ALLOWED \"Request method 'POST' is not supported.\"");
+    }
+
+    @Test
+    void testExceptionWithResponseStatus() {
+        webTestClient
+            .get()
+            .uri("/api/exception-translator-test/response-status")
+            .exchange()
+            .expectStatus()
+            .isBadRequest()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo("error.http.400")
+            .jsonPath("$.title")
+            .isEqualTo("test response status");
+    }
+
+    @Test
+    void testInternalServerError() {
+        webTestClient
+            .get()
+            .uri("/api/exception-translator-test/internal-server-error")
+            .exchange()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+            .expectBody()
+            .jsonPath("$.message")
+            .isEqualTo("error.http.500")
+            .jsonPath("$.title")
+            .isEqualTo("Internal Server Error");
+    }
+
+}

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs

@@ -42,14 +42,17 @@ public class ExceptionTranslatorTestController {
 
     @PostMapping("/method-argument")
     public void methodArgument(@Valid @RequestBody Test<%= dtoSuffix %> test<%= dtoSuffix %>) {
+        // empty method
     }
 
     @GetMapping("/missing-servlet-request-part")
     public void missingServletRequestPartException(@RequestPart("part") String part) {
+        // empty method
     }
 
     @GetMapping("/missing-servlet-request-parameter")
     public void missingServletRequestParameterException(@RequestParam("param") String param) {
+        // empty method
     }
 
     @GetMapping("/access-denied")
@@ -88,7 +91,5 @@ public class ExceptionTranslatorTestController {
 
     @ResponseStatus(value = HttpStatus.BAD_REQUEST, reason = "test response status")
     @SuppressWarnings("serial")
-    public static class TestResponseStatusException extends RuntimeException {
-    }
-
+    public static class TestResponseStatusException extends RuntimeException {}
 }

package/dist/generators/{server → spring-boot}/templates/src/test/resources/config/bootstrap.yml.ejs

@@ -13,19 +13,19 @@
  limitations under the License.
 -%>
 <%_ if (serviceDiscoveryEureka) { _%>
-  spring:
-    cloud:
-      config:
-        enabled: false
+spring:
+  cloud:
+    config:
+      enabled: false
 <%_ } _%>
 <%_ if (serviceDiscoveryConsul) { _%>
-  spring:
-    cloud:
-      consul:
-        discovery:
-          enabled: false
-          instanceId: ${spring.application.name}:${spring.application.instance-id:${random.value}}
-        config:
-          enabled: false
+spring:
+  cloud:
+    consul:
+      discovery:
+        enabled: false
+        instanceId: ${spring.application.name}:${spring.application.instance-id:${random.value}}
+      config:
         enabled: false
+      enabled: false
 <%_ } _%>

package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/activationEmail.html.ejs

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
   <head>
     <title th:text="#{email.activation.title}">JHipster activation</title>

package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/creationEmail.html.ejs

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
   <head>
     <title th:text="#{email.activation.title}">JHipster creation</title>

package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
   <head>
     <title th:text="#{email.reset.title}">JHipster password reset</title>

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

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

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

@@ -17,9 +17,9 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
+import { createNeedleCallback } from '../base/support/needles.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
-import { createNeedleCallback } from '../base/support/needles.js';
 import { getCacheProviderMavenDefinition } from './internal/dependencies.js';
 export default class SpringCacheGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
@@ -121,16 +121,17 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
                 }
                 const { javaDependencies } = application;
                 const { cacheProvider, enableHibernateCache } = application;
-                const dependencies = [{ groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-cache' }];
-                const versions = [];
                 const definition = getCacheProviderMavenDefinition(cacheProvider, javaDependencies);
-                versions.push(...(definition.base.versions ?? []));
-                dependencies.push(...definition.base.dependencies);
-                if (enableHibernateCache && definition.hibernateCache) {
-                    versions.push(...(definition.hibernateCache.versions ?? []));
-                    dependencies.push(...definition.hibernateCache.dependencies);
-                }
-                source.addJavaDefinition?.({ dependencies, versions }, { gradleFile: 'buildSrc/src/main/groovy/jhipster.spring-cache-conventions.gradle' });
+                source.addJavaDefinitions?.({ gradleFile: 'buildSrc/src/main/groovy/jhipster.spring-cache-conventions.gradle' }, {
+                    ...definition.base,
+                    dependencies: [
+                        { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-cache' },
+                        ...definition.base.dependencies,
+                    ],
+                }, {
+                    condition: Boolean(enableHibernateCache && definition.hibernateCache),
+                    ...definition.hibernateCache,
+                });
             },
         });
     }

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

@@ -24,7 +24,6 @@ const hibernateJCache = {
     groupId: 'org.hibernate.orm',
     artifactId: 'hibernate-jcache',
 };
-// eslint-disable-next-line import/prefer-default-export
 export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies) => {
     const dependenciesForCache = {
         redis: {

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

@@ -3,13 +3,13 @@
 typesafe = { module = 'com.typesafe:config', version = '1.4.3' }
 
 # hazelcast
-hazelcast-hibernate53 = { module = 'com.hazelcast:hazelcast-hibernate53', version = '5.1.0' }
+hazelcast-hibernate53 = { module = 'com.hazelcast:hazelcast-hibernate53', version = '5.2.0' }
 
-hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.4.0' }
+hazelcast-spring = { module = 'com.hazelcast:hazelcast-spring', version = '5.5.0' }
 
 # memcached
 xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemcached-provider', version = '4.1.3' }
 
 xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' }
 
-redisson = { module = 'org.redisson:redisson', version = '3.30.0' }
+redisson = { module = 'org.redisson:redisson', version = '3.35.0' }

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

@@ -250,7 +250,7 @@ public class CacheConfiguration {
 <%_ } _%>
 <%_ if (cacheProviderHazelcast) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CacheConfiguration.class);
 
     private final Environment env;
   <%_ if (serviceDiscoveryAny) { _%>
@@ -279,22 +279,22 @@ public class CacheConfiguration {
 
     @PreDestroy
     public void destroy() {
-        log.info("Closing Cache Manager");
+        LOG.info("Closing Cache Manager");
         Hazelcast.shutdownAll();
     }
 
     @Bean
     public CacheManager cacheManager(HazelcastInstance hazelcastInstance) {
-        log.debug("Starting HazelcastCacheManager");
+        LOG.debug("Starting HazelcastCacheManager");
         return new com.hazelcast.spring.cache.HazelcastCacheManager(hazelcastInstance);
     }
 
     @Bean
     public HazelcastInstance hazelcastInstance(JHipsterProperties jHipsterProperties) {
-        log.debug("Configuring Hazelcast");
+        LOG.debug("Configuring Hazelcast");
         HazelcastInstance hazelCastInstance = Hazelcast.getHazelcastInstanceByName("<%= baseName %>");
         if (hazelCastInstance != null) {
-            log.debug("Hazelcast already initialized");
+            LOG.debug("Hazelcast already initialized");
             return hazelCastInstance;
         }
         Config config = new Config();
@@ -302,22 +302,23 @@ public class CacheConfiguration {
   <%_ if (serviceDiscoveryAny) { _%>
         config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);
         if (this.registration == null) {
-            log.warn("No discovery service is set up, Hazelcast cannot create a cluster.");
+            LOG.warn("No discovery service is set up, Hazelcast cannot create a cluster.");
         } else {
             // The serviceId is by default the application's name,
             // see the "spring.application.name" standard Spring property
             String serviceId = registration.getServiceId();
-            log.debug("Configuring Hazelcast clustering for instanceId: {}", serviceId);
+            LOG.debug("Configuring Hazelcast clustering for instanceId: {}", serviceId);
             // In development, everything goes through 127.0.0.1, with a different port
             if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
-                log.debug("Application is running with the \"dev\" profile, Hazelcast " +
-                          "cluster will only work with localhost instances");
+                LOG.debug(
+                    "Application is running with the \"dev\" profile, Hazelcast " + "cluster will only work with localhost instances"
+                );
 
                 config.getNetworkConfig().setPort(serverProperties.getPort() + 5701);
                 config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true);
                 for (ServiceInstance instance : discoveryClient.getInstances(serviceId)) {
                     String clusterMember = "127.0.0.1:" + (instance.getPort() + 5701);
-                    log.debug("Adding Hazelcast (dev) cluster member {}", clusterMember);
+                    LOG.debug("Adding Hazelcast (dev) cluster member {}", clusterMember);
                     config.getNetworkConfig().getJoin().getTcpIpConfig().addMember(clusterMember);
                 }
             } else { // Production configuration, one host per instance all using port 5701
@@ -325,7 +326,7 @@ public class CacheConfiguration {
                 config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true);
                 for (ServiceInstance instance : discoveryClient.getInstances(serviceId)) {
                     String clusterMember = instance.getHost() + ":5701";
-                    log.debug("Adding Hazelcast (prod) cluster member {}", clusterMember);
+                    LOG.debug("Adding Hazelcast (prod) cluster member {}", clusterMember);
                     config.getNetworkConfig().getJoin().getTcpIpConfig().addMember(clusterMember);
                 }
             }
@@ -389,7 +390,7 @@ public class CacheConfiguration {
 <%_ } _%>
 <%_ if (cacheProviderInfinispan) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CacheConfiguration.class);
 
   <%_ if (serviceDiscoveryAny) { _%>
 
@@ -431,10 +432,10 @@ public class CacheConfiguration {
      */
     @Bean
     public InfinispanGlobalConfigurer globalConfiguration(JHipsterProperties jHipsterProperties) {
-        log.info("Defining Infinispan Global Configuration");
+        LOG.info("Defining Infinispan Global Configuration");
   <%_ if (serviceDiscoveryAny) { _%>
             if (this.registration == null) { // if registry is not defined, use native discovery
-                log.warn("No discovery service is set up, Infinispan will use default discovery for cluster formation");
+                LOG.warn("No discovery service is set up, Infinispan will use default discovery for cluster formation");
                 return () -> GlobalConfigurationBuilder
                     .defaultClusteredBuilder().transport().defaultTransport()
                     .addProperty("configurationFile", jHipsterProperties.getCache().getInfinispan().getConfigFile())
@@ -508,7 +509,7 @@ public class CacheConfiguration {
      */
     @Bean
     public InfinispanCacheConfigurer cacheConfigurer(JHipsterProperties jHipsterProperties) {
-        log.info("Defining {} configuration", "app-data for local, replicated and distributed modes");
+        LOG.info("Defining {} configuration", "app-data for local, replicated and distributed modes");
         JHipsterProperties.Cache.Infinispan cacheInfo = jHipsterProperties.getCache().getInfinispan();
 
         return manager -> {
@@ -598,7 +599,7 @@ public class CacheConfiguration {
         List<InetSocketAddress> initialHosts = new ArrayList<>();
         try {
             for (ServiceInstance instance : discoveryClient.getInstances(registration.getServiceId())) {
-                log.debug("Adding Infinispan cluster member {}:{}", instance.getHost(), 7800);
+                LOG.debug("Adding Infinispan cluster member {}:{}", instance.getHost(), 7800);
                 initialHosts.add(new InetSocketAddress(instance.getHost(), 7800));
             }
             TCP tcp = new TCP();
@@ -648,7 +649,7 @@ public class CacheConfiguration {
 <%_ } _%>
 <%_ if (cacheProviderMemcached) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CacheConfiguration.class);
 
     @Bean
     public CacheManager memcachedCacheManager(JHipsterProperties jHipsterProperties, List<CacheFactory> caches)
@@ -657,10 +658,10 @@ public class CacheConfiguration {
         if (!jHipsterProperties.getCache().getMemcached().isEnabled()) {
             // Note that Memcached cannot work with Spring Boot devtools
             // So it should be disabled in development mode
-            log.debug("Memcached is disabled");
+            LOG.debug("Memcached is disabled");
             return new NoOpCacheManager();
         }
-        log.debug("Starting Memcached configuration");
+        LOG.debug("Starting Memcached configuration");
         SSMCacheManager cacheManager = new SSMCacheManager();
         List<SSMCache> ssmCaches = new ArrayList<>();
         for (CacheFactory cache : caches) {

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

@@ -29,7 +29,7 @@ import org.testcontainers.utility.DockerImageName;
 public class RedisTestContainer implements InitializingBean, DisposableBean {
 
     private GenericContainer redisContainer;
-    private static final Logger log = LoggerFactory.getLogger(RedisTestContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RedisTestContainer.class);
 
     @Override
     public void destroy() {
@@ -43,7 +43,7 @@ public class RedisTestContainer implements InitializingBean, DisposableBean {
         if (null == redisContainer) {
             redisContainer = new GenericContainer("<%- dockerContainers.redis %>")
                 .withExposedPorts(6379)
-                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withReuse(true);
         }
         if (!redisContainer.isRunning()) {

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

@@ -1,6 +1,11 @@
 const command = {
     configs: {
         routes: {
+            description: 'Manually configured gateway routes',
+            cli: {
+                type: String,
+                hide: true,
+            },
             scope: 'storage',
         },
     },

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

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
-import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from '../../../java/support/files.js';
+import { javaMainPackageTemplatesBlock } from '../../../java/support/files.js';
 const WAIT_TIMEOUT = 3 * 60000;
 export default class GatewayGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
@@ -29,28 +29,6 @@ export default class GatewayGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster('jhipster:java:build-tool');
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async promptCommand({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.promptCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
     get configuring() {
         return this.asConfiguringTaskGroup({
             reactiveByDefault() {
@@ -68,19 +46,10 @@ export default class GatewayGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.CONFIGURING]() {
         return this.delegateTasksToBlueprint(() => this.configuring);
     }
-    get loading() {
-        return this.asLoadingTaskGroup({
-            async loadConfig({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.LOADING]() {
-        return this.delegateTasksToBlueprint(() => this.loading);
-    }
     get preparing() {
         return this.asPreparingTaskGroup({
             prepareGateway({ application }) {
+                application.gatewayServicesApiAvailable = application.serviceDiscoveryAny || !application.reactive;
                 application.gatewayRoutes = (application.routes ?? []).map(routeDef => {
                     const [route, host = route, serverPort = '8080'] = routeDef.split(':');
                     return { route, serverPort, host };
@@ -93,6 +62,17 @@ export default class GatewayGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
+            cleanup({ control, application }) {
+                control.cleanupFiles({
+                    '8.6.1': [
+                        [
+                            application.reactive && application.serviceDiscoveryAny,
+                            `${application.javaPackageSrcDir}/web/filter/ModifyServersOpenApiFilter.java`,
+                            `${application.javaPackageTestDir}/web/filter/ModifyServersOpenApiFilterTest.java`,
+                        ],
+                    ],
+                });
+            },
             async writing({ application }) {
                 await this.writeFiles({
                     blocks: [
@@ -101,12 +81,16 @@ export default class GatewayGenerator extends BaseApplicationGenerator {
                             templates: ['security/jwt/JWTRelayGatewayFilterFactory.java'],
                         }),
                         javaMainPackageTemplatesBlock({
-                            condition: ctx => ctx.reactive && ctx.serviceDiscoveryAny,
-                            templates: ['web/rest/vm/RouteVM.java', 'web/rest/GatewayResource.java', 'web/filter/ModifyServersOpenApiFilter.java'],
+                            condition: ctx => ctx.serviceDiscoveryAny || !ctx.reactive,
+                            templates: ['web/rest/vm/RouteVM.java'],
+                        }),
+                        javaMainPackageTemplatesBlock({
+                            condition: ctx => !ctx.reactive,
+                            templates: ['web/rest/GatewayResource_imperative.java'],
                         }),
-                        javaTestPackageTemplatesBlock({
+                        javaMainPackageTemplatesBlock({
                             condition: ctx => ctx.reactive && ctx.serviceDiscoveryAny,
-                            templates: ['web/filter/ModifyServersOpenApiFilterTest.java'],
+                            templates: ['web/rest/GatewayResource_reactive.java'],
                         }),
                     ],
                     context: application,