spring-boot: move spring-boot:feign-client to spring-cloud:openfeign (#31857)

Author: mshima

generators/generate-blueprint/__snapshots__/generator.spec.ts.snap

@@ -1133,21 +1133,6 @@ exports[`generator - generate-blueprint with all option should match snapshot 1`
   "generators/spring-boot/generators/cucumber/templates/template-file-spring-boot:cucumber.ejs": {
     "stateCleared": "modified",
   },
-  "generators/spring-boot/generators/feign-client/command.js": {
-    "stateCleared": "modified",
-  },
-  "generators/spring-boot/generators/feign-client/generator.js": {
-    "stateCleared": "modified",
-  },
-  "generators/spring-boot/generators/feign-client/generator.spec.js": {
-    "stateCleared": "modified",
-  },
-  "generators/spring-boot/generators/feign-client/index.js": {
-    "stateCleared": "modified",
-  },
-  "generators/spring-boot/generators/feign-client/templates/template-file-spring-boot:feign-client.ejs": {
-    "stateCleared": "modified",
-  },
   "generators/spring-boot/generators/jwt/command.js": {
     "stateCleared": "modified",
   },
@@ -1223,6 +1208,21 @@ exports[`generator - generate-blueprint with all option should match snapshot 1`
   "generators/spring-cloud/generator.spec.js": {
     "stateCleared": "modified",
   },
+  "generators/spring-cloud/generators/feign-client/command.js": {
+    "stateCleared": "modified",
+  },
+  "generators/spring-cloud/generators/feign-client/generator.js": {
+    "stateCleared": "modified",
+  },
+  "generators/spring-cloud/generators/feign-client/generator.spec.js": {
+    "stateCleared": "modified",
+  },
+  "generators/spring-cloud/generators/feign-client/index.js": {
+    "stateCleared": "modified",
+  },
+  "generators/spring-cloud/generators/feign-client/templates/template-file-spring-cloud:feign-client.ejs": {
+    "stateCleared": "modified",
+  },
   "generators/spring-cloud/generators/gateway/command.js": {
     "stateCleared": "modified",
   },

generators/generate-blueprint/internal/lookup-namespaces.spec.ts

@@ -98,12 +98,12 @@ describe('lookupGeneratorsNamespaces', () => {
   "spring-boot",
   "spring-boot:bootstrap",
   "spring-boot:cucumber",
-  "spring-boot:feign-client",
   "spring-boot:jwt",
   "spring-boot:oauth2",
   "spring-boot:websocket",
   "spring-cache",
   "spring-cloud",
+  "spring-cloud:feign-client",
   "spring-cloud:gateway",
   "spring-cloud:kafka",
   "spring-cloud:pulsar",

generators/spring-boot/generator.ts

@@ -176,7 +176,7 @@ export default class SpringBootGenerator extends SpringBootApplicationGenerator
           await this.composeWithJHipster('jhipster:java-simple-application:openapi-generator');
         }
 
-        if (applicationType !== 'monolith' || messageBroker !== 'no' || serviceDiscoveryType !== 'no') {
+        if (applicationType !== 'monolith' || messageBroker !== 'no' || serviceDiscoveryType !== 'no' || feignClient) {
           await this.composeWithJHipster('jhipster:spring-cloud');
         }
 
@@ -186,9 +186,6 @@ export default class SpringBootGenerator extends SpringBootApplicationGenerator
         if (testFrameworks?.includes(GATLING)) {
           await this.composeWithJHipster('jhipster:java:gatling');
         }
-        if (feignClient) {
-          await this.composeWithJHipster('jhipster:spring-boot:feign-client');
-        }
 
         if (databaseType === SQL) {
           await this.composeWithJHipster('jhipster:spring-data:relational');
@@ -808,18 +805,6 @@ ${classProperties
           source.addAllowBlockingCallsInside?.({ classPath: 'org.springdoc.core.service.AbstractRequestService', method: 'build' });
         }
       },
-      addFeignReactor({ application, source }) {
-        const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, reactive } = application;
-        if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) {
-          const groupId = 'com.playtika.reactivefeign';
-          source.addJavaDependencies?.([
-            { groupId, artifactId: 'feign-reactor-bom', type: 'pom', scope: 'import', version: javaDependencies!['feign-reactor-bom'] },
-            { groupId, artifactId: 'feign-reactor-cloud' },
-            { groupId, artifactId: 'feign-reactor-spring-configuration' },
-            { groupId, artifactId: 'feign-reactor-webclient' },
-          ]);
-        }
-      },
       addSpringSnapshotRepository({ application, source }) {
         if (application.buildToolMaven) {
           if (application.addSpringMilestoneRepository) {

generators/spring-cloud/generator.ts

@@ -50,18 +50,20 @@ export default class SpringCloudGenerator extends SpringCloudApplicationGenerato
   get composing() {
     return this.asComposingTaskGroup({
       async composeCloud() {
-        const { applicationType, messageBroker } = this.jhipsterConfigWithDefaults;
+        const { applicationType, feignClient, messageBroker } = this.jhipsterConfigWithDefaults;
 
         if (applicationType === 'gateway') {
           await this.composeWithJHipster('jhipster:spring-cloud:gateway');
         }
-
         if (messageBroker === 'kafka') {
           await this.composeWithJHipster('jhipster:spring-cloud:kafka');
         }
         if (messageBroker === 'pulsar') {
           await this.composeWithJHipster('jhipster:spring-cloud:pulsar');
         }
+        if (feignClient) {
+          await this.composeWithJHipster('jhipster:spring-cloud:feign-client');
+        }
       },
     });
   }

…ent/__snapshots__/generator.spec.ts.snap …ent/__snapshots__/generator.spec.ts.snapgenerators/spring-boot/generators/feign-client/__snapshots__/generator.spec.ts.snap renamed to generators/spring-cloud/generators/feign-client/__snapshots__/generator.spec.ts.snap generators/spring-boot/generators/feign-client/__snapshots__/generator.spec.ts.snap renamed to generators/spring-cloud/generators/feign-client/__snapshots__/generator.spec.ts.snap

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import { SpringBootApplicationGenerator } from '../../generator.ts';
+import { SpringBootApplicationGenerator } from '../../../spring-boot/generator.ts';
 
 import cleanupTask from './cleanup.ts';
 import { feignFiles } from './files.ts';
@@ -66,6 +66,18 @@ export default class FeignClientGenerator extends SpringBootApplicationGenerator
           });
         }
       },
+      addFeignReactor({ application, source }) {
+        const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, reactive } = application;
+        if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) {
+          const groupId = 'com.playtika.reactivefeign';
+          source.addJavaDependencies?.([
+            { groupId, artifactId: 'feign-reactor-bom', type: 'pom', scope: 'import', version: javaDependencies!['feign-reactor-bom'] },
+            { groupId, artifactId: 'feign-reactor-cloud' },
+            { groupId, artifactId: 'feign-reactor-spring-configuration' },
+            { groupId, artifactId: 'feign-reactor-webclient' },
+          ]);
+        }
+      },
     });
   }