generator-jhipster 8.0.0-beta.3 → 8.0.0-rc.1

package/dist/generators/server/generator.mjs

@@ -21,7 +21,7 @@
 import { existsSync } from 'fs';
 import os from 'os';
 import chalk from 'chalk';
-import { getDBTypeFromDBValue, buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, formatDocAsApiDescription, formatDocAsJavaDoc, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, generateKeyStore, addSpringFactory, hibernateSnakeCase, } from './support/index.mjs';
+import { getDBTypeFromDBValue, buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, generateKeyStore, addSpringFactory, hibernateSnakeCase, } from './support/index.mjs';
 import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_COMMON, GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_CUCUMBER, GENERATOR_DOCKER, GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_GATLING, GENERATOR_GRADLE, GENERATOR_JAVA, GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_LANGUAGES, GENERATOR_MAVEN, GENERATOR_SPRING_DATA_MONGODB, GENERATOR_SPRING_DATA_NEO4J, GENERATOR_SERVER, GENERATOR_SPRING_CACHE, GENERATOR_SPRING_WEBSOCKET, GENERATOR_SPRING_DATA_RELATIONAL, } from '../generator-list.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
@@ -60,49 +60,31 @@ const { Validations: { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTE
 const WAIT_TIMEOUT = 3 * 60000;
 const { NO: NO_PAGINATION } = PaginationTypes;
 const { NO: NO_SERVICE } = ServiceTypes;
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('./index.mjs').GeneratorDefinition>}
- */
 export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     /** @type {string} */
     jhipsterDependenciesVersion;
     /** @type {string} */
     projectVersion;
     fakeKeytool;
-    async beforeQueue() {
-        loadStoredAppOptions.call(this);
-        // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_SERVER.
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
-        await this.dependsOnJHipster(GENERATOR_COMMON);
-        await this.dependsOnJHipster(GENERATOR_JAVA);
+    command = command;
+    async beforeQueue(useNpmWrapper = true) {
         if (!this.fromBlueprint) {
+            loadStoredAppOptions.call(this);
             await this.composeWithBlueprints(GENERATOR_SERVER);
         }
-        // Not using normal blueprints or this is a normal blueprint.
-        if ((!this.fromBlueprint && !this.delegateToBlueprint) || (this.fromBlueprint && this.sbsBlueprint)) {
-            this.setFeatures({
-                customInstallTask: async function customInstallTask(preferredPm, defaultInstallTask) {
-                    const buildTool = this.jhipsterConfig.buildTool;
-                    if ((preferredPm && preferredPm !== 'npm') || this.jhipsterConfig.skipClient || (buildTool !== GRADLE && buildTool !== MAVEN)) {
-                        return defaultInstallTask();
-                    }
-                    const npmCommand = process.platform === 'win32' ? 'npmw' : './npmw';
-                    try {
-                        await this.spawnCommand(npmCommand, ['install'], { preferLocal: true });
-                    }
-                    catch (error) {
-                        this.log.error(chalk.red(`Error executing '${npmCommand} install', please execute it yourself. (${error.shortMessage})`));
-                    }
-                    return true;
-                }.bind(this),
-            });
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnJHipster(GENERATOR_COMMON);
+            await this.dependsOnJHipster(GENERATOR_JAVA);
+            if (useNpmWrapper) {
+                this.useNpmWrapperInstallTask();
+            }
         }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
             loadConfig() {
-                this.parseJHipsterOptions(command.options);
+                this.parseJHipsterCommand(this.command);
             },
         });
     }
@@ -111,6 +93,11 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     }
     get prompting() {
         return this.asPromptingTaskGroup({
+            async prompting({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.prompt(this.prepareQuestions(this.command.configs));
+            },
             askForServerTestOpts,
             askForServerSideOpts,
             askForOptionalItems,
@@ -156,7 +143,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     throw new Error(`Build tool ${buildTool} is not supported`);
                 }
                 await this.composeWithJHipster(GENERATOR_DOCKER);
-                // We don't expose client/server to cli, composing with languages is used for test purposes.
                 if (enableTranslation) {
                     await this.composeWithJHipster(GENERATOR_LANGUAGES);
                 }
@@ -225,9 +211,10 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 application.SERVER_TEST_RES_DIR = SERVER_TEST_RES_DIR;
                 application.JAVA_VERSION = this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION;
                 application.JAVA_COMPATIBLE_VERSIONS = JAVA_COMPATIBLE_VERSIONS;
+                application.javaCompatibleVersions = JAVA_COMPATIBLE_VERSIONS;
                 if (this.projectVersion) {
-                    this.log.info(`Using projectVersion: ${application.projectVersion}`);
                     application.projectVersion = this.projectVersion;
+                    this.log.info(`Using projectVersion: ${application.projectVersion}`);
                 }
                 else {
                     application.projectVersion = '0.0.1-SNAPSHOT';
@@ -258,7 +245,8 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             prepareForTemplates({ application }) {
                 const SPRING_BOOT_VERSION = application.javaDependencies['spring-boot'];
                 application.addSpringMilestoneRepository =
-                    ADD_SPRING_MILESTONE_REPOSITORY || SPRING_BOOT_VERSION.includes('M') || SPRING_BOOT_VERSION.includes('RC');
+                    (application.backendType ?? 'Java') === 'Java' &&
+                        (ADD_SPRING_MILESTONE_REPOSITORY || SPRING_BOOT_VERSION.includes('M') || SPRING_BOOT_VERSION.includes('RC'));
             },
             registerSpringFactory({ source, application }) {
                 source.addTestSpringFactory = ({ key, value }) => {
@@ -339,12 +327,15 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 }
             },
             configureEntityTable({ application, entityName, entityConfig, entityStorage }) {
+                if ((application.applicationTypeGateway && entityConfig.microserviceName) || entityConfig.skipServer)
+                    return;
                 entityConfig.entityTableName = entityConfig.entityTableName || hibernateSnakeCase(entityName);
-                const fixedEntityTableName = this._fixEntityTableName(entityConfig.entityTableName, entityConfig.prodDatabaseType ?? application.prodDatabaseType, application.jhiTablePrefix);
+                const databaseType = entityConfig.prodDatabaseType ?? application.prodDatabaseType ?? entityConfig.databaseType ?? application.databaseType;
+                const fixedEntityTableName = this._fixEntityTableName(entityConfig.entityTableName, databaseType, application.jhiTablePrefix);
                 if (fixedEntityTableName !== entityConfig.entityTableName) {
                     entityConfig.entityTableName = fixedEntityTableName;
                 }
-                const validation = this._validateTableName(entityConfig.entityTableName, entityConfig.prodDatabaseType ?? application.prodDatabaseType, entityConfig);
+                const validation = this._validateTableName(entityConfig.entityTableName, databaseType, entityConfig);
                 if (validation !== true) {
                     throw new Error(validation);
                 }
@@ -586,14 +577,14 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 if (this.jhipsterConfig.testFrameworks?.includes('cypress')) {
                     const applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
                     const applicationEndpoint = application.applicationTypeMicroservice
-                        ? `http-get://localhost:${application.gatewayServerPort}/${application.endpointPrefix}/management/health/readiness`
-                        : 'http-get://localhost:$npm_package_config_backend_port/management/health';
+                        ? `http-get://127.0.0.1:${application.gatewayServerPort}/${application.endpointPrefix}/management/health/readiness`
+                        : 'http-get://127.0.0.1:$npm_package_config_backend_port/management/health';
                     scriptsStorage.set({
                         'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} ${applicationEndpoint} && echo "Server at port $npm_package_config_backend_port started"`,
                         'pree2e:headless': 'npm run ci:server:await',
                         'ci:e2e:run': 'concurrently -k -s first "npm run ci:e2e:server:start" "npm run e2e:headless"',
                         'e2e:dev': `concurrently -k -s first "./${buildCmd}" "npm run e2e"`,
-                        'e2e:devserver': `concurrently -k -s first "npm run backend:start" "npm start" "wait-on -t ${WAIT_TIMEOUT} http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"`,
+                        'e2e:devserver': `concurrently -k -s first "npm run backend:start" "npm start" "wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"`,
                     });
                 }
             },
@@ -614,10 +605,10 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                         .map(ms => `npm run ci:server:await:${ms}`)
                         .join(' && ');
                     scriptsStorage.set({
-                        [`ci:server:await:${lowercaseBaseName}`]: `wait-on -t ${WAIT_TIMEOUT} http-get://localhost:$npm_package_config_backend_port/management/health`,
+                        [`ci:server:await:${lowercaseBaseName}`]: `wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:$npm_package_config_backend_port/management/health`,
                         ...Object.fromEntries(microservices.map(ms => [
                             `ci:server:await:${ms}`,
-                            `wait-on -t ${WAIT_TIMEOUT} http-get://localhost:${serverPort}/services/${ms}/management/health/readiness`,
+                            `wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:${serverPort}/services/${ms}/management/health/readiness`,
                         ])),
                         'ci:server:await': `echo "Waiting for services to start" && ${waitServices} && echo "Services started"`,
                     });
@@ -755,6 +746,24 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             }
         }
     }
+    useNpmWrapperInstallTask() {
+        this.setFeatures({
+            customInstallTask: async function customInstallTask(preferredPm, defaultInstallTask) {
+                const buildTool = this.jhipsterConfig.buildTool;
+                if ((preferredPm && preferredPm !== 'npm') || this.jhipsterConfig.skipClient || (buildTool !== GRADLE && buildTool !== MAVEN)) {
+                    return defaultInstallTask();
+                }
+                const npmCommand = process.platform === 'win32' ? 'npmw' : './npmw';
+                try {
+                    await this.spawnCommand(npmCommand, ['install'], { preferLocal: true });
+                }
+                catch (error) {
+                    this.log.error(chalk.red(`Error executing '${npmCommand} install', please execute it yourself. (${error.shortMessage})`));
+                }
+                return true;
+            }.bind(this),
+        });
+    }
     _validateRelationship(entityName, relationship) {
         if (relationship.otherEntityName === undefined) {
             throw new Error(`otherEntityName is missing in .jhipster/${entityName}.json for relationship ${stringifyApplicationData(relationship)}`);
@@ -773,36 +782,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         }
         return entityTableName;
     }
-    /**
-     * @private
-     * Format As Field Javadoc
-     *
-     * @param {string} text - text to format
-     * @returns field javadoc
-     */
-    formatAsFieldJavadoc(text) {
-        return formatDocAsJavaDoc(text, 4);
-    }
-    /**
-     * @private
-     * Format As Api Description
-     *
-     * @param {string} text - text to format
-     * @returns formatted api description
-     */
-    formatAsApiDescription(text) {
-        return formatDocAsApiDescription(text);
-    }
-    /**
-     * @private
-     * Format As Class Javadoc
-     *
-     * @param {string} text - text to format
-     * @returns class javadoc
-     */
-    formatAsClassJavadoc(text) {
-        return formatDocAsJavaDoc(text, 0);
-    }
     /**
      * @private
      * Return the method name which converts the filter to specification

package/dist/generators/server/jdl/application-definition.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import databaseMigrationOption from '../options/database-migration.mjs';
 import messageBrokerOption from '../options/message-broker.mjs';
 const { upperCase, snakeCase } = _;

package/dist/generators/server/prompts.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { applicationOptions, applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, cacheTypes, serviceDiscoveryTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.mjs';
 import { MESSAGE_BROKER } from './options/index.mjs';
 import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from './support/database.mjs';

package/dist/generators/server/resources/Dockerfile

@@ -10,20 +10,20 @@ LABEL ALIAS=jhipster-control-center
 FROM jhipster/consul-config-loader:v0.4.1
 LABEL ALIAS=consul-config-loader
 
-FROM postgres:15.4
+FROM postgres:16.0
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:22.0.1
+FROM quay.io/keycloak/keycloak:22.0.4
 LABEL ALIAS=keycloak
 
 FROM mysql:8.1.0
 
 FROM mariadb:11.1.2
 
-FROM mongo:7.0.0
+FROM mongo:7.0.2
 LABEL ALIAS=mongodb
 
-FROM couchbase/server:7.2.0
+FROM couchbase/server:7.2.2
 LABEL ALIAS=couchbase
 
 FROM cassandra:3.11.14
@@ -31,31 +31,31 @@ FROM cassandra:3.11.14
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.11.0
+FROM neo4j:5.12.0
 
 FROM hazelcast/management-center:5.3.2
 LABEL ALIAS=hazelcast
 
 FROM memcached:1.6.21-alpine
 
-FROM redis:7.2.0
+FROM redis:7.2.1
 
-FROM confluentinc/cp-kafka:7.5.0
+FROM confluentinc/cp-kafka:7.5.1
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.5.0
+FROM confluentinc/cp-zookeeper:7.5.1
 LABEL ALIAS=zookeeper
 
 FROM apachepulsar/pulsar:3.0.1
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.2.0-community
+FROM sonarqube:10.2.1-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.16.1
+FROM docker.io/bitnami/consul:1.16.2
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.46.0
+FROM prom/prometheus:v2.47.2
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.26.0
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:10.1.1
+FROM grafana/grafana:10.1.5
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8

package/dist/generators/server/resources/gradle/libs.versions.toml

@@ -1,18 +1,18 @@
 [plugins]
 gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.1' }
 
-node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.0' }
+node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.1' }
 
 gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.0' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '4.3.1.3277' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '4.4.1.3373' }
 
-spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.21.0' }
+spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.22.0' }
 
-gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.8.0' }
+gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.0' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.14.1' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.15.1' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11.1' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11.3' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.5' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.6' }

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

@@ -13,27 +13,27 @@
         <blockhound-junit-platform.version>1.0.8.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <gatling.version>3.9.5</gatling.version>
-        <h2.version>2.2.222</h2.version>
+        <h2.version>2.2.224</h2.version>
         <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
         <hazelcast-spring.version>5.3.2</hazelcast-spring.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <jaxb-runtime.version>4.0.3</jaxb-runtime.version>
         <junit-platform-launcher.version>1.10.0</junit-platform-launcher.version>
-        <liquibase.version>4.23.1</liquibase.version>
+        <liquibase.version>4.24.0</liquibase.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
-        <micrometer-context-propagation.version>1.0.5</micrometer-context-propagation.version>
+        <micrometer-context-propagation.version>1.0.6</micrometer-context-propagation.version>
         <picocli.version>4.7.5</picocli.version>
         <spring-pulsar.version>0.2.0</spring-pulsar.version>
         <typesafe.version>1.4.2</typesafe.version>
         <validation-api.version>3.0.2</validation-api.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.12.3</checkstyle.version>
+        <checkstyle.version>10.12.4</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
-        <frontend-maven-plugin.version>1.13.4</frontend-maven-plugin.version>
-        <gatling-maven-plugin.version>4.5.0</gatling-maven-plugin.version>
+        <frontend-maven-plugin.version>1.14.0</frontend-maven-plugin.version>
+        <gatling-maven-plugin.version>4.6.0</gatling-maven-plugin.version>
         <git-commit-id-maven-plugin.version>6.0.0</git-commit-id-maven-plugin.version>
-        <jib-maven-plugin.version>3.3.2</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
@@ -41,21 +41,21 @@
         <maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-        <maven-enforcer-plugin.version>3.4.0</maven-enforcer-plugin.version>
+        <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
-        <modernizer-maven-plugin.version>2.6.0</modernizer-maven-plugin.version>
+        <modernizer-maven-plugin.version>2.7.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.0.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.0.1</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.0</properties-maven-plugin.version>
-        <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
     </properties>
 
     <dependencyManagement>

package/dist/generators/server/support/config.mjs

@@ -1,4 +1,4 @@
-import { normalizePathEnd } from '../../base/support/index.mjs';
+import { mutateApplication, normalizePathEnd, pickFields } from '../../base/support/index.mjs';
 import { databaseTypes, monitoringTypes, authenticationTypes, buildToolTypes, cacheTypes, websocketTypes, serviceDiscoveryTypes, searchEngineTypes, } from '../../../jdl/jhipster/index.mjs';
 import { prepareSqlApplicationProperties } from '../../spring-data-relational/support/index.mjs';
 import { CLIENT_DIST_DIR, CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, } from '../../generator-constants.mjs';
@@ -21,47 +21,45 @@ const NO_SEARCH_ENGINE = searchEngineTypes.NO;
  * all variables should be referred from config,
  */
 export const loadServerConfig = ({ config, application }) => {
-    application.packageName = config.packageName;
-    application.packageFolder = config.packageFolder && normalizePathEnd(config.packageFolder);
-    application.serverPort = config.serverPort;
-    application.srcMainJava = SERVER_MAIN_SRC_DIR;
-    application.srcMainResources = SERVER_MAIN_RES_DIR;
-    application.srcMainWebapp = CLIENT_MAIN_SRC_DIR;
-    application.srcTestJava = SERVER_TEST_SRC_DIR;
-    application.srcTestResources = SERVER_TEST_RES_DIR;
-    application.srcTestJavascript = CLIENT_TEST_SRC_DIR;
-    application.buildTool = config.buildTool;
-    application.databaseType = config.databaseType;
-    application.databaseMigration = config.databaseMigration;
-    application.devDatabaseType = config.devDatabaseType;
-    application.prodDatabaseType = config.prodDatabaseType;
-    application.incrementalChangelog = config.incrementalChangelog;
-    application.reactive = config.reactive;
-    application.searchEngine = config.searchEngine;
-    application.cacheProvider = config.cacheProvider;
-    application.enableHibernateCache = config.enableHibernateCache;
-    application.serviceDiscoveryType = config.serviceDiscoveryType;
-    application.enableSwaggerCodegen = config.enableSwaggerCodegen;
-    application.messageBroker = config.messageBroker;
-    application.websocket = config.websocket;
-    application.embeddableLaunchScript = config.embeddableLaunchScript;
-    application.enableGradleEnterprise = config.enableGradleEnterprise;
-    if (config.gradleEnterpriseHost) {
-        if (config.gradleEnterpriseHost.startsWith('https://')) {
-            application.gradleEnterpriseHost = config.gradleEnterpriseHost;
-        }
-        else {
-            application.gradleEnterpriseHost = `https://${config.gradleEnterpriseHost}`;
-        }
-    }
+    mutateApplication(application, {
+        srcMainJava: SERVER_MAIN_SRC_DIR,
+        srcMainResources: SERVER_MAIN_RES_DIR,
+        srcMainWebapp: CLIENT_MAIN_SRC_DIR,
+        srcTestJava: SERVER_TEST_SRC_DIR,
+        srcTestResources: SERVER_TEST_RES_DIR,
+        srcTestJavascript: CLIENT_TEST_SRC_DIR,
+    }, pickFields(config, [
+        'packageName',
+        'packageFolder',
+        'serverPort',
+        'buildTool',
+        'databaseType',
+        'databaseMigration',
+        'devDatabaseType',
+        'prodDatabaseType',
+        'incrementalChangelog',
+        'reactive',
+        'searchEngine',
+        'cacheProvider',
+        'enableHibernateCache',
+        'serviceDiscoveryType',
+        'enableSwaggerCodegen',
+        'messageBroker',
+        'websocket',
+        'embeddableLaunchScript',
+        'enableGradleEnterprise',
+        'gradleEnterpriseHost',
+    ]), {
+        packageFolder: ({ packageFolder }) => (packageFolder ? normalizePathEnd(packageFolder) : packageFolder),
+        gradleEnterpriseHost: ({ gradleEnterpriseHost }) => !gradleEnterpriseHost || gradleEnterpriseHost.startsWith('https://') ? gradleEnterpriseHost : `https://${gradleEnterpriseHost}`,
+    });
 };
 /**
  * @param {Object} config - config to load config from
  * @param {import('./base-application/types.js').PlatformApplication} dest - destination context to use default is context
  */
 export const loadPlatformConfig = ({ config, application }) => {
-    application.serviceDiscoveryType = config.serviceDiscoveryType;
-    application.monitoring = config.monitoring;
+    mutateApplication(application, pickFields(config, ['serviceDiscoveryType', 'monitoring']));
 };
 export const loadDerivedServerAndPlatformProperties = ({ application }) => {
     if (!application.serviceDiscoveryType) {
@@ -84,15 +82,10 @@ export const loadDerivedPlatformConfig = ({ application }) => {
  * @param {import('./bootstrap-application-server/types').SpringBootApplication} dest - destination context to use default is context
  */
 export const loadDerivedServerConfig = ({ application }) => {
-    if (!application.packageFolder) {
-        application.packageFolder = `${application.packageName.replace(/\./g, '/')}/`;
-    }
-    application.prodDatabaseTypePostgres = undefined;
+    application.prodDatabaseTypePostgresql = undefined;
     application.prodDatabaseTypeMssql = undefined;
     application.devDatabaseTypeH2Any = undefined;
     application.prodDatabaseTypeMariadb = undefined;
-    application.javaPackageSrcDir = normalizePathEnd(`${application.srcMainJava}${application.packageFolder}`);
-    application.javaPackageTestDir = normalizePathEnd(`${application.srcTestJava}${application.packageFolder}`);
     application.communicationSpringWebsocket = application.websocket === SPRING_WEBSOCKET;
     if (!application.searchEngine) {
         application.searchEngine = NO_SEARCH_ENGINE;
@@ -110,9 +103,6 @@ export const loadDerivedServerConfig = ({ application }) => {
     application.buildToolGradle = application.buildTool === GRADLE;
     application.buildToolMaven = application.buildTool === MAVEN;
     application.buildToolUnknown = !application.buildToolGradle && !application.buildToolMaven;
-    application.temporaryDir = application.buildToolGradle ? 'build/' : 'target/';
-    const buildDestinationDir = `${application.temporaryDir}${application.buildToolGradle ? 'resources/main/' : 'classes/'}`;
-    application.clientDistDir = `${buildDestinationDir}${CLIENT_DIST_DIR}`;
     application.cacheProviderNo = !application.cacheProvider || application.cacheProvider === NO_CACHE;
     application.cacheProviderCaffeine = application.cacheProvider === CAFFEINE;
     application.cacheProviderEhcache = application.cacheProvider === EHCACHE;
@@ -131,8 +121,15 @@ export const loadDerivedServerConfig = ({ application }) => {
     application.databaseMigrationLiquibase = application.databaseMigration
         ? application.databaseMigration === 'liquibase'
         : application.databaseType === SQL;
-    application.imperativeOrReactive = application.reactive ? 'reactive' : 'imperative';
-    application.authenticationUsesCsrf = [OAUTH2, SESSION].includes(application.authenticationType);
+    mutateApplication(application, {
+        packageFolder: ({ packageName }) => `${packageName.replace(/\./g, '/')}/`,
+        javaPackageSrcDir: ({ srcMainJava, packageFolder }) => normalizePathEnd(`${srcMainJava}${packageFolder}`),
+        javaPackageTestDir: ({ srcTestJava, packageFolder }) => normalizePathEnd(`${srcTestJava}${packageFolder}`),
+        temporaryDir: ({ buildToolGradle }) => (buildToolGradle ? 'build/' : 'target/'),
+        clientDistDir: ({ temporaryDir, buildToolGradle }) => `${temporaryDir}${buildToolGradle ? 'resources/main/' : 'classes/'}${CLIENT_DIST_DIR}`,
+        authenticationUsesCsrf: ({ authenticationType }) => [OAUTH2, SESSION].includes(authenticationType),
+        imperativeOrReactive: ({ reactive }) => (reactive ? 'reactive' : 'imperative'),
+    });
     if (application.databaseTypeSql) {
         prepareSqlApplicationProperties({ application });
     }

package/dist/generators/server/support/dependabot-gradle.mjs

@@ -20,5 +20,5 @@ import { parse } from '@iarna/toml';
 // eslint-disable-next-line import/prefer-default-export
 export function getGradleLibsVersionsProperties(libsVersionsContent) {
     const parsed = parse(libsVersionsContent);
-    return Object.fromEntries(Object.entries(parsed.plugins).map(([dependecyName, dependency]) => [dependecyName, dependency.version]));
+    return Object.fromEntries(Object.entries(parsed.plugins).map(([dependencyName, dependency]) => [dependencyName, dependency.version]));
 }

package/dist/generators/server/support/doc.mjs

@@ -39,7 +39,7 @@ export const formatDocAsJavaDoc = (text, indentSize = 0) => {
     }
     text = escapeDoubleQuotes(text);
     const indent = ' '.repeat(indentSize);
-    const rows = ['/**', ...text.split('/n').map(row => ` * ${row}`), ' */'].map(row => `${indent}${row}`);
+    const rows = ['/**', ...text.split('\\n').map(row => ` * ${row}`), ' */'].map(row => `${indent}${row}`);
     return rows.join('\n');
 };
 export const formatDocAsApiDescription = text => {

package/dist/generators/server/support/index.mjs

@@ -28,6 +28,7 @@ export * from './needles.mjs';
 export { default as prepareEntity } from './prepare-entity.mjs';
 export * from './prepare-entity.mjs';
 export { default as prepareField } from './prepare-field.mjs';
+export * from './prepare-relationship.mjs';
 export * from './relationship.mjs';
 export * from './spring-factories.mjs';
 export * from './string.mjs';

package/dist/generators/server/support/java-formatting.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 /**
  * @private
  * Convert to Java bean name case

package/dist/generators/server/support/needles.mjs

@@ -18,7 +18,7 @@ import { createBaseNeedle } from '../../base/support/needles.mjs';
  *   'ApplicationProperties.java',
  *   insertContentIntoApplicationProperties({
  *     property: 'private final bar = new Bar();',
- *     proppertyGetter: `
+ *     propertyGetter: `
  * public getBar() {
  *     return bar;
  * }`,

package/dist/generators/server/support/prepare-entity.mjs

@@ -22,6 +22,7 @@ import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js'
 import { normalizePathEnd } from '../../base/support/index.mjs';
 import { hibernateSnakeCase } from './string.mjs';
 import { getDatabaseTypeData } from './database.mjs';
+import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
 const { ELASTICSEARCH } = searchEngineTypes;
 const NO_SEARCH_ENGINE = searchEngineTypes.NO;
 const { POSTGRESQL, MYSQL, MARIADB, COUCHBASE, SQL } = databaseTypes;
@@ -38,6 +39,10 @@ export default function prepareEntity(entity) {
     entity.entityAbsolutePackage = entityAbsolutePackage;
     entity.entityAbsoluteFolder = entityAbsoluteFolder;
     entity.entityAbsoluteClass = `${entityAbsolutePackage}.domain.${persistClass}`;
+    if (entity.documentation) {
+        entity.entityJavadoc = formatDocAsJavaDoc(entity.documentation);
+        entity.entityApiDescription = formatDocAsApiDescription(entity.documentation);
+    }
     if (isReservedTableName(entity.entityInstance, entity.prodDatabaseType ?? entity.databaseType) && entity.jhiPrefix) {
         entity.entityInstanceDbSafe = `${entity.jhiPrefix}${entity.entityClass}`;
     }
@@ -80,7 +85,7 @@ export function preparePostEntityServerDerivedProperties(entity) {
     });
     entity.relationshipsContainOtherSideIgnore = entity.relationships.some(relationship => relationship.ignoreOtherSideProperty);
     entity.importApiModelProperty =
-        entity.relationships.some(relationship => relationship.javadoc) || entity.fields.some(field => field.javadoc);
+        entity.relationships.some(relationship => relationship.documentation) || entity.fields.some(field => field.documentation);
     entity.uniqueEnums = {};
     entity.fields.forEach(field => {
         if (field.fieldIsEnum &&