generator-jhipster 8.7.3 → 8.8.0

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

@@ -18,21 +18,20 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class JHipsterServerGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     /** @type {string} */
     jhipsterDependenciesVersion: any;
     /** @type {string} */
     projectVersion: any;
     beforeQueue(): Promise<void>;
     get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composeBackendType">;
-    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<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>>>, "loadEnvironmentVariables" | "setupServerconsts">;
-    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>>>, "blockhound">;
+    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<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>>>, "setupServerconsts">;
     get configuringEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").ConfiguringEachEntityTaskParam<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>>>, "configureFields" | "configureRelationships" | "configureMicroservice" | "configureGateway" | "configureEntitySearchEngine" | "configureModelFiltering" | "configurePagination" | "configureEntityTable">;
     get loadingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").LoadingEntitiesTaskParam<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>>>, "loadEntityConfig">;
     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 postPreparingEachEntity(): 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>>>, "checkForTableName">;
     /** @inheritdoc */
     get default(): 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>>>, "checkCompositeIds">;
-    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>>>, "packageJsonScripts" | "packageJsonBackendScripts" | "packageJsonE2eScripts">;
     /**
      * Validate the entityTableName
      * @return {true|string} true for a valid value or error message.
@@ -40,35 +39,4 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     _validateTableName(entityTableName: any, prodDatabaseType: any, entity: any): string | true;
     _validateField(entityName: any, field: any): void;
     _validateRelationship(entityName: any, relationship: any): void;
-    /**
-     * @private
-     * Return the method name which converts the filter to specification
-     * @param {string} fieldType
-     */
-    getSpecificationBuilder(fieldType: any): "buildRangeSpecification" | "buildStringSpecification" | "buildSpecification";
-    getJavaValueGeneratorForType(type: any): "UUID.randomUUID().toString()" | "UUID.randomUUID()" | "intCount.incrementAndGet()" | "longCount.incrementAndGet()";
-    /**
-     * @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;
-    /**
-     * @private
-     * Convert to Java bean name case
-     *
-     * Handle the specific case when the second letter is capitalized
-     * See http://stackoverflow.com/questions/2948083/naming-convention-for-getters-setters-in-java
-     *
-     * @param {string} beanName name of the class to check
-     * @return {string}
-     */
-    javaBeanCase(beanName: any): string;
-    buildJavaGet(reference: any): any;
-    buildJavaGetter(reference: any, type?: any): string;
-    buildJavaSetter(reference: any, valueDefinition?: string): string;
 }

package/dist/generators/server/generator.js

@@ -19,21 +19,17 @@
 import { existsSync } from 'fs';
 import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { packageJson } from '../../lib/index.js';
 import { CLIENT_WEBPACK_DIR, JAVA_COMPATIBLE_VERSIONS, JAVA_VERSION, JHIPSTER_DEPENDENCIES_VERSION, LOGIN_REGEX, MAIN_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, TEST_DIR, } from '../generator-constants.js';
-import { applicationTypes, buildToolTypes, clientFrameworkTypes, databaseTypes, entityOptions, fieldTypes, reservedKeywords, searchEngineTypes, validations, } from '../../lib/jhipster/index.js';
+import { applicationTypes, clientFrameworkTypes, databaseTypes, entityOptions, fieldTypes, reservedKeywords, searchEngineTypes, validations, } from '../../lib/jhipster/index.js';
 import { stringifyApplicationData } from '../base-application/support/index.js';
-import { createNeedleCallback, mutateData } from '../base/support/index.js';
+import { mutateData } from '../base/support/index.js';
 import { isReservedPaginationWords } from '../../lib/jhipster/reserved-keywords.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import { isReservedH2Keyword } from '../spring-data-relational/support/h2-reserved-keywords.js';
-import { getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, hibernateSnakeCase, javaBeanCase as javaBeanClassNameFormat, buildJavaGet as javaGetCall, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, } from './support/index.js';
-const dbTypes = fieldTypes;
-const { STRING: TYPE_STRING, INTEGER: TYPE_INTEGER, LONG: TYPE_LONG, BIG_DECIMAL: TYPE_BIG_DECIMAL, FLOAT: TYPE_FLOAT, DOUBLE: TYPE_DOUBLE, LOCAL_DATE: TYPE_LOCAL_DATE, ZONED_DATE_TIME: TYPE_ZONED_DATE_TIME, INSTANT: TYPE_INSTANT, DURATION: TYPE_DURATION, } = dbTypes.CommonDBTypes;
+import { hibernateSnakeCase } from './support/index.js';
 const { SUPPORTED_VALIDATION_RULES } = validations;
 const { isReservedTableName } = reservedKeywords;
 const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
-const { GRADLE, MAVEN } = buildToolTypes;
 const { SQL, NO: NO_DATABASE } = databaseTypes;
 const { GATEWAY } = applicationTypes;
 const { NO: NO_SEARCH_ENGINE } = searchEngineTypes;
@@ -42,7 +38,6 @@ const { INSTANT } = CommonDBTypes;
 const { BYTE_BUFFER } = RelationalOnlyDBTypes;
 const { PaginationTypes, ServiceTypes } = entityOptions;
 const { Validations: { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTERN }, } = validations;
-const WAIT_TIMEOUT = 3 * 60000;
 const { NO: NO_PAGINATION } = PaginationTypes;
 const { NO: NO_SERVICE } = ServiceTypes;
 export default class JHipsterServerGenerator extends BaseApplicationGenerator {
@@ -74,12 +69,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     }
     get loading() {
         return this.asLoadingTaskGroup({
-            loadEnvironmentVariables({ application }) {
-                application.packageInfoJavadocs?.push({ packageName: `${application.packageName}.aop.logging`, documentation: 'Logging aspect.' }, { packageName: `${application.packageName}.management`, documentation: 'Application management.' }, { packageName: `${application.packageName}.repository.rowmapper`, documentation: 'Webflux database column mapper.' }, { packageName: `${application.packageName}.security`, documentation: 'Application security utilities.' }, { packageName: `${application.packageName}.service.dto`, documentation: 'Data transfer objects for rest mapping.' }, { packageName: `${application.packageName}.service.mapper`, documentation: 'Data transfer objects mappers.' }, { packageName: `${application.packageName}.web.filter`, documentation: 'Request chain filters.' }, { packageName: `${application.packageName}.web.rest.errors`, documentation: 'Rest layer error handling.' }, { packageName: `${application.packageName}.web.rest.vm`, documentation: 'Rest layer visual models.' });
-                if (application.defaultPackaging === 'war') {
-                    this.log.info(`Using ${application.defaultPackaging} as default packaging`);
-                }
-            },
             setupServerconsts({ application, applicationDefaults }) {
                 // Make constants available in templates
                 applicationDefaults({
@@ -115,30 +104,12 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 else {
                     application.jhipsterDependenciesVersion = JHIPSTER_DEPENDENCIES_VERSION;
                 }
-                application.jhipsterPackageJson = packageJson;
             },
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
-    get preparing() {
-        return this.asPreparingTaskGroup({
-            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]() {
-        return this.delegateTasksToBlueprint(() => this.preparing);
-    }
     get configuringEachEntity() {
         return this.asConfiguringEachEntityTaskGroup({
             configureMicroservice({ application, entityConfig }) {
@@ -206,7 +177,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                         throw new Error(errorMessage);
                     }
                     this.log.warn(errorMessage);
-                    entityConfig.pagination = NO_PAGINATION;
+                    entityConfig.pagination = 'no';
                 }
             },
             configureEntityTable({ application, entityName, entityConfig }) {
@@ -333,94 +304,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.DEFAULT]() {
         return this.delegateTasksToBlueprint(() => this.default);
     }
-    get postWriting() {
-        return this.asPostWritingTaskGroup({
-            packageJsonScripts({ application }) {
-                const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
-                packageJsonConfigStorage.backend_port = application.gatewayServerPort || application.serverPort;
-                packageJsonConfigStorage.packaging = application.defaultPackaging;
-            },
-            packageJsonBackendScripts({ application }) {
-                const scriptsStorage = this.packageJson.createStorage('scripts');
-                const javaCommonLog = `-Dlogging.level.ROOT=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.${application.packageName}=OFF`;
-                const javaTestLog = '-Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF';
-                const buildTool = application.buildTool;
-                let e2ePackage = 'target/e2e';
-                if (buildTool === MAVEN) {
-                    const excludeWebapp = application.skipClient ? '' : ' -Dskip.installnodenpm -Dskip.npm';
-                    scriptsStorage.set({
-                        'app:start': './mvnw',
-                        'backend:info': './mvnw --version',
-                        'backend:doc:test': './mvnw -ntp javadoc:javadoc --batch-mode',
-                        'backend:nohttp:test': './mvnw -ntp checkstyle:check --batch-mode',
-                        'backend:start': `./mvnw${excludeWebapp}`,
-                        'java:jar': './mvnw -ntp verify -DskipTests --batch-mode',
-                        'java:war': './mvnw -ntp verify -DskipTests --batch-mode -Pwar',
-                        'java:docker': './mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild',
-                        'java:docker:arm64': 'npm run java:docker -- -Djib-maven-plugin.architecture=arm64',
-                        'backend:unit:test': `./mvnw -ntp${excludeWebapp} verify --batch-mode ${javaCommonLog} ${javaTestLog}`,
-                        'backend:build-cache': './mvnw dependency:go-offline -ntp',
-                        'backend:debug': './mvnw -Dspring-boot.run.jvmArguments="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000"',
-                    });
-                }
-                else if (buildTool === GRADLE) {
-                    const excludeWebapp = application.skipClient ? '' : '-x webapp -x webapp_test';
-                    e2ePackage = 'e2e';
-                    scriptsStorage.set({
-                        'app:start': './gradlew',
-                        'backend:info': './gradlew -v',
-                        'backend:doc:test': `./gradlew javadoc ${excludeWebapp}`,
-                        'backend:nohttp:test': `./gradlew checkstyleNohttp ${excludeWebapp}`,
-                        'backend:start': `./gradlew ${excludeWebapp}`,
-                        'java:jar': './gradlew bootJar -x test -x integrationTest',
-                        'java:war': './gradlew bootWar -Pwar -x test -x integrationTest',
-                        'java:docker': './gradlew bootJar -Pprod jibDockerBuild',
-                        'java:docker:arm64': 'npm run java:docker -- -PjibArchitecture=arm64',
-                        'backend:unit:test': `./gradlew test integrationTest ${excludeWebapp} ${javaCommonLog} ${javaTestLog}`,
-                        'postci:e2e:package': 'cp build/libs/*.$npm_package_config_packaging e2e.$npm_package_config_packaging',
-                        'backend:build-cache': 'npm run backend:info && npm run backend:nohttp:test && npm run ci:e2e:package -- -x webapp -x webapp_test',
-                    });
-                }
-                scriptsStorage.set({
-                    'java:jar:dev': 'npm run java:jar -- -Pdev,webapp',
-                    'java:jar:prod': 'npm run java:jar -- -Pprod',
-                    'java:war:dev': 'npm run java:war -- -Pdev,webapp',
-                    'java:war:prod': 'npm run java:war -- -Pprod',
-                    'java:docker:dev': 'npm run java:docker -- -Pdev,webapp',
-                    'java:docker:prod': 'npm run java:docker -- -Pprod',
-                    'ci:backend:test': 'npm run backend:info && npm run backend:doc:test && npm run backend:nohttp:test && npm run backend:unit:test -- -P$npm_package_config_default_environment',
-                    'ci:e2e:package': 'npm run java:$npm_package_config_packaging:$npm_package_config_default_environment -- -Pe2e -Denforcer.skip=true',
-                    'preci:e2e:server:start': 'npm run services:db:await --if-present && npm run services:others:await --if-present',
-                    'ci:e2e:server:start': `java -jar ${e2ePackage}.$npm_package_config_packaging --spring.profiles.active=e2e,$npm_package_config_default_environment ${javaCommonLog} ${javaTestLog} --logging.level.org.springframework.web=ERROR`,
-                });
-            },
-            packageJsonE2eScripts({ application }) {
-                const scriptsStorage = this.packageJson.createStorage('scripts');
-                const buildCmd = application.buildToolGradle ? 'gradlew' : 'mvnw -ntp';
-                let applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
-                applicationWaitTimeout = application.authenticationTypeOauth2 ? applicationWaitTimeout * 2 : applicationWaitTimeout;
-                const applicationEndpoint = application.applicationTypeMicroservice
-                    ? `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"`,
-                });
-                // TODO add e2eTests property to application.
-                if (this.jhipsterConfig.testFrameworks?.includes('cypress')) {
-                    scriptsStorage.set({
-                        'pree2e:headless': 'npm run ci:server:await',
-                        'ci:e2e:run': 'concurrently -k -s first -n application,e2e -c red,blue npm:ci:e2e:server:start npm:e2e:headless',
-                        'ci:e2e:dev': `concurrently -k -s first -n application,e2e -c red,blue "./${buildCmd}" npm:e2e:headless`,
-                        'e2e:dev': `concurrently -k -s first -n application,e2e -c red,blue "./${buildCmd}" npm:e2e`,
-                        'e2e:devserver': `concurrently -k -s first -n backend,frontend,e2e -c red,yellow,blue npm: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"`,
-                    });
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.delegateTasksToBlueprint(() => this.postWriting);
-    }
     /**
      * Validate the entityTableName
      * @return {true|string} true for a valid value or error message.
@@ -499,65 +382,4 @@ ${instructions}`);
             throw new Error(`relationshipSide is missing in .jhipster/${entityName}.json for relationship ${stringifyApplicationData(relationship)}`);
         }
     }
-    /**
-     * @private
-     * Return the method name which converts the filter to specification
-     * @param {string} fieldType
-     */
-    getSpecificationBuilder(fieldType) {
-        if ([
-            TYPE_INTEGER,
-            TYPE_LONG,
-            TYPE_FLOAT,
-            TYPE_DOUBLE,
-            TYPE_BIG_DECIMAL,
-            TYPE_LOCAL_DATE,
-            TYPE_ZONED_DATE_TIME,
-            TYPE_INSTANT,
-            TYPE_DURATION,
-        ].includes(fieldType)) {
-            return 'buildRangeSpecification';
-        }
-        if (fieldType === TYPE_STRING) {
-            return 'buildStringSpecification';
-        }
-        return 'buildSpecification';
-    }
-    getJavaValueGeneratorForType(type) {
-        return getJavaValueForType(type);
-    }
-    /**
-     * @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 getPKValue(primaryKey, databaseType, defaultValue);
-    }
-    /**
-     * @private
-     * Convert to Java bean name case
-     *
-     * Handle the specific case when the second letter is capitalized
-     * See http://stackoverflow.com/questions/2948083/naming-convention-for-getters-setters-in-java
-     *
-     * @param {string} beanName name of the class to check
-     * @return {string}
-     */
-    javaBeanCase(beanName) {
-        return javaBeanClassNameFormat(beanName);
-    }
-    buildJavaGet(reference) {
-        return javaGetCall(reference);
-    }
-    buildJavaGetter(reference, type = reference.type) {
-        return javaGetter(reference, type);
-    }
-    buildJavaSetter(reference, valueDefinition = `${reference.type} ${reference.name}`) {
-        return javaSetter(reference, valueDefinition);
-    }
 }

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:17.0
+FROM postgres:17.2
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:25.0.1
+FROM quay.io/keycloak/keycloak:26.0.7
 LABEL ALIAS=keycloak
 
 FROM mysql:9.1.0
 
-FROM mariadb:11.5.2
+FROM mariadb:11.6.2
 
-FROM mongo:8.0.3
+FROM mongo:8.0.4
 LABEL ALIAS=mongodb
 
-FROM couchbase/server:7.6.3
+FROM couchbase/server:7.6.4
 LABEL ALIAS=couchbase
 
 FROM cassandra:5.0
@@ -31,31 +31,28 @@ FROM cassandra:5.0
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.24.2
+FROM neo4j:5.26.0
 
 FROM hazelcast/management-center:5.6.0
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.32-alpine
+FROM memcached:1.6.33-alpine
 
 FROM redis:7.4.1
 
-FROM confluentinc/cp-kafka:7.7.1
+FROM apache/kafka-native:3.9.0
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.7.1
-LABEL ALIAS=zookeeper
-
-FROM apachepulsar/pulsar:4.0.0
+FROM apachepulsar/pulsar:4.0.1
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.7.0-community
+FROM sonarqube:24.12.0.100206-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.20.0
+FROM docker.io/bitnami/consul:1.20.1
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.55.0
+FROM prom/prometheus:v3.0.1
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.27.0
@@ -64,7 +61,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:11.3.0
+FROM grafana/grafana:11.4.0
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8

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

@@ -1,7 +1,7 @@
 [libraries]
-spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.3' }
+spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2024.0.0' }
 
-springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.6.0' }
+springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.7.0' }
 
 feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', version = '4.2.1' }
 
@@ -11,7 +11,7 @@ cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.20.1' }
 
 mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.5.0' }
 
-neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.13.3' }
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.15.1' }
 
 # Cassandra
 lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
@@ -30,16 +30,16 @@ node-gradle = { id = 'com.github.node-gradle.node', version = '7.1.0' }
 
 gradle-liquibase = { id = 'org.liquibase.gradle', version = '3.0.1' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '5.1.0.4882' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '6.0.1.5171' }
 
 spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' }
 
-gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.3' }
+gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.10.0' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.18.1' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.19' }
 
 common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.2' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.12.0.3' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.13.1.2' }
 
-gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.9.0' }
+gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.10.0' }

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

@@ -11,17 +11,17 @@
         <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.9.4</commons-beanutils.version>
-        <gatling.version>3.12.0</gatling.version>
+        <gatling.version>3.13.1</gatling.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-        <mapstruct.version>1.6.2</mapstruct.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.19.0</checkstyle.version>
+        <checkstyle.version>10.21.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.10.1</gatling-maven-plugin.version>
+        <gatling-maven-plugin.version>4.12.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>
@@ -30,18 +30,18 @@
         <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.10.1</maven-javadoc-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.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <modernizer-maven-plugin.version>2.9.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.9.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.10.0</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
-        <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
+        <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
     </properties>
 

package/dist/generators/server/support/config.d.ts

@@ -1,4 +1,5 @@
 import type { PlatformApplication } from '../../base-application/types.js';
+import type { ApplicationType } from '../../../lib/types/application/application.js';
 /**
  * Load server configs into application.
  * all variables should be set to dest,
@@ -6,7 +7,7 @@ import type { PlatformApplication } from '../../base-application/types.js';
  */
 export declare const loadServerConfig: ({ config, application }: {
     config: any;
-    application: any;
+    application: ApplicationType;
 }) => void;
 /**
  * @param {Object} config - config to load config from
@@ -26,9 +27,6 @@ export declare const loadDerivedServerAndPlatformProperties: ({ application }: {
 export declare const loadDerivedPlatformConfig: ({ application }: {
     application: PlatformApplication;
 }) => void;
-/**
- * @param {import('./bootstrap-application-server/types').SpringBootApplication} dest - destination context to use default is context
- */
 export declare const loadDerivedServerConfig: ({ application }: {
     application: any;
 }) => void;

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

@@ -74,9 +74,6 @@ export const loadDerivedPlatformConfig = ({ application }) => {
     application.monitoringPrometheus = application.monitoring === PROMETHEUS;
     loadDerivedServerAndPlatformProperties({ application });
 };
-/**
- * @param {import('./bootstrap-application-server/types').SpringBootApplication} dest - destination context to use default is context
- */
 export const loadDerivedServerConfig = ({ application }) => {
     application.prodDatabaseTypePostgresql = undefined;
     application.prodDatabaseTypeMssql = undefined;
@@ -108,9 +105,6 @@ export const loadDerivedServerConfig = ({ application }) => {
     application.databaseTypeMongodb = application.databaseType === MONGODB;
     application.databaseTypeNeo4j = application.databaseType === NEO4J;
     application.databaseTypeAny = !application.databaseTypeNo;
-    application.databaseMigrationLiquibase = application.databaseMigration
-        ? application.databaseMigration === 'liquibase'
-        : application.databaseType === SQL;
     mutateData(application, {
         packageFolder: ({ packageName }) => `${packageName.replace(/\./g, '/')}/`,
         javaPackageSrcDir: ({ srcMainJava, packageFolder }) => normalizePathEnd(`${srcMainJava}${packageFolder}`),

package/dist/generators/server/support/prepare-entity.d.ts

@@ -1,3 +1,4 @@
-export default function prepareEntity(entity: any): void;
+import type { ApplicationType } from '../../../lib/types/application/application.js';
+export default function prepareEntity(entity: any, application: ApplicationType): void;
 export declare function loadRequiredConfigDerivedProperties(entity: any): void;
 export declare function preparePostEntityServerDerivedProperties(entity: any): void;

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

@@ -25,8 +25,9 @@ import { hibernateSnakeCase } from './string.js';
 import { getDatabaseTypeData } from './database.js';
 const { NO: NO_SEARCH_ENGINE, ELASTICSEARCH } = searchEngineTypes;
 const { POSTGRESQL, MYSQL, MARIADB, COUCHBASE, SQL, NEO4J } = databaseTypes;
-export default function prepareEntity(entity) {
-    const { entityPackage, packageName, packageFolder, persistClass } = entity;
+export default function prepareEntity(entity, application) {
+    const { packageFolder } = application;
+    const { entityPackage, packageName, persistClass } = entity;
     let { entityAbsolutePackage = packageName, entityAbsoluteFolder = packageFolder, entityJavaPackageFolder } = entity;
     if (entityPackage) {
         entityJavaPackageFolder = `${entityPackage.replace(/\./g, '/')}/`;

package/dist/generators/server/support/prepare-field.d.ts

@@ -1 +1,2 @@
-export default function prepareField(entityWithConfig: any, field: any, generator: any): void;
+import type { Field } from '../../../lib/types/application/field.js';
+export default function prepareField(entityWithConfig: any, field: Field & any, generator: any): void;

package/dist/generators/server/support/prepare-field.js

@@ -21,6 +21,7 @@ import { snakeCase, upperFirst } from 'lodash-es';
 import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../lib/jhipster/index.js';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
 import { mutateData } from '../../../lib/utils/object.js';
+import { applyDerivedProperty } from '../../base/support/index.js';
 import { getUXConstraintName } from './database.js';
 import { getJavaValueGeneratorForType } from './templates/field-values.js';
 const { isReservedTableName } = reservedKeywords;
@@ -141,6 +142,7 @@ export default function prepareField(entityWithConfig, field, generator) {
     else {
         field.javaFieldType = field.fieldType;
     }
+    applyDerivedProperty(field, 'javaFieldType', ['String', 'Integer', 'Long', 'UUID']);
     if (field.fieldTypeInteger || field.fieldTypeLong || field.fieldTypeString || field.fieldTypeUUID) {
         if (field.fieldTypeInteger) {
             field.javaValueSample1 = '1';

package/dist/generators/server/support/prepare-relationship.d.ts

@@ -1,4 +1,5 @@
+import type { Relationship } from '../../../lib/types/application/relationship.js';
 export declare function prepareRelationship({ relationship }: {
-    relationship: any;
+    relationship: Relationship;
     entity: any;
 }): void;

package/dist/generators/server/support/templates/field-values.d.ts

@@ -1,3 +1,4 @@
+import type { PrimaryKey } from '../../../../lib/types/application/entity.js';
 /**
  * Returns the java value generator for the given primaryKey type
  */
@@ -11,4 +12,4 @@ export declare const getJavaValueGeneratorForType: (type: any) => "UUID.randomUU
  * @param {number} defaultValue - default value
  * @returns {string} java primary key value
  */
-export declare const getPrimaryKeyValue: (primaryKey: any, databaseType: any, defaultValue?: number) => string;
+export declare const getPrimaryKeyValue: (primaryKey: PrimaryKey | string, databaseType: string, defaultValue?: number) => string;

package/dist/generators/server/support/templates/field-values.js

@@ -49,13 +49,14 @@ export const getJavaValueGeneratorForType = (type) => {
  */
 export const getPrimaryKeyValue = (primaryKey, databaseType, defaultValue = 1) => {
     if (typeof primaryKey === 'object' && primaryKey.composite) {
-        return `new ${primaryKey.type}(${primaryKey.references
-            .map(ref => getPrimaryKeyValue(ref.type, databaseType, defaultValue))
+        return `new ${primaryKey.type}(${primaryKey.fields
+            .map(ref => getPrimaryKeyValue(ref.fieldType, databaseType, defaultValue))
             .join(', ')})`;
     }
+    const random = ![1, 2].includes(defaultValue);
     const primaryKeyType = typeof primaryKey === 'string' ? primaryKey : primaryKey.type;
     if (primaryKeyType === STRING) {
-        if (databaseType === SQL && defaultValue === 0) {
+        if (databaseType === SQL && random) {
             return getJavaValueGeneratorForType(primaryKeyType);
         }
         return `"id${defaultValue}"`;

package/dist/generators/server/support/update-languages.d.ts

@@ -16,11 +16,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { Language } from '../../languages/support/languages.js';
 /**
  * Update Languages In MailServiceIT
  *
  * @param application
  */
-export declare const updateLanguagesInMailServiceITTask: (this: import("../../index.js").GeneratorBaseCore, params: 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>>>) => void;
-declare const _default: (this: import("../../index.js").GeneratorBaseCore, params: 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>>>) => void;
+export declare const updateLanguagesInMailServiceITTask: (this: import("../../index.js").GeneratorBaseCore, params: import("../../../lib/types/application/tasks.js").PostWritingTaskParam<any, {
+    javaPackageTestDir?: string;
+    languagesDefinition?: readonly Language[];
+}>) => void;
+declare const _default: (this: import("../../index.js").GeneratorBaseCore, params: import("../../../lib/types/application/tasks.js").PostWritingTaskParam<any, {
+    javaPackageTestDir?: string;
+    languagesDefinition?: readonly Language[];
+}>) => void;
 export default _default;