kafka: split kafka configuration

Author: mshima

generators/spring-boot/templates/src/main/resources/config/application.yml.ejs

@@ -171,13 +171,9 @@ mongock:
 
 <%_ } _%>
 spring:
-<%_ if (databaseTypeSql && messageBrokerKafka) { _%>
-  autoconfigure:
-    exclude: org.springframework.boot.actuate.autoconfigure.metrics.jdbc.DataSourcePoolMetricsAutoConfiguration
-<%_ } _%>
   application:
     name: <%= baseName %>
-<%_ if (serviceDiscoveryConsul || applicationTypeGateway || messageBrokerKafka) { _%>
+<%_ if (serviceDiscoveryConsul || applicationTypeGateway) { _%>
   cloud:
   <%_ if (serviceDiscoveryConsul) { _%>
     consul:
@@ -255,27 +251,6 @@ spring:
           # See alternatives in https://github.com/spring-cloud/spring-cloud-gateway/issues/3818
           trusted-proxies: '.*'
   <%_ } _%>
-  <%_ if (messageBrokerKafka) { _%>
-    function:
-      definition: kafkaConsumer;kafkaProducer
-    stream:
-      kafka:
-        binder:
-          replicationFactor: 1
-          auto-create-topics: true
-          brokers: localhost:9092
-      bindings:
-        binding-out-0:
-          content-type: text/plain
-          group: <%= dasherizedBaseName %>
-        kafkaConsumer-in-0:
-          destination: sse-topic
-          content-type: text/plain
-          group: <%= dasherizedBaseName %>
-        kafkaProducer-out-0:
-          content-type: text/plain
-          group: <%= dasherizedBaseName %>
-  <%_ } _%>
 <%_ } _%>
 <%_ if ('dockerServices' in locals && dockerServices?.length) { _%>
   docker:

generators/spring-cloud/generators/kafka/__snapshots__/generator.spec.ts.snap

@@ -101,6 +101,9 @@ exports[`generator - spring-cloud:kafka with defaults options should match files
   "src/main/java/com/mycompany/myapp/web/rest/JhipsterKafkaResource.java": {
     "stateCleared": "modified",
   },
+  "src/main/resources/config/application-kafka.yml": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/mycompany/myapp/config/KafkaTestContainer.java": {
     "stateCleared": "modified",
   },

generators/spring-cloud/generators/kafka/files.ts

@@ -17,29 +17,31 @@
  * limitations under the License.
  */
 import { asWriteFilesSection } from '../../../base-application/support/task-type-inference.ts';
-import { SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../../../generator-constants.ts';
-import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../../../java/support/index.ts';
+import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../../../generator-constants.ts';
+import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir, moveToSrcMainResourcesDir } from '../../../java/support/index.ts';
 
 export const kafkaFiles = asWriteFilesSection({
-  config: [
-    {
-      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-      renameTo: moveToJavaPackageSrcDir,
-      templates: [data => `broker/KafkaConsumer_${data.imperativeOrReactive}.java`, 'broker/KafkaProducer.java'],
-    },
-  ],
-  resources: [
+  base: [
     {
       path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
+        data => `broker/KafkaConsumer_${data.imperativeOrReactive}.java`,
+        'broker/KafkaProducer.java',
         {
           sourceFile: data => `web/rest/KafkaResource_${data.imperativeOrReactive}.java`,
           destinationFile: data => `web/rest/${data.upperFirstCamelCaseBaseName}KafkaResource.java`,
         },
       ],
     },
   ],
+  resources: [
+    {
+      path: `${SERVER_MAIN_RES_DIR}`,
+      renameTo: moveToSrcMainResourcesDir,
+      templates: ['config/application-kafka.yml'],
+    },
+  ],
   test: [
     {
       path: `${SERVER_TEST_SRC_DIR}_package_/`,

generators/spring-cloud/generators/kafka/generator.ts

@@ -34,6 +34,19 @@ export default class KafkaGenerator extends SpringBootApplicationGenerator {
     }
   }
 
+  get preparing() {
+    return this.asPreparingTaskGroup({
+      preparing({ application }) {
+        application.devActiveProfiles.push('kafka');
+        application.prodActiveProfiles.push('kafka');
+      },
+    });
+  }
+
+  get [SpringBootApplicationGenerator.PREPARING]() {
+    return this.delegateTasksToBlueprint(() => this.preparing);
+  }
+
   get writing() {
     return this.asWritingTaskGroup({
       async cleanup({ application, control }) {

generators/spring-cloud/generators/kafka/templates/src/main/resources/config/application-kafka.yml.ejs

@@ -0,0 +1,21 @@
+spring:
+  cloud:
+    function:
+      definition: kafkaConsumer;kafkaProducer
+    stream:
+      kafka:
+        binder:
+          replicationFactor: 1
+          auto-create-topics: true
+          brokers: localhost:9092
+      bindings:
+        binding-out-0:
+          content-type: text/plain
+          group: <%= dasherizedBaseName %>
+        kafkaConsumer-in-0:
+          destination: sse-topic
+          content-type: text/plain
+          group: <%= dasherizedBaseName %>
+        kafkaProducer-out-0:
+          content-type: text/plain
+          group: <%= dasherizedBaseName %>