npm - generator-jhipster - Versions diffs - 8.6.0 → 8.7.0 - Mend

generator-jhipster 8.6.0 → 8.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (867) hide show

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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.32.0' }
+redisson = { module = 'org.redisson:redisson', version = '3.35.0' }

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

@@ -250,7 +250,7 @@ public class CacheConfiguration {
 <%_ } _%>
 <%_ if (cacheProviderHazelcast) { _%>
-    private static 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 static 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 static 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 CHANGED Viewed

@@ -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/generator.js CHANGED Viewed

@@ -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,

package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/rest/GatewayResource_imperative.java.ejs ADDED Viewed

@@ -0,0 +1,126 @@
+<%#
+ 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;
+import <%= packageName %>.security.AuthoritiesConstants;
+import <%= packageName %>.web.rest.vm.RouteVM;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.function.HandlerFunction;
+import org.springframework.web.servlet.function.RequestPredicate;
+import org.springframework.web.servlet.function.RouterFunction;
+import org.springframework.web.servlet.function.RouterFunctions;
+import org.springframework.web.servlet.function.ServerRequest;
+/**
+ * REST controller for managing Gateway configuration.
+ */
+@RestController
+@RequestMapping("/api/gateway")
+@SuppressWarnings("rawtypes")
+public class GatewayResource {
+    private final RouterFunction gatewayCompositeRouterFunction;
+    @Value("${spring.application.name}")
+    private String appName;
+    public GatewayResource(RouterFunction gatewayCompositeRouterFunction) {
+        this.gatewayCompositeRouterFunction = gatewayCompositeRouterFunction;
+    }
+    /**
+     * {@code GET  /routes} : get the active routes.
+     *
+     * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the list of routes.
+     */
+    @GetMapping("/routes")
+    @Secured(AuthoritiesConstants.ADMIN)
+    public ResponseEntity<List<RouteVM>> activeRoutes() {
+        var routes = getRouterFunctions();
+        var routeVMs = new ArrayList<RouteVM>();
+        routes.keySet().forEach(key -> {
+            var routeVM = new RouteVM();
+            var serviceId = key.substring(0, key.indexOf("_")).toLowerCase();
+            routeVM.setServiceId(serviceId + "Service");
+            var route = routes.get(key);
+            // Format "RouterFunction routeId=gateway_route delegate=/services/gateway/** -> ProxyExchangeHandlerFunction"
+            var predicate = route.toString().split(" ")[2].split("=")[1];
+            routeVM.setPath(predicate.substring(0, predicate.length() - 2));
+            // Exclude gateway app from routes
+            if (!serviceId.equalsIgnoreCase(appName)) {
+                routeVMs.add(routeVM);
+            }
+        });
+        return ResponseEntity.ok(routeVMs);
+    }
+    /* Based on https://github.com/spring-cloud/spring-cloud-gateway/issues/3233#issuecomment-1989318818 */
+    private Map<String, RouterFunction> getRouterFunctions() {
+        AtomicReference<Map<String, RouterFunction>> routerFunctionsRef = new AtomicReference<>();
+        gatewayCompositeRouterFunction.accept(
+            new AbstractRouterFunctionsVisitor() {
+                @Override
+                @SuppressWarnings("unchecked")
+                public void attributes(Map<String, Object> attributes) {
+                    if (attributes.containsKey("gatewayRouterFunctions")) {
+                        Map<String, RouterFunction> map = (Map<String, RouterFunction>) attributes.get("gatewayRouterFunctions");
+                        routerFunctionsRef.compareAndSet(null, map);
+                    }
+                }
+            }
+        );
+        Map<String, RouterFunction> routerFunctions = routerFunctionsRef.get();
+        return routerFunctions;
+    }
+    abstract static class AbstractRouterFunctionsVisitor implements RouterFunctions.Visitor {
+        @Override
+        public void startNested(RequestPredicate predicate) {}
+        @Override
+        public void endNested(RequestPredicate predicate) {}
+        @Override
+        public void route(RequestPredicate predicate, HandlerFunction<?> handlerFunction) {}
+        @Override
+        public void resources(Function<ServerRequest, Optional<Resource>> lookupFunction) {}
+        @Override
+        public void attributes(Map<String, Object> attributes) {}
+        @Override
+        public void unknown(RouterFunction<?> routerFunction) {}
+    }
+}

package/dist/generators/spring-cloud-stream/generators/kafka/files.js CHANGED Viewed

@@ -1,4 +1,4 @@
-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';
 import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../../../server/support/index.js';
 export const kafkaFiles = {
     config: [

package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_imperative.java.ejs CHANGED Viewed

@@ -34,12 +34,12 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 @Component
 public class KafkaConsumer implements Consumer<String> {
-    private static final Logger log = LoggerFactory.getLogger(KafkaConsumer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumer.class);
     private Map<String, SseEmitter> emitters = new HashMap<>();
     public SseEmitter register(String key) {
-        log.debug("Registering sse client for {}", key);
+        LOG.debug("Registering sse client for {}", key);
         SseEmitter emitter = new SseEmitter();
         emitter.onCompletion(() -> emitters.remove(key));
         emitters.put(key, emitter);
@@ -47,13 +47,13 @@ public class KafkaConsumer implements Consumer<String> {
     }
     public void unregister(String key) {
-        log.debug("Unregistering sse emitter for: {}", key);
+        LOG.debug("Unregistering sse emitter for: {}", key);
         Optional.ofNullable(emitters.get(key)).ifPresent(SseEmitter::complete);
     }
     @Override
     public void accept(String input) {
-        log.debug("Got message from kafka stream: {}", input);
+        LOG.debug("Got message from kafka stream: {}", input);
         emitters
             .entrySet()
             .stream()
@@ -62,7 +62,7 @@ public class KafkaConsumer implements Consumer<String> {
                 try {
                     emitter.send(event().data(input, MediaType.TEXT_PLAIN));
                 } catch (IOException e) {
-                    log.debug("error sending sse message, {}", input);
+                    LOG.debug("error sending sse message, {}", input);
                 }
             });
     }

package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_reactive.java.ejs CHANGED Viewed

@@ -29,7 +29,7 @@ import reactor.core.publisher.Sinks;
 @Component
 public class KafkaConsumer implements Consumer<String> {
-    private static final Logger log = LoggerFactory.getLogger(KafkaConsumer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumer.class);
     private Sinks.Many<String> sink = Sinks.many().unicast().onBackpressureBuffer();
@@ -39,7 +39,7 @@ public class KafkaConsumer implements Consumer<String> {
     @Override
     public void accept(String input) {
-        log.debug("Got message from kafka stream: {}", input);
+        LOG.debug("Got message from kafka stream: {}", input);
         sink.emitNext(input, Sinks.EmitFailureHandler.FAIL_FAST);
     }
 }

package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs CHANGED Viewed

@@ -33,7 +33,7 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
     private static final String PRODUCER_BINDING_NAME = "binding-out-0";
-    private static final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
     private final KafkaConsumer kafkaConsumer;
     private final StreamBridge streamBridge;
@@ -44,7 +44,7 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
     @PostMapping("/publish")
     public void publish(@RequestParam("message") String message) {
-        log.debug("REST request the message : {} to send to Kafka topic ", message);
+        LOG.debug("REST request the message : {} to send to Kafka topic ", message);
         streamBridge.send(PRODUCER_BINDING_NAME, message);
     }

package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs CHANGED Viewed

@@ -34,7 +34,7 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
     private static final String PRODUCER_BINDING_NAME = "binding-out-0";
-    private static final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(<%= upperFirstCamelCaseBaseName %>KafkaResource.class);
     private final KafkaConsumer kafkaConsumer;
     private final StreamBridge streamBridge;
@@ -45,14 +45,14 @@ public class <%= upperFirstCamelCaseBaseName %>KafkaResource {
     @PostMapping("/publish")
     public Mono<ResponseEntity<Void>> publish(@RequestParam("message") String message) {
-        log.debug("REST request the message : {} to send to Kafka topic", message);
+        LOG.debug("REST request the message : {} to send to Kafka topic", message);
         streamBridge.send(PRODUCER_BINDING_NAME, message);
         return Mono.just(ResponseEntity.noContent().build());
     }
     @GetMapping("/consume")
     public Flux<String> consume() {
-        log.debug("REST request to consume records from Kafka topics");
+        LOG.debug("REST request to consume records from Kafka topics");
         return this.kafkaConsumer.getFlux();
     }
 }

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

@@ -29,7 +29,7 @@ import org.testcontainers.utility.DockerImageName;
 public class KafkaTestContainer implements InitializingBean, DisposableBean {
     private KafkaContainer kafkaContainer;
-    private static final Logger log = LoggerFactory.getLogger(KafkaTestContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaTestContainer.class);
     @Override
     public void destroy() {
@@ -42,7 +42,7 @@ public class KafkaTestContainer implements InitializingBean, DisposableBean {
     public void afterPropertiesSet() {
         if (null == kafkaContainer) {
             kafkaContainer = new KafkaContainer(DockerImageName.parse("<%- dockerContainers.kafka %>"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withReuse(true);
         }
         if (!kafkaContainer.isRunning()) {

package/dist/generators/spring-cloud-stream/generators/pulsar/files.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { SERVER_TEST_SRC_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../../../generator-constants.js';
+import { GRADLE_BUILD_SRC_MAIN_DIR, SERVER_TEST_SRC_DIR } from '../../../generator-constants.js';
 import { moveToJavaPackageTestDir } from '../../../java/support/index.js';
 export const pulsarFiles = {
     config: [

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

@@ -29,7 +29,7 @@ import org.testcontainers.utility.DockerImageName;
 public class PulsarTestContainer implements InitializingBean, DisposableBean {
     private PulsarContainer pulsarContainer;
-    private static final Logger log = LoggerFactory.getLogger(PulsarTestContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PulsarTestContainer.class);
     @Override
     public void destroy() {
@@ -42,7 +42,7 @@ public class PulsarTestContainer implements InitializingBean, DisposableBean {
     public void afterPropertiesSet() {
         if (null == pulsarContainer) {
             pulsarContainer = new PulsarContainer(DockerImageName.parse("<%- dockerContainers.pulsar %>"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withReuse(true);
         }
         if (!pulsarContainer.isRunning()) {

package/dist/generators/spring-data-cassandra/files.js CHANGED Viewed

@@ -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 } from '../generator-constants.js';
+import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js';
 import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/support/index.js';
 export const cassandraFiles = {
     serverFiles: [