Move prompts to spring-boot generator

.github/workflows/angular.yml

@@ -115,6 +115,9 @@ jobs:
       #----------------------------------------------------------------------
       - uses: jhipster/actions/compare-sample@v0
         id: compare
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         with:
           generator-path: generator-jhipster
           cmd: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight

.github/workflows/react.yml

@@ -118,6 +118,9 @@ jobs:
         with:
           generator-path: generator-jhipster
           cmd: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         env:
           # generate-sample uses JHI_FOLDER_APP to generate the application.
           JHI_FOLDER_APP: ${{ github.workspace }}/base/app

.github/workflows/vue.yml

@@ -106,6 +106,9 @@ jobs:
           generator-path: generator-jhipster
       - name: 'GENERATION: project'
         run: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         env:
           JHI_FOLDER_APP: ${{ github.workspace }}/app
           JHIPSTER_DEPENDENCIES_VERSION: ${{ matrix.jhipster-bom-cicd-version }}

generators/server/generator.js

@@ -32,7 +32,6 @@ import {
   getPrimaryKeyValue as getPKValue,
   hibernateSnakeCase,
 } from './support/index.js';
-import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
 
 import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
 import BaseApplicationGenerator from '../base-application/index.js';
@@ -139,9 +138,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         if (control.existingProject && this.options.askAnswered !== true) return;
         await this.promptCurrentJHipsterCommand();
       },
-      askForServerTestOpts,
-      askForServerSideOpts,
-      askForOptionalItems,
     });
   }
 

generators/spring-boot/generator.ts

@@ -63,6 +63,7 @@ import {
 } from '../../jdl/index.js';
 import { writeFiles as writeEntityFiles } from './entity-files.js';
 import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js';
+import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
 
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS, NO: NO_CACHE } = cacheTypes;
 const { NO: NO_WEBSOCKET, SPRING_WEBSOCKET } = websocketTypes;
@@ -106,6 +107,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
         if (control.existingProject && this.options.askAnswered !== true) return;
         await this.promptCurrentJHipsterCommand();
       },
+      askForServerTestOpts,
+      askForServerSideOpts,
+      askForOptionalItems,
     });
   }
 

generators/server/prompts.js → generators/spring-boot/prompts.js

@@ -29,8 +29,8 @@ import {
   serviceDiscoveryTypes,
   testFrameworkTypes,
 } from '../../jdl/jhipster/index.js';
-import { MESSAGE_BROKER } from './options/index.js';
-import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from './support/database.js';
+import { MESSAGE_BROKER } from '../server/options/index.js';
+import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from '../server/support/database.js';
 
 const { OptionNames } = applicationOptions;
 const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes;