generator-jhipster 8.7.3 → 8.8.0

package/dist/generators/server/types.d.ts

@@ -10,6 +10,7 @@ import type { JavaAnnotation } from '../java/support/add-java-annotation.ts';
 import type { ApplicationPropertiesNeedles } from './support/needles.ts';
 
 export type SpringEntity = {
+  entitySearchLayer?: boolean;
   /* Generate entity's Entity */
   entityDomainLayer?: boolean;
   /* Generate entity's Repository */
@@ -19,6 +20,12 @@ export type SpringEntity = {
   entitySpringPreAuthorize?: string;
   entitySpringReadPreAuthorize?: string;
   skipJunitTests?: string;
+  entityR2dbcRepository?: boolean;
+};
+
+export type ServerEntity = SpringEntity & {
+  skipDbChangelog?: boolean;
+  entityAbsolutePackage?: string;
 };
 
 export type SpringBootSourceType = JavaSourceType &
@@ -151,7 +158,10 @@ export type SpringBootApplication = JavaApplication &
     databaseMigrationLiquibase: boolean;
 
     communicationSpringWebsocket: boolean;
+    anyEntityHasRelationshipWithUser: boolean;
     requiresDeleteAllUsers: boolean;
     reactorBlock: string;
     reactorBlockOptional: string;
+
+    domains: string[];
   };

package/dist/generators/spring-boot/command.d.ts

@@ -63,6 +63,13 @@ declare const command: {
             };
             readonly scope: "storage";
         };
+        readonly rememberMeKey: {
+            readonly cli: {
+                readonly type: StringConstructor;
+                readonly hide: true;
+            };
+            readonly scope: "storage";
+        };
         readonly authenticationType: {
             readonly cli: {
                 readonly name: "auth";
@@ -164,7 +171,7 @@ declare const command: {
                 readonly tokenType: "NAME";
                 readonly tokenValuePattern: RegExp;
             };
-            readonly choices: readonly ["liquibase"];
+            readonly choices: readonly ["liquibase", "no"];
             readonly scope: "storage";
         };
         readonly graalvmSupport: {

package/dist/generators/spring-boot/command.js

@@ -21,7 +21,7 @@ import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL }
 import { createBase64Secret, createSecret } from '../base/support/secret.js';
 import { applicationTypes, authenticationTypes } from '../../lib/jhipster/index.js';
 const { OAUTH2, SESSION, JWT } = authenticationTypes;
-const { GATEWAY, MICROSERVICE } = applicationTypes;
+const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes;
 const ALPHANUMERIC_PATTERN = /^[A-Za-z][A-Za-z0-9]*$/;
 const command = {
     options: {
@@ -87,6 +87,13 @@ const command = {
             },
             scope: 'storage',
         },
+        rememberMeKey: {
+            cli: {
+                type: String,
+                hide: true,
+            },
+            scope: 'storage',
+        },
         authenticationType: {
             cli: {
                 name: 'auth',
@@ -96,8 +103,8 @@ const command = {
             prompt: (gen, config) => ({
                 type: 'list',
                 message: `Which ${chalk.yellow('*type*')} of authentication would you like to use?`,
-                choices: () => gen.jhipsterConfigWithDefaults.applicationType !== 'monolith'
-                    ? config.choices.filter(({ value }) => value !== 'session')
+                choices: () => gen.jhipsterConfigWithDefaults.applicationType !== MONOLITH
+                    ? config.choices.filter(({ value }) => value !== SESSION)
                     : config.choices,
                 default: () => gen.jhipsterConfigWithDefaults.authenticationType,
             }),
@@ -147,14 +154,14 @@ const command = {
             prompt: gen => ({
                 type: 'confirm',
                 message: 'Do you want to allow relationships with User entity?',
-                when: ({ authenticationType }) => (authenticationType ?? gen.jhipsterConfigWithDefaults.authenticationType) === 'oauth2',
+                when: ({ authenticationType }) => (authenticationType ?? gen.jhipsterConfigWithDefaults.authenticationType) === OAUTH2,
             }),
             jdl: {
                 type: 'boolean',
                 tokenType: 'BOOLEAN',
             },
             configure: gen => {
-                if (gen.jhipsterConfig.syncUserWithIdp === undefined && gen.jhipsterConfigWithDefaults.authenticationType === 'oauth2') {
+                if (gen.jhipsterConfig.syncUserWithIdp === undefined && gen.jhipsterConfigWithDefaults.authenticationType === OAUTH2) {
                     if (gen.isJhipsterVersionLessThan('8.1.1')) {
                         gen.jhipsterConfig.syncUserWithIdp = true;
                     }
@@ -211,7 +218,7 @@ const command = {
                 tokenType: 'NAME',
                 tokenValuePattern: ALPHANUMERIC_PATTERN,
             },
-            choices: ['liquibase'],
+            choices: ['liquibase', 'no'],
             scope: 'storage',
         },
         graalvmSupport: {

package/dist/generators/spring-boot/generator.d.ts

@@ -1,12 +1,13 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class SpringBootGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     fakeKeytool: any;
     beforeQueue(): Promise<void>;
     get prompting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "askForServerTestOpts" | "askForServerSideOpts" | "askForOptionalItems">;
     get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "feignMigration">;
     get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composing">;
     get composingComponent(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composing" | "composeLanguages">;
-    get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareForTemplates" | "prepare" | "checksWebsocket" | "loadSpringBootBom" | "registerSpringFactory" | "addSpringIntegrationTest" | "addLogNeedles" | "addApplicationPropertiesNeedles">;
+    get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareForTemplates" | "prepare" | "checksWebsocket" | "loadSpringBootBom" | "registerSpringFactory" | "addSpringIntegrationTest" | "addLogNeedles" | "addApplicationPropertiesNeedles" | "blockhound">;
     get preparingEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareEntity">;
     get preparingEachEntityField(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityFieldTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareEntity">;
     get preparingEachEntityRelationship(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityRelationshipTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareEntity" | "checkUserRelationships" | "checkDtoRelationships">;
@@ -15,14 +16,4 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     get writingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "writeServerFiles" | "cleanupOldServerFiles">;
     get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addJHipsterBomDependencies" | "addSpringdoc" | "addFeignReactor" | "addSpringSnapshotRepository" | "addSpringBootPlugin" | "addSpringBootCompose">;
     get end(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplication<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "end">;
-    /**
-     * @private
-     * Returns the primary key value based on the primary key type, DB and default value
-     *
-     * @param {string} primaryKey - the primary key type
-     * @param {string} databaseType - the database type
-     * @param {string} defaultValue - default value
-     * @returns {string} java primary key value
-     */
-    getPrimaryKeyValue(primaryKey: any, databaseType?: "sql" | "mongodb" | "cassandra" | "couchbase" | "neo4j" | "no" | undefined, defaultValue?: number): string;
 }

package/dist/generators/spring-boot/generator.js

@@ -22,7 +22,7 @@ import { sortedUniqBy } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_CUCUMBER, GENERATOR_DOCKER, GENERATOR_FEIGN_CLIENT, GENERATOR_GATLING, GENERATOR_LANGUAGES, GENERATOR_SERVER, GENERATOR_SPRING_CACHE, GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_SPRING_DATA_MONGODB, GENERATOR_SPRING_DATA_NEO4J, GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_SPRING_WEBSOCKET, } from '../generator-list.js';
 import { ADD_SPRING_MILESTONE_REPOSITORY } from '../generator-constants.js';
-import { addSpringFactory, getJavaValueGeneratorForType, getPrimaryKeyValue, getSpecificationBuildForType, insertContentIntoApplicationProperties, javaBeanCase, } from '../server/support/index.js';
+import { addSpringFactory, getJavaValueGeneratorForType, getSpecificationBuildForType, insertContentIntoApplicationProperties, javaBeanCase, } from '../server/support/index.js';
 import { generateKeyStore } from '../java/support/index.js';
 import { createNeedleCallback, mutateData } from '../base/support/index.js';
 import { APPLICATION_TYPE_MICROSERVICE, applicationTypes, cacheTypes, databaseTypes, fieldTypes, messageBrokerTypes, searchEngineTypes, testFrameworkTypes, websocketTypes, } from '../../lib/jhipster/index.js';
@@ -49,6 +49,7 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster(GENERATOR_SERVER);
             await this.dependsOnJHipster('jhipster:java:domain');
             await this.dependsOnJHipster('jhipster:java:build-tool');
+            await this.dependsOnJHipster('jhipster:java:server');
         }
     }
     get prompting() {
@@ -187,6 +188,7 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
                     application.springBootDependencies = this.prepareDependencies(getPomVersionProperties(pom), 'java');
                     application.javaDependencies['spring-boot'] = application.springBootDependencies['spring-boot-dependencies'];
                     Object.assign(application.javaManagedProperties, pom.project.properties);
+                    application.javaDependencies.liquibase = application.javaManagedProperties['liquibase.version'];
                 }
             },
             prepareForTemplates({ application }) {
@@ -243,6 +245,16 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
 `,
                 });
             },
+            blockhound({ application, source }) {
+                source.addAllowBlockingCallsInside = ({ classPath, method }) => {
+                    if (!application.reactive)
+                        throw new Error('Blockhound is only supported by reactive applications');
+                    this.editFile(`${application.javaPackageTestDir}config/JHipsterBlockHoundIntegration.java`, createNeedleCallback({
+                        needle: 'blockhound-integration',
+                        contentToAdd: `builder.allowBlockingCallsInside("${classPath}", "${method}");`,
+                    }));
+                };
+            },
         });
     }
     get [BaseApplicationGenerator.PREPARING]() {
@@ -342,11 +354,13 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
                 }
             },
             prepareFilters({ application, entity }) {
-                entity.entityJavaFilterableProperties = [
-                    ...entity.fields.filter(field => field.filterableField),
-                    ...entity.relationships.filter(rel => !application.reactive || (rel.persistableRelationship && !rel.collection)),
-                ];
-                entity.entityJavaCustomFilters = sortedUniqBy(entity.fields.map(field => field.propertyJavaCustomFilter).filter(Boolean), 'type');
+                mutateData(entity, {
+                    entityJavaFilterableProperties: [
+                        ...entity.fields.filter(field => field.filterableField),
+                        ...entity.relationships.filter(rel => !application.reactive || (rel.persistableRelationship && !rel.collection)),
+                    ],
+                    entityJavaCustomFilters: sortedUniqBy(entity.fields.map(field => field.propertyJavaCustomFilter).filter(Boolean), 'type'),
+                });
             },
         });
     }
@@ -391,8 +405,7 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
     get postWriting() {
         return this.asPostWritingTaskGroup({
             addJHipsterBomDependencies({ application, source }) {
-                const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, jhipsterDependenciesVersion, messageBrokerAny } = application;
-                const { serviceDiscoveryAny } = application;
+                const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, jhipsterDependenciesVersion, messageBrokerAny, serviceDiscoveryAny, } = application;
                 source.addJavaDefinitions?.({
                     dependencies: [{ groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: jhipsterDependenciesVersion }],
                     mavenDefinition: {
@@ -518,16 +531,4 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
     get [BaseApplicationGenerator.END]() {
         return this.delegateTasksToBlueprint(() => this.end);
     }
-    /**
-     * @private
-     * Returns the primary key value based on the primary key type, DB and default value
-     *
-     * @param {string} primaryKey - the primary key type
-     * @param {string} databaseType - the database type
-     * @param {string} defaultValue - default value
-     * @returns {string} java primary key value
-     */
-    getPrimaryKeyValue(primaryKey, databaseType = this.jhipsterConfig.databaseType, defaultValue = 1) {
-        return getPrimaryKeyValue(primaryKey, databaseType, defaultValue);
-    }
 }

package/dist/generators/spring-boot/prompts.d.ts

@@ -20,9 +20,5 @@ import type CoreGenerator from '../base-core/generator.js';
 export declare function askForServerSideOpts(this: CoreGenerator, { control }: {
     control: any;
 }): Promise<void>;
-export declare function askForOptionalItems(this: CoreGenerator, { control }: {
-    control: any;
-}): Promise<void>;
-export declare function askForServerTestOpts(this: CoreGenerator, { control }: {
-    control: any;
-}): Promise<void>;
+export declare const askForOptionalItems: (this: CoreGenerator, params: import("../../lib/types/base/tasks.js").TaskParamWithControl) => void;
+export declare const askForServerTestOpts: (this: CoreGenerator, params: import("../../lib/types/base/tasks.js").TaskParamWithControl) => void;

package/dist/generators/spring-boot/prompts.js

@@ -17,35 +17,19 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import { includes, intersection } from 'lodash-es';
+import { intersection } from 'lodash-es';
 import { applicationOptions, applicationTypes, authenticationTypes, cacheTypes, databaseTypes, testFrameworkTypes, } from '../../lib/jhipster/index.js';
 import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from '../server/support/database.js';
+import { asPromptingTask } from '../base-application/support/task-type-inference.js';
 const { OptionNames } = applicationOptions;
 const { GATEWAY, MONOLITH } = applicationTypes;
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = cacheTypes;
 const { OAUTH2 } = authenticationTypes;
 const { CASSANDRA, H2_DISK, H2_MEMORY, MONGODB, NEO4J, SQL, COUCHBASE } = databaseTypes;
-const { SERVICE_DISCOVERY_TYPE, WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN } = OptionNames;
+const { WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN } = OptionNames;
 const NO_DATABASE = databaseTypes.NO;
 const NO_CACHE_PROVIDER = cacheTypes.NO;
 const { GATLING, CUCUMBER } = testFrameworkTypes;
-/**
- * Get Option From Array
- *
- * @param {Array} array - array
- * @param {any} option - options
- * @returns {boolean} true if option is in array and is set to 'true'
- */
-const getOptionFromArray = (array, option) => {
-    let optionValue = false;
-    array.forEach(value => {
-        if (includes(value, option)) {
-            optionValue = value.split(':')[1];
-        }
-    });
-    optionValue = optionValue === 'true' ? true : optionValue;
-    return optionValue;
-};
 export async function askForServerSideOpts({ control }) {
     if (control.existingProject && !this.options.askAnswered)
         return;
@@ -168,12 +152,11 @@ export async function askForServerSideOpts({ control }) {
         },
     ], this.config);
 }
-export async function askForOptionalItems({ control }) {
+export const askForOptionalItems = asPromptingTask(async function askForOptionalItems({ control }) {
     if (control.existingProject && !this.options.askAnswered)
         return;
     const { applicationType, reactive, databaseType } = this.jhipsterConfigWithDefaults;
     const choices = [];
-    const defaultChoice = [];
     if ([SQL, MONGODB, NEO4J].includes(databaseType)) {
         choices.push({
             name: 'Elasticsearch as search engine',
@@ -197,49 +180,49 @@ export async function askForOptionalItems({ control }) {
     choices.push({
         name: 'Apache Kafka as asynchronous messages broker',
         value: 'messageBroker:kafka',
-    });
-    choices.push({
+    }, {
         name: 'Apache Pulsar as asynchronous messages broker',
         value: 'messageBroker:pulsar',
-    });
-    choices.push({
+    }, {
         name: 'API first development using OpenAPI-generator',
         value: 'enableSwaggerCodegen:true',
     });
     if (choices.length > 0) {
-        await this.prompt({
+        const selectedChoices = [WEBSOCKET, SEARCH_ENGINE, 'messageBroker', ENABLE_SWAGGER_CODEGEN]
+            .map(property => [property, this.jhipsterConfig[property]])
+            .filter(([, value]) => value !== undefined)
+            .map(([key, value]) => `${key}:${value}`)
+            .filter(Boolean);
+        choices.forEach(choice => {
+            choice.checked = selectedChoices.includes(choice.value);
+        });
+        const answers = await this.prompt({
             type: 'checkbox',
             name: 'serverSideOptions',
             message: 'Which other technologies would you like to use?',
             choices,
-            default: defaultChoice,
-        }).then(answers => {
-            this.jhipsterConfig.serverSideOptions = answers.serverSideOptions;
-            this.jhipsterConfig.websocket = getOptionFromArray(answers.serverSideOptions, WEBSOCKET);
-            this.jhipsterConfig.searchEngine = getOptionFromArray(answers.serverSideOptions, SEARCH_ENGINE);
-            this.jhipsterConfig.messageBroker = getOptionFromArray(answers.serverSideOptions, 'messageBroker');
-            this.jhipsterConfig.enableSwaggerCodegen = getOptionFromArray(answers.serverSideOptions, ENABLE_SWAGGER_CODEGEN);
-            // Only set this option if it hasn't been set in a previous question, as it's only optional for monoliths
-            if (!this.jhipsterConfig.serviceDiscoveryType) {
-                this.jhipsterConfig.serviceDiscoveryType = getOptionFromArray(answers.serverSideOptions, SERVICE_DISCOVERY_TYPE);
-            }
+            default: selectedChoices,
         });
+        Object.assign(this.jhipsterConfig, Object.fromEntries(answers.serverSideOptions
+            .map(it => it.split(':'))
+            .map(([key, value]) => [key, ['true', 'false'].includes(value) ? value === 'true' : value])));
     }
-}
-export async function askForServerTestOpts({ control }) {
+});
+export const askForServerTestOpts = asPromptingTask(async function ({ control }) {
     if (control.existingProject && this.options.askAnswered !== true)
         return;
+    const testFrameworks = this.jhipsterConfigWithDefaults.testFrameworks ?? [];
     const answers = await this.prompt([
         {
             type: 'checkbox',
             name: 'serverTestFrameworks',
             message: 'Besides JUnit, which testing frameworks would you like to use?',
             choices: [
-                { name: 'Gatling', value: GATLING },
-                { name: 'Cucumber', value: CUCUMBER },
+                { name: 'Gatling', value: GATLING, checked: testFrameworks.includes(GATLING) },
+                { name: 'Cucumber', value: CUCUMBER, checked: testFrameworks.includes(CUCUMBER) },
             ],
             default: intersection([GATLING, CUCUMBER], this.jhipsterConfigWithDefaults.testFrameworks),
         },
     ]);
     this.jhipsterConfig.testFrameworks = [...new Set([...(this.jhipsterConfig.testFrameworks ?? []), ...answers.serverTestFrameworks])];
-}
+});