move languages compose to composeComponent

jhipster · May 13, 2024 · f1d66fb · f1d66fb
1 parent f2d5b26
commit f1d66fb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/generators/app/generator.spec.ts b/generators/app/generator.spec.ts
@@ -187,13 +187,13 @@ describe(`generator - ${generator}`, () => {
   "cacheProvider",
   "enableHibernateCache",
   "serverSideOptions",
-  "enableTranslation",
-  "nativeLanguage",
-  "languages",
   "clientFramework",
   "clientTestFrameworks",
   "withAdminUi",
   "clientTheme",
+  "enableTranslation",
+  "nativeLanguage",
+  "languages",
 ]
 `);
       });
@@ -225,14 +225,14 @@ describe(`generator - ${generator}`, () => {
   "enableHibernateCache",
   "serverSideOptions",
   "enableGradleEnterprise",
-  "enableTranslation",
-  "nativeLanguage",
-  "languages",
   "clientFramework",
   "microfrontend",
   "clientTestFrameworks",
   "withAdminUi",
   "clientTheme",
+  "enableTranslation",
+  "nativeLanguage",
+  "languages",
 ]
 `);
       });
@@ -262,10 +262,10 @@ describe(`generator - ${generator}`, () => {
   "databaseType",
   "cacheProvider",
   "serverSideOptions",
+  "clientFramework",
   "enableTranslation",
   "nativeLanguage",
   "languages",
-  "clientFramework",
 ]
 `);
       });

diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts
@@ -164,7 +164,6 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
           cacheProvider,
           skipClient,
           clientFramework,
-          enableTranslation,
           testFrameworks,
           feignClient,
         } = this.jhipsterConfigWithDefaults;
@@ -181,9 +180,6 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
           await this.composeWithJHipster('jhipster:spring-cloud:gateway');
         }
 
-        if (enableTranslation) {
-          await this.composeWithJHipster(GENERATOR_LANGUAGES);
-        }
         if (testFrameworks?.includes(CUCUMBER)) {
           await this.composeWithJHipster(GENERATOR_CUCUMBER);
         }
@@ -225,6 +221,20 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     return this.delegateTasksToBlueprint(() => this.composing);
   }
 
+  get composingComponent() {
+    return this.asComposingComponentTaskGroup({
+      async composeLanguages() {
+        if (this.jhipsterConfigWithDefaults.enableTranslation) {
+          await this.composeWithJHipster(GENERATOR_LANGUAGES);
+        }
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.COMPOSING_COMPONENT]() {
+    return this.delegateTasksToBlueprint(() => this.composingComponent);
+  }
+
   get preparing() {
     return this.asPreparingTaskGroup({
       async loadCommand({ application }) {