adjusts

jhipster · Aug 1, 2024 · 8b276c1 · 8b276c1
1 parent ebdf753
commit 8b276c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 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/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;