Merge pull request #426 from mshima/migration

Use modular templates for gateway, Kafka and feign-client generators
jhipster · Aug 5, 2024 · 23b0a3f · 23b0a3f
2 parents df234e0 + 74f0ede
commit 23b0a3f
Show file tree

Hide file tree

Showing 32 changed files with 77 additions and 81 deletions.
diff --git a/...eprint/generate-sample/templates/jdl-samples/mf-ng-eureka-jwt-psql-ehcache/blog-store.jdl b/...eprint/generate-sample/templates/jdl-samples/mf-ng-eureka-jwt-psql-ehcache/blog-store.jdl
@@ -48,6 +48,7 @@ application {
     cacheProvider ehcache
     clientFramework angular
     creationTimestamp 1617901618887
+    feignClient true
     jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ="
     // tests are not stable enough
     // messageBroker pulsar
@@ -72,6 +73,7 @@ application {
     creationTimestamp 1617901618888
     dtoSuffix Rest
     entitySuffix Entity
+    feignClient true
     jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ="
     // tests are not stable enough
     // messageBroker pulsar

diff --git a/.blueprint/generate-sample/templates/jdl-samples/ms-mf-ng-consul-oauth2-neo4j/blog-store.jdl b/.blueprint/generate-sample/templates/jdl-samples/ms-mf-ng-consul-oauth2-neo4j/blog-store.jdl
@@ -49,6 +49,7 @@ application {
     clientFramework angular
     creationTimestamp 1617901618887
     databaseType neo4j
+    feignClient true
     jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ="
     packageName com.okta.developer.blog
     serverPort 8081
@@ -70,6 +71,7 @@ application {
     databaseType neo4j
     dtoSuffix Rest
     entitySuffix Entity
+    feignClient true
     jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ="
     packageName com.okta.developer.store
     serverPort 8082

diff --git a/...eprint/generate-sample/templates/jdl-samples/ms-ng-oauth2-mongodb-caffeine/blog-store.jdl b/...eprint/generate-sample/templates/jdl-samples/ms-ng-oauth2-mongodb-caffeine/blog-store.jdl
@@ -73,6 +73,7 @@ application {
     databaseType mongodb
     dtoSuffix Rest
     entitySuffix Entity
+    feignClient true
     jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ="
     messageBroker kafka
     packageName com.okta.developer.store

diff --git a/generators/spring-boot-v2/generator.js b/generators/spring-boot-v2/generator.js
@@ -97,6 +97,9 @@ export default class extends BaseApplicationGenerator {
                                 ['EntityDTO', '_dtoClass_'],
                                 [/\/Entity(.*)\./, '/_entityClass_$1.'],
                                 ['/BaseEntityMapper.', '/EntityMapper.'],
+                                ['JWT_UserFeignClientInterceptor.', 'UserFeignClientInterceptor_jwt.'],
+                                ['OAuth2UserClientFeignConfiguration.', 'OAuth2InterceptedFeignConfiguration.'],
+                                ['OAuth2_UserFeignClientInterceptor.', 'TokenRelayRequestInterceptor.'],
                             ]) {
                                 // Files renamed in v8
                                 sourceFile = sourceFile.replace(...fileMap);
@@ -184,6 +187,12 @@ export default class extends BaseApplicationGenerator {
                             'gradlew.bat',
                             // jhipster:java:docker
                             'entrypoint.sh',
+                            // jhipster:spring-cloud:gateway
+                            'JWTRelayGatewayFilterFactory.java',
+                            'ModifyServersOpenApiFilter.java',
+                            'GatewayResource.java',
+                            'RouteVM.java',
+                            'ModifyServersOpenApiFilterTest.java',
                             // jhipster:spring-data-couchbase
                             'DatabaseConfiguration_couchbase.java',
                             // jhipster:spring-data-cassandra
@@ -235,6 +244,28 @@ export default class extends BaseApplicationGenerator {
                             'docker.gradle',
                             // jhipster:java:code-quality
                             'sonar.gradle',
+                            // jhipster:feign-client
+                            'AuthorizedFeignClient.java',
+                            'OAuth2InterceptedFeignConfiguration.java',
+                            'TokenRelayRequestInterceptor.java',
+                            'FeignConfiguration.java',
+                            'JWT_UserFeignClientInterceptor.java',
+                            'OAuth2UserClientFeignConfiguration.java',
+                            'OAuth2_UserFeignClientInterceptor.java',
+                            'AuthorizationHeaderUtilTest.java',
+                            'AuthorizationHeaderUtil.java',
+                            'OAuthIdpTokenResponseDTO.java',
+                            // jhipster:spring-cloud-stream:kafka
+                            'KafkaTestContainer.java',
+                            'EmbeddedKafka.java',
+                            'EmbeddedKafka.java',
+                            'EmbeddedKafka.java',
+                            'KafkaResource.java',
+                            'KafkaResourceIT.java',
+                            'KafkaResource_reactive.java',
+                            'KafkaResourceIT_reactive.java',
+                            'KafkaSseConsumer.java',
+                            'KafkaSseProducer.java',
                             // jhipster:java:openapi-generator v7.6.1
                             // 'swagger.gradle',
                         ].includes(sourceBasename)

diff --git a/generators/spring-boot/__snapshots__/matrix.spec.js.snap b/generators/spring-boot/__snapshots__/matrix.spec.js.snap
@@ -3396,9 +3396,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -4028,9 +4025,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -4696,9 +4690,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -5262,9 +5253,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -5909,9 +5897,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -12668,9 +12653,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -13872,9 +13854,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -15076,9 +15055,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -16214,9 +16190,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -17550,9 +17523,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -24529,9 +24499,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -25194,9 +25161,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -25826,9 +25790,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -26503,9 +26464,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -27156,9 +27114,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -27758,9 +27713,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -28330,9 +28282,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -28932,9 +28881,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -29492,9 +29438,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/tech/jhipster/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/tech/jhipster/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/tech/jhipster/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -30253,9 +30196,6 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol
   "src/main/kotlin/com/mycompany/security/oauth2/JwtGrantedAuthorityConverter.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/security/oauth2/OAuthIdpTokenResponseDTO.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },

diff --git a/generators/spring-boot/generator.js b/generators/spring-boot/generator.js
@@ -52,16 +52,6 @@ export default class extends BaseApplicationGenerator {
                 application.customizeTemplatePaths.unshift(
                     // Remove package-info.java files
                     file => (file.sourceFile.includes('package-info.java') ? undefined : file),
-                    // Ignore files from generators
-                    file =>
-                        [
-                            'jhipster:spring-cloud:gateway',
-                            'jhipster:feign-client',
-                            'jhipster:spring-cloud-stream:kafka',
-                            'jhipster:spring-cloud-stream:pulsar',
-                        ].includes(file.namespace) && !file.sourceFile.includes('buildSrc')
-                            ? undefined
-                            : file,
                     // Kotling blueprint does not implements these files
                     file => {
                         const sourceBasename = basename(file.sourceFile);
@@ -126,6 +116,7 @@ export default class extends BaseApplicationGenerator {
                                 destinationFile = adjustTestContainersSpringContextCustomizerFactoryFile(destinationFile);
                             }
 
+                            sourceFile = sourceFile.replace('KafkaConsumer_reactive', 'KafkaConsumer_imperative');
                             sourceFile = convertToKotlinFile(sourceFile);
                             destinationFile = convertToKotlinFile(destinationFile);
                         }
@@ -147,6 +138,27 @@ export default class extends BaseApplicationGenerator {
 
                         return { ...file, sourceFile, javaResolvedSourceFile, resolvedSourceFile, destinationFile };
                     },
+                    // Adjust feign-client and kafka destinationFile for jhipster 7 paths
+                    file => {
+                        if (!['jhipster:feign-client', 'jhipster:spring-cloud-stream:kafka'].includes(file.namespace)) return file;
+                        const renamedFiles = file => {
+                            for (const fileMap of [
+                                ['security/oauth2/AuthorizationHeaderUtilTest.', 'client/AuthorizationHeaderUtilTest.'],
+                                ['security/oauth2/AuthorizationHeaderUtil.', 'client/AuthorizationHeaderUtil.'],
+                                ['security/oauth2/OAuthIdpTokenResponseDTO.', 'client/OAuthIdpTokenResponseDTO.'],
+                                ['config/KafkaSseConsumer.', 'broker/KafkaConsumer.'],
+                                ['config/KafkaSseProducer.', 'broker/KafkaProducer.'],
+                            ]) {
+                                // Files renamed in v8
+                                file = file.replace(...fileMap.reverse());
+                            }
+                            return file;
+                        };
+                        return {
+                            ...file,
+                            destinationFile: renamedFiles(file.destinationFile),
+                        };
+                    },
                 );
             },
         });

diff --git a/generators/spring-boot/templates.spec.js b/generators/spring-boot/templates.spec.js
@@ -23,7 +23,9 @@ describe('test if kotlin templates has a matching java template', async () => {
                 // Partials reworked
                 !file.includes('relationship_validators.ejs') &&
                 // Modularized file in JHipster 8
-                !file.includes('_entityClass_Repository'),
+                !file.includes('_entityClass_Repository') &&
+                // Mapped to KafkaResourceIT_imperative
+                !file.includes('KafkaResourceIT_reactive'),
         )) {
             const javaTemplate = file.replace('.kt', '.java').replace('kotlin/_package_', 'java/_package_');
             const possibleTemplates = [];
@@ -38,6 +40,14 @@ describe('test if kotlin templates has a matching java template', async () => {
                 javaTemplateRelativePath = relative(join(__dirname, 'templates', folder), javaTemplate);
                 if (['domain'].includes(folder)) {
                     possibleTemplates.push(join(jhipster8Generators, 'java/generators', folder, 'templates', javaTemplateRelativePath));
+                } else if (['gateway'].includes(folder)) {
+                    possibleTemplates.push(
+                        join(jhipster8Generators, 'spring-cloud/generators', folder, 'templates', javaTemplateRelativePath),
+                    );
+                } else if (['kafka'].includes(folder)) {
+                    possibleTemplates.push(
+                        join(jhipster8Generators, 'spring-cloud-stream/generators', folder, 'templates', javaTemplateRelativePath),
+                    );
                 } else {
                     possibleTemplates.push(join(jhipster8Generators, folder, 'templates', javaTemplateRelativePath));
                 }

diff --git a/...ity/oauth2/AuthorizationHeaderUtil.kt.ejs → ...ge_/client/AuthorizationHeaderUtil.kt.ejs b/...ity/oauth2/AuthorizationHeaderUtil.kt.ejs → ...ge_/client/AuthorizationHeaderUtil.kt.ejs
diff --git a/...kage_/client/AuthorizedFeignClient.kt.ejs → ...kage_/client/AuthorizedFeignClient.kt.ejs b/...kage_/client/AuthorizedFeignClient.kt.ejs → ...kage_/client/AuthorizedFeignClient.kt.ejs
diff --git a/...Auth2InterceptedFeignConfiguration.kt.ejs → ...Auth2InterceptedFeignConfiguration.kt.ejs b/...Auth2InterceptedFeignConfiguration.kt.ejs → ...Auth2InterceptedFeignConfiguration.kt.ejs
diff --git a/...ty/oauth2/OAuthIdpTokenResponseDTO.kt.ejs → ...e_/client/OAuthIdpTokenResponseDTO.kt.ejs b/...ty/oauth2/OAuthIdpTokenResponseDTO.kt.ejs → ...e_/client/OAuthIdpTokenResponseDTO.kt.ejs
diff --git a/...lient/TokenRelayRequestInterceptor.kt.ejs → ...lient/TokenRelayRequestInterceptor.kt.ejs b/...lient/TokenRelayRequestInterceptor.kt.ejs → ...lient/TokenRelayRequestInterceptor.kt.ejs
diff --git a/...ent/JWT_UserFeignClientInterceptor.kt.ejs → ...ent/UserFeignClientInterceptor_jwt.kt.ejs b/...ent/JWT_UserFeignClientInterceptor.kt.ejs → ...ent/UserFeignClientInterceptor_jwt.kt.ejs
diff --git a/...package_/config/FeignConfiguration.kt.ejs → ...package_/config/FeignConfiguration.kt.ejs b/...package_/config/FeignConfiguration.kt.ejs → ...package_/config/FeignConfiguration.kt.ejs
diff --git a/...oauth2/AuthorizationHeaderUtilTest.kt.ejs → ...client/AuthorizationHeaderUtilTest.kt.ejs b/...oauth2/AuthorizationHeaderUtilTest.kt.ejs → ...client/AuthorizationHeaderUtilTest.kt.ejs
diff --git a/...y/jwt/JWTRelayGatewayFilterFactory.kt.ejs → ...y/jwt/JWTRelayGatewayFilterFactory.kt.ejs b/...y/jwt/JWTRelayGatewayFilterFactory.kt.ejs → ...y/jwt/JWTRelayGatewayFilterFactory.kt.ejs
diff --git a/.../filter/ModifyServersOpenApiFilter.kt.ejs → .../filter/ModifyServersOpenApiFilter.kt.ejs b/.../filter/ModifyServersOpenApiFilter.kt.ejs → .../filter/ModifyServersOpenApiFilter.kt.ejs
diff --git a/..._package_/web/rest/GatewayResource.kt.ejs → ..._package_/web/rest/GatewayResource.kt.ejs b/..._package_/web/rest/GatewayResource.kt.ejs → ..._package_/web/rest/GatewayResource.kt.ejs
diff --git a/...tlin/_package_/web/rest/vm/RouteVM.kt.ejs → ...tlin/_package_/web/rest/vm/RouteVM.kt.ejs b/...tlin/_package_/web/rest/vm/RouteVM.kt.ejs → ...tlin/_package_/web/rest/vm/RouteVM.kt.ejs
diff --git a/...ter/ModifyServersOpenApiFilterTest.kt.ejs → ...ter/ModifyServersOpenApiFilterTest.kt.ejs b/...ter/ModifyServersOpenApiFilterTest.kt.ejs → ...ter/ModifyServersOpenApiFilterTest.kt.ejs
diff --git a/.../_package_/config/KafkaSseConsumer.kt.ejs → ...e_/broker/KafkaConsumer_imperative.kt.ejs b/.../_package_/config/KafkaSseConsumer.kt.ejs → ...e_/broker/KafkaConsumer_imperative.kt.ejs
diff --git a/.../_package_/config/KafkaSseProducer.kt.ejs → ...lin/_package_/broker/KafkaProducer.kt.ejs b/.../_package_/config/KafkaSseProducer.kt.ejs → ...lin/_package_/broker/KafkaProducer.kt.ejs
diff --git a/...n/_package_/web/rest/KafkaResource.kt.ejs → .../web/rest/KafkaResource_imperative.kt.ejs b/...n/_package_/web/rest/KafkaResource.kt.ejs → .../web/rest/KafkaResource_imperative.kt.ejs
@@ -44,7 +44,7 @@ import <%= packageName %>.config.KafkaSseProducer
 
 @RestController
 @RequestMapping("/api/<%= dasherizedBaseName %>-kafka")
-class <%= upperFirstCamelCase(baseName) %>KafkaResource(
+class <%= upperFirstCamelCaseBaseName %>KafkaResource(
     @Qualifier(KafkaSseProducer.CHANNELNAME) val output: MessageChannel
 ) {
 

diff --git a/...e_/web/rest/KafkaResource_reactive.kt.ejs → ...e_/web/rest/KafkaResource_reactive.kt.ejs b/...e_/web/rest/KafkaResource_reactive.kt.ejs → ...e_/web/rest/KafkaResource_reactive.kt.ejs
@@ -39,7 +39,7 @@ import <%= packageName %>.config.KafkaSseProducer
 
 @RestController
 @RequestMapping("/api/<%= dasherizedBaseName %>-kafka")
-class <%= upperFirstCamelCase(baseName) %>KafkaResource(@Qualifier(KafkaSseProducer.CHANNELNAME) val output: MessageChannel)  {
+class <%= upperFirstCamelCaseBaseName %>KafkaResource(@Qualifier(KafkaSseProducer.CHANNELNAME) val output: MessageChannel)  {
 
     private val log = LoggerFactory.getLogger(javaClass)
 

diff --git a/...lin/_package_/config/EmbeddedKafka.kt.ejs → ...lin/_package_/config/EmbeddedKafka.kt.ejs b/...lin/_package_/config/EmbeddedKafka.kt.ejs → ...lin/_package_/config/EmbeddedKafka.kt.ejs
diff --git a/...package_/config/KafkaTestContainer.kt.ejs → ...package_/config/KafkaTestContainer.kt.ejs b/...package_/config/KafkaTestContainer.kt.ejs → ...package_/config/KafkaTestContainer.kt.ejs
diff --git a/..._package_/web/rest/KafkaResourceIT.kt.ejs → ...eb/rest/KafkaResourceIT_imperative.kt.ejs b/..._package_/web/rest/KafkaResourceIT.kt.ejs → ...eb/rest/KafkaResourceIT_imperative.kt.ejs
@@ -52,7 +52,7 @@ import <%= packageName %>.config.KafkaSseProducer;
 @AutoConfigureMockMvc
 @WithMockUser
 @EmbeddedKafka
-class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
+class <%= upperFirstCamelCaseBaseName %>KafkaResourceIT {
 
     @Autowired
     private lateinit var collector: MessageCollector