Merge pull request #419 from mshima/adjusts

Adjusts
jhipster · Aug 1, 2024 · 53ec84d · 53ec84d
2 parents ebdf753 + d48626f
commit 53ec84d
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 51 deletions.
diff --git a/.blueprint/generate-sample/command.mjs b/.blueprint/generate-sample/command.mjs
@@ -38,7 +38,7 @@ const command = {
     configs: {
         sampleName: {
             prompt: gen => ({
-                when: !gen.all && existsSync(gen.templatePath(gen.samplesFolder)),
+                when: !gen.jdlSamples && !gen.appSample && !gen.all && existsSync(gen.templatePath(gen.samplesFolder)),
                 type: 'list',
                 message: 'which sample do you want to generate?',
                 choices: async () => getSamples(gen.templatePath(gen.samplesFolder)),

diff --git a/generators/migration/generator.js b/generators/migration/generator.js
@@ -5,21 +5,17 @@ export default class extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.asPreparingTaskGroup({
             async source({ application, source }) {
-                this.queueTask({
-                    method: () => {
-                        source.addAllowBlockingCallsInside = () => undefined;
-                        source.addApplicationPropertiesContent = () => undefined;
-                        source.addIntegrationTestAnnotation = () => undefined;
-                        source.addTestSpringFactory = () => undefined;
+                this.delayTask(() => {
+                    source.addAllowBlockingCallsInside = () => undefined;
+                    source.addApplicationPropertiesContent = () => undefined;
+                    source.addIntegrationTestAnnotation = () => undefined;
+                    source.addTestSpringFactory = () => undefined;
 
-                        if (application.buildToolGradle) {
-                            // Add a noop needles for spring-gateway generator
-                            source.addJavaDefinition = () => {};
-                            source.addJavaDependencies = () => {};
-                        }
-                    },
-                    taskName: `${this.runningState.methodName}(delayed)`,
-                    queueName: this.runningState.queueName,
+                    if (application.buildToolGradle) {
+                        // Add a noop needles for spring-gateway generator
+                        source.addJavaDefinition = () => {};
+                        source.addJavaDependencies = () => {};
+                    }
                 });
             },
         });
@@ -89,4 +85,12 @@ export default class extends BaseApplicationGenerator {
             },
         });
     }
+
+    delayTask(method) {
+        this.queueTask({
+            method,
+            taskName: `${this.runningState.methodName}(delayed)`,
+            queueName: this.runningState.queueName,
+        });
+    }
 }
diff --git a/generators/spring-boot/command.js b/generators/spring-boot/command.js
@@ -9,7 +9,6 @@ const command = {
         ...springBootCommand.configs,
     },
     import: ['jhipster-kotlin:ktlint'],
-    compose: ['jhipster-kotlin:detekt'],
 };
 
 export default command;
diff --git a/generators/spring-boot/generator.js b/generators/spring-boot/generator.js
@@ -35,7 +35,7 @@ const JAVA_COMPATIBLE_VERSIONS = ['17'];
 
 export default class extends BaseApplicationGenerator {
     constructor(args, options, features) {
-        super(args, options, { ...features, jhipster7Migration: true, checkBlueprint: true, inheritTasks: true });
+        super(args, options, { ...features, jhipster7Migration: true, checkBlueprint: true, inheritTasks: true, queueCommandTasks: true });
 
         this.jhipsterTemplatesFolders = [
             this.templatePath(),
@@ -55,8 +55,8 @@ export default class extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.COMPOSING]() {
         const mainComposing = super.composing;
         return this.asComposingTaskGroup({
-            async composingTemplateTask() {
-                await this.composeCurrentJHipsterCommand();
+            async composeDetekt() {
+                await this.composeWithJHipster('jhipster-kotlin:detekt');
             },
             async composeWithPostWriting() {
                 await this.composeWithJHipster('docker');
@@ -121,6 +121,8 @@ export default class extends BaseApplicationGenerator {
                             'ElasticsearchExceptionMapper.java',
                             'ElasticsearchExceptionMapperTest.java',
                             'QuerySyntaxException.java',
+                            '_enumName_.java',
+                            '_persistClass_.java.jhi.jackson_identity_info.ejs',
                         ].includes(sourceBasename)
                             ? undefined
                             : file;
@@ -282,38 +284,34 @@ export default class extends BaseApplicationGenerator {
                 });
             },
             addCacheNeedles({ source, application }) {
-                this.queueTask({
-                    method: () => {
-                        if (application.cacheProviderEhcache) {
-                            const cacheConfigurationFile = `src/main/kotlin/${application.packageFolder}config/CacheConfiguration.kt`;
-                            const needle = `${application.cacheProvider}-add-entry`;
-                            const useJcacheConfiguration = application.cacheProviderRedis;
-                            const addEntryToCacheCallback = entry =>
-                                createNeedleCallback({
-                                    needle,
-                                    contentToAdd: `createCache(cm, ${entry}${useJcacheConfiguration ? ', jcacheConfiguration' : ''})`,
-                                });
-
-                            source.addEntryToCache = ({ entry }) => this.editFile(cacheConfigurationFile, addEntryToCacheCallback(entry));
-                            source.addEntityToCache = ({ entityAbsoluteClass, relationships }) => {
-                                const entry = `${entityAbsoluteClass}::class.java.name`;
-                                this.editFile(
-                                    cacheConfigurationFile,
-                                    addEntryToCacheCallback(entry),
-                                    ...(relationships ?? [])
-                                        .filter(rel => rel.collection)
-                                        .map(rel => addEntryToCacheCallback(`${entry} + ".${rel.propertyName}"`)),
-                                );
-                            };
-                        } else {
-                            // Add noop
-                            source.addEntryToCache = () => {};
-                            // Add noop
-                            source.addEntityToCache = () => {};
-                        }
-                    },
-                    taskName: `${this.runningState.methodName}(delayed)`,
-                    queueName: this.runningState.queueName,
+                this.delayTask(() => {
+                    if (application.cacheProviderEhcache) {
+                        const cacheConfigurationFile = `src/main/kotlin/${application.packageFolder}config/CacheConfiguration.kt`;
+                        const needle = `${application.cacheProvider}-add-entry`;
+                        const useJcacheConfiguration = application.cacheProviderRedis;
+                        const addEntryToCacheCallback = entry =>
+                            createNeedleCallback({
+                                needle,
+                                contentToAdd: `createCache(cm, ${entry}${useJcacheConfiguration ? ', jcacheConfiguration' : ''})`,
+                            });
+
+                        source.addEntryToCache = ({ entry }) => this.editFile(cacheConfigurationFile, addEntryToCacheCallback(entry));
+                        source.addEntityToCache = ({ entityAbsoluteClass, relationships }) => {
+                            const entry = `${entityAbsoluteClass}::class.java.name`;
+                            this.editFile(
+                                cacheConfigurationFile,
+                                addEntryToCacheCallback(entry),
+                                ...(relationships ?? [])
+                                    .filter(rel => rel.collection)
+                                    .map(rel => addEntryToCacheCallback(`${entry} + ".${rel.propertyName}"`)),
+                            );
+                        };
+                    } else {
+                        // Add noop
+                        source.addEntryToCache = () => {};
+                        // Add noop
+                        source.addEntityToCache = () => {};
+                    }
                 });
             },
         });
@@ -546,4 +544,12 @@ export default class extends BaseApplicationGenerator {
             },
         });
     }
+
+    delayTask(method) {
+        this.queueTask({
+            method,
+            taskName: `${this.runningState.methodName}(delayed)`,
+            queueName: this.runningState.queueName,
+        });
+    }
 }