generator-jhipster 8.9.0 → 8.10.0

package/dist/generators/server/resources/pom.xml

@@ -8,41 +8,41 @@
 
     <properties>
         <!-- Dependency versions -->
-        <archunit-junit5.version>1.3.0</archunit-junit5.version>
-        <blockhound-junit-platform.version>1.0.10.RELEASE</blockhound-junit-platform.version>
-        <commons-beanutils.version>1.10.0</commons-beanutils.version>
-        <gatling.version>3.13.3</gatling.version>
+        <archunit-junit5.version>1.4.0</archunit-junit5.version>
+        <blockhound-junit-platform.version>1.0.11.RELEASE</blockhound-junit-platform.version>
+        <commons-beanutils.version>1.10.1</commons-beanutils.version>
+        <gatling.version>3.13.5</gatling.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <mapstruct.version>1.6.3</mapstruct.version>
         <micrometer-context-propagation.version>1.1.2</micrometer-context-propagation.version>
         <picocli.version>4.7.6</picocli.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.21.2</checkstyle.version>
+        <checkstyle.version>10.22.0</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
-        <gatling-maven-plugin.version>4.13.0</gatling-maven-plugin.version>
+        <gatling-maven-plugin.version>4.16.2</gatling-maven-plugin.version>
         <git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
-        <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-clean-plugin.version>3.4.1</maven-clean-plugin.version>
+        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-site-plugin.version>3.21.0</maven-site-plugin.version>
-        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <modernizer-maven-plugin.version>3.1.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.11.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.12.0</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
-        <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
-        <spotless-maven-plugin.version>2.44.2</spotless-maven-plugin.version>
+        <sonar-maven-plugin.version>5.1.0.4751</sonar-maven-plugin.version>
+        <spotless-maven-plugin.version>2.44.3</spotless-maven-plugin.version>
     </properties>
 
     <dependencyManagement>

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

@@ -41,12 +41,34 @@ export type SpringBootSourceType = JavaSourceType &
     addAllowBlockingCallsInside?({ classPath, method }: { classPath: string; method: string }): void;
     addApplicationPropertiesContent?(content: ApplicationPropertiesNeedles): void;
     addApplicationPropertiesProperty?({ propertyName, propertyType }: { propertyName: string; propertyType: string }): void;
+    /**
+     * @example
+     * addApplicationPropertiesClass({
+     *   propertyType: 'Liquibase',
+     *   classStructure: { enabled: ['PropertyType', '"default value"'], asyncStart: 'PropertyTypeOnly' },
+     * });
+     */
+    addApplicationPropertiesClass?(opts: {
+      propertyName?: string;
+      propertyType: string;
+      classStructure: Record<string, string | string[]>;
+    }): void;
     addNativeHint?(hints: {
       advanced?: string[];
       declaredConstructors?: string[];
       resources?: string[];
       publicConstructors?: string[];
     }): void;
+    /**
+     * Injects a document into the application.yml file using '---' document separator.
+     *
+     * @example
+     * addApplicationYamlDocument(`
+     * spring:
+     *  key: value
+     * `);
+     */
+    addApplicationYamlDocument?(document: string): void;
   };
 
 type CacheProviderApplication = OptionWithDerivedProperties<

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

@@ -1,13 +1,25 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class SpringBootGenerator extends BaseApplicationGenerator {
-    [x: string]: any;
+    [BaseApplicationGenerator.PROMPTING]: import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "askForServerTestOpts" | "askForServerSideOpts" | "askForOptionalItems">;
+    [BaseApplicationGenerator.CONFIGURING]: any;
+    [BaseApplicationGenerator.COMPOSING]: any;
+    [BaseApplicationGenerator.COMPOSING_COMPONENT]: any;
+    [BaseApplicationGenerator.PREPARING]: any;
+    [BaseApplicationGenerator.PREPARING_EACH_ENTITY]: any;
+    [BaseApplicationGenerator.PREPARING_EACH_ENTITY_FIELD]: any;
+    [BaseApplicationGenerator.PREPARING_EACH_ENTITY_RELATIONSHIP]: any;
+    [BaseApplicationGenerator.POST_PREPARING_EACH_ENTITY]: any;
+    [BaseApplicationGenerator.WRITING]: any;
+    [BaseApplicationGenerator.WRITING_ENTITIES]: 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">;
+    [BaseApplicationGenerator.POST_WRITING]: any;
+    [BaseApplicationGenerator.END]: 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" | "blockhound">;
+    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" | "addApplicationYamlDocument" | "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">;

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

@@ -18,7 +18,7 @@
  */
 import os from 'node:os';
 import chalk from 'chalk';
-import { sortedUniqBy } from 'lodash-es';
+import { lowerFirst, 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';
@@ -222,6 +222,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
                     annotations: [annotation],
                 });
             },
+            addApplicationYamlDocument({ application, source }) {
+                source.addApplicationYamlDocument = content => this.editFile(this.destinationPath(`${application.srcMainResources}config/application.yml`), createNeedleCallback({ needle: 'add-application-yaml-document', autoIndent: false, contentToAdd: `---\n${content}` }));
+            },
             addLogNeedles({ source }) {
                 source.addLogbackLogEntry = ({ file, name, level }) => this.editFile(this.destinationPath(file), createNeedleCallback({
                     needle: 'logback-add-log',
@@ -244,6 +247,30 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
 }
 `,
                 });
+                source.addApplicationPropertiesClass = ({ propertyType, propertyName = lowerFirst(propertyType), classStructure }) => {
+                    const classProperties = Object.entries(classStructure).map(([name, type]) => ({
+                        name,
+                        type: Array.isArray(type) ? type[0] : type,
+                        defaultVaue: Array.isArray(type) ? ` = ${type[1]}` : '',
+                        beanName: javaBeanCase(name),
+                    }));
+                    return source.addApplicationPropertiesContent({
+                        property: `private final ${propertyType} ${propertyName} = new ${propertyType}();`,
+                        propertyGetter: `
+public ${propertyType} get${javaBeanCase(propertyName)}() {
+    return ${propertyName};
+}
+`,
+                        propertyClass: `public static class ${propertyType} {
+${classProperties.map(({ name, type, defaultVaue }) => `\n    private ${type} ${name}${defaultVaue};`).join('\n')}
+${classProperties.map(({ name, type, beanName }) => `\n    public ${type} get${beanName}() {\n        return ${name};\n    }\n`).join('\n')}
+${classProperties
+                            .map(({ name, type, beanName }) => `\n    public void set${beanName}(${type} ${name}) {\n        this.${name} = ${name};\n    }`)
+                            .join('\n')}
+}
+`,
+                    });
+                };
             },
             blockhound({ application, source }) {
                 source.addAllowBlockingCallsInside = ({ classPath, method }) => {
@@ -440,6 +467,11 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
                 source.addJavaDependencies?.([
                     { groupId: 'org.springdoc', artifactId: springdocDependency, version: application.javaDependencies.springdoc },
                 ]);
+                if (application.reactive) {
+                    source.addAllowBlockingCallsInside?.({ classPath: 'org.springdoc.core.service.OpenAPIService', method: 'build' });
+                    source.addAllowBlockingCallsInside?.({ classPath: 'org.springdoc.core.service.OpenAPIService', method: 'getWebhooks' });
+                    source.addAllowBlockingCallsInside?.({ classPath: 'org.springdoc.core.service.AbstractRequestService', method: 'build' });
+                }
             },
             addFeignReactor({ application, source }) {
                 const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, reactive } = application;