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

package/dist/generators/generator-constants.mjs

@@ -16,26 +16,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0-beta.3';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0-rc.1';
 // Version of Java
 export const JAVA_VERSION = '17';
 export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM
-export const NODE_VERSION = '18.17.1';
+export const NODE_VERSION = '18.18.1';
 export const OPENAPI_GENERATOR_CLI_VERSION = '2.7.0';
 export const javaDependencies = {
     /**
      * spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
      */
-    'spring-boot': '3.1.3',
+    'spring-boot': '3.1.4',
     /*
      * hibernate version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
      * Required due to hibernate-jpamodelgen annotation processor.
      */
-    hibernate: '6.2.7.Final',
+    hibernate: '6.2.9.Final',
     /*
      * cassandra driver version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
      * Required due to java-driver-mapper-processor annotation processor.
@@ -87,7 +88,8 @@ export const CLIENT_DIST_DIR = 'static/';
 export const GENERATOR_JHIPSTER = 'generator-jhipster';
 export const YO_RC_FILE = '.yo-rc.json';
 export const JHIPSTER_CONFIG_DIR = '.jhipster';
-export const DOCKER_DIR = `${MAIN_DIR}docker/`;
+export const TEMPLATES_DOCKER_DIR = 'docker/';
+export const JAVA_DOCKER_DIR = `${MAIN_DIR}docker/`;
 export const LINE_LENGTH = 180;
 export const CLIENT_MAIN_SRC_DIR = `${MAIN_DIR}webapp/`;
 export const CLIENT_TEST_SRC_DIR = `${TEST_DIR}javascript/`;

package/dist/generators/generator-list.mjs

@@ -18,9 +18,6 @@
  */
 export const GENERATOR_ANGULAR = 'angular';
 export const GENERATOR_APP = 'app';
-export const GENERATOR_AWS = 'aws';
-export const GENERATOR_AZURE_APP_SERVICE = 'azure-app-service';
-export const GENERATOR_AZURE_SPRING_CLOUD = 'azure-spring-cloud';
 export const GENERATOR_BASE = 'base';
 export const GENERATOR_BASE_APPLICATION = 'base-application';
 export const GENERATOR_BASE_CORE = 'base-core';
@@ -34,7 +31,6 @@ export const GENERATOR_BOOTSTRAP_APPLICATION_SERVER = 'bootstrap-application-ser
 export const GENERATOR_BOOTSTRAP_WORKSPACES = 'bootstrap-workspaces';
 export const GENERATOR_CI_CD = 'ci-cd';
 export const GENERATOR_CLIENT = 'client';
-export const GENERATOR_CLOUDFOUNDRY = 'cloudfoundry';
 export const GENERATOR_COMMON = 'common';
 export const GENERATOR_CUCUMBER = 'cucumber';
 export const GENERATOR_CYPRESS = 'cypress';
@@ -43,7 +39,6 @@ export const GENERATOR_DOCKER_COMPOSE = 'docker-compose';
 export const GENERATOR_ENTITIES = 'entities';
 export const GENERATOR_ENTITY = 'entity';
 export const GENERATOR_EXPORT_JDL = 'export-jdl';
-export const GENERATOR_GAE = 'gae';
 export const GENERATOR_GATLING = 'gatling';
 export const GENERATOR_GENERATE_BLUEPRINT = 'generate-blueprint';
 export const GENERATOR_GIT = 'git';
@@ -59,22 +54,17 @@ export const GENERATOR_KUBERNETES_KNATIVE = 'kubernetes-knative';
 export const GENERATOR_LANGUAGES = 'languages';
 export const GENERATOR_LIQUIBASE = 'liquibase';
 export const GENERATOR_MAVEN = 'maven';
-export const GENERATOR_OPENAPI_CLIENT = 'openapi-client';
-export const GENERATOR_OPENSHIFT = 'openshift';
-export const GENERATOR_PAGE = 'page';
 export const GENERATOR_PROJECT_NAME = 'project-name';
 export const GENERATOR_REACT = 'react';
 export const GENERATOR_SERVER = 'server';
 export const GENERATOR_SPRING_CACHE = 'spring-cache';
 export const GENERATOR_SPRING_CLOUD_STREAM = 'spring-cloud-stream';
-export const GENERATOR_SPRING_CONTROLLER = 'spring-controller';
 export const GENERATOR_SPRING_DATA_CASSANDRA = 'spring-data-cassandra';
 export const GENERATOR_SPRING_DATA_COUCHBASE = 'spring-data-couchbase';
 export const GENERATOR_SPRING_DATA_ELASTICSEARCH = 'spring-data-elasticsearch';
 export const GENERATOR_SPRING_DATA_MONGODB = 'spring-data-mongodb';
 export const GENERATOR_SPRING_DATA_NEO4J = 'spring-data-neo4j';
 export const GENERATOR_SPRING_DATA_RELATIONAL = 'spring-data-relational';
-export const GENERATOR_SPRING_SERVICE = 'spring-service';
 export const GENERATOR_SPRING_WEBSOCKET = 'spring-websocket';
 export const GENERATOR_UPGRADE = 'upgrade';
 export const GENERATOR_VUE = 'vue';

package/dist/generators/git/generator.mjs

@@ -31,10 +31,12 @@ export default class InitGenerator extends BaseGenerator {
     gitInitialized;
     skipGit;
     async beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_GIT);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+        }
     }
     get initializing() {
         return this.asInitializingTaskGroup({

package/dist/generators/gradle/constants.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const GRADLE_VERSION = '8.3';
+export const GRADLE_VERSION = '8.4';
 export const GRADLE = 'gradle';
 export const GRADLE_DESCRIPTION = 'Gradle';
 export const BUILD_DESTINATION_VALUE = 'build';

package/dist/generators/gradle/files.mjs

@@ -19,12 +19,11 @@
 export default {
     gradle: [
         {
-            templates: [
-                { file: 'gradlew', noEjs: true },
-                { file: 'gradlew.bat', noEjs: true },
-                { file: 'gradle/wrapper/gradle-wrapper.jar', noEjs: true },
-                'gradle/wrapper/gradle-wrapper.properties',
-            ],
+            templates: ['.prettierignore.jhi.gradle', 'gradle/wrapper/gradle-wrapper.properties'],
+        },
+        {
+            transform: false,
+            templates: ['gradlew', 'gradlew.bat', 'gradle/wrapper/gradle-wrapper.jar'],
         },
     ],
 };

package/dist/generators/gradle/generator.mjs

@@ -27,9 +27,11 @@ import { applyFromGradleCallback, addGradleDependencyCallback, addGradleMavenRep
 export default class GradleGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
             await this.composeWithBlueprints(GENERATOR_GRADLE);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+        }
     }
     get configuring() {
         return this.asConfiguringTaskGroup({

package/dist/generators/gradle/templates/.prettierignore.jhi.gradle.ejs

@@ -0,0 +1,24 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<&_ if (!fragment.section) { -&>
+# Generated by jhipster:gradle
+build
+gradle
+.gradle
+<&_ } -&>

package/dist/generators/heroku/generator.mjs

@@ -21,7 +21,7 @@ import crypto from 'crypto';
 import fs from 'fs';
 import ChildProcess from 'child_process';
 import util from 'util';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import chalk from 'chalk';
 import { glob } from 'glob';
 import runAsync from 'run-async';
@@ -34,7 +34,6 @@ import { mavenProfileContent } from './templates.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
 import { addGradlePluginCallback, applyFromGradleCallback } from '../gradle/internal/needles.mjs';
 import { getFrontendAppName } from '../base/support/index.mjs';
-import { buildApplication } from '../server/internal/index.mjs';
 import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
 import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
 import { loadLanguagesConfig } from '../languages/support/index.mjs';
@@ -593,7 +592,7 @@ export default class HerokuGenerator extends BaseGenerator {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
     get end() {
-        return {
+        return this.asEndTaskGroup({
             makeScriptExecutable() {
                 if (this.abort)
                     return;
@@ -606,27 +605,17 @@ export default class HerokuGenerator extends BaseGenerator {
                     }
                 }
             },
-            productionBuild: runAsync(function () {
+            async productionBuild() {
                 if (this.abort)
                     return;
                 if (this.herokuSkipBuild || this.herokuDeployType === 'git') {
                     this.log.log(chalk.bold('\nSkipping build'));
                     return;
                 }
-                const done = this.async();
                 this.log.log(chalk.bold('\nBuilding application'));
-                const child = buildApplication(this.buildTool, 'prod', false, err => {
-                    if (err) {
-                        this.abort = true;
-                        this.log.error(err);
-                    }
-                    done();
-                });
-                this.buildCmd = child.buildCmd;
-                child.stdout.on('data', data => {
-                    process.stdout.write(data.toString());
-                });
-            }),
+                // Use npm script so blueprints just need to override it.
+                await this.spawnCommand('npm run java:jar:prod', { stdio: 'inherit' });
+            },
             async productionDeploy() {
                 if (this.abort)
                     return;
@@ -815,7 +804,7 @@ export default class HerokuGenerator extends BaseGenerator {
                     }
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.END]() {
         return this.delegateTasksToBlueprint(() => this.end);

package/dist/generators/heroku/templates/application-heroku.yml.ejs

@@ -65,7 +65,7 @@ jhipster:
   <%_ } _%>
 <%_ } _%>
 spring:
-<%_ if (prodDatabaseTypePostgres || prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
+<%_ if (prodDatabaseTypePostgresql || prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     url: ${JDBC_DATABASE_URL}

package/dist/generators/index.js

@@ -1,4 +1,4 @@
-export { JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR, NODE_VERSION as RECOMMENDED_NODE_VERSION, JAVA_VERSION as RECOMMENDED_JAVA_VERSION, JAVA_COMPATIBLE_VERSIONS, JHIPSTER_DEPENDENCIES_VERSION, SERVER_MAIN_SRC_DIR as JAVA_MAIN_SOURCES_DIR, SERVER_MAIN_RES_DIR as JAVA_MAIN_RESOURCES_DIR, SERVER_TEST_SRC_DIR as JAVA_TEST_SOURCES_DIR, SERVER_TEST_RES_DIR as JAVA_SERVER_TEST_RESOURCES_DIR, CLIENT_MAIN_SRC_DIR as JAVA_WEBAPP_SOURCES_DIR, CLIENT_TEST_SRC_DIR as JAVA_JAVASCRIPT_TEST_DIR, DOCKER_DIR as JAVA_DOCKER_DIR, SERVER_MAIN_SRC_DIR as TEMPLATES_MAIN_SOURCES_DIR, SERVER_MAIN_RES_DIR as TEMPLATES_MAIN_RESOURCES_DIR, SERVER_TEST_SRC_DIR as TEMPLATES_TEST_SOURCES_DIR, SERVER_TEST_RES_DIR as TEMPLATES_TEST_RESOURCES_DIR, CLIENT_MAIN_SRC_DIR as TEMPLATES_WEBAPP_SOURCES_DIR, CLIENT_TEST_SRC_DIR as TEMPLATES_JAVASCRIPT_TEST_DIR, DOCKER_DIR as TEMPLATES_DOCKER_DIR, } from './generator-constants.mjs';
+export { JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR, NODE_VERSION as RECOMMENDED_NODE_VERSION, JAVA_VERSION as RECOMMENDED_JAVA_VERSION, JAVA_COMPATIBLE_VERSIONS, JHIPSTER_DEPENDENCIES_VERSION, SERVER_MAIN_SRC_DIR as JAVA_MAIN_SOURCES_DIR, SERVER_MAIN_RES_DIR as JAVA_MAIN_RESOURCES_DIR, SERVER_TEST_SRC_DIR as JAVA_TEST_SOURCES_DIR, SERVER_TEST_RES_DIR as JAVA_SERVER_TEST_RESOURCES_DIR, CLIENT_MAIN_SRC_DIR as JAVA_WEBAPP_SOURCES_DIR, CLIENT_TEST_SRC_DIR as JAVA_JAVASCRIPT_TEST_DIR, JAVA_DOCKER_DIR, TEMPLATES_DOCKER_DIR, SERVER_MAIN_SRC_DIR as TEMPLATES_MAIN_SOURCES_DIR, SERVER_MAIN_RES_DIR as TEMPLATES_MAIN_RESOURCES_DIR, SERVER_TEST_SRC_DIR as TEMPLATES_TEST_SOURCES_DIR, SERVER_TEST_RES_DIR as TEMPLATES_TEST_RESOURCES_DIR, CLIENT_MAIN_SRC_DIR as TEMPLATES_WEBAPP_SOURCES_DIR, CLIENT_TEST_SRC_DIR as TEMPLATES_JAVASCRIPT_TEST_DIR, } from './generator-constants.mjs';
 export { default as GeneratorBase } from './base/index.mjs';
 export { default as GeneratorBaseCore } from './base-core/index.mjs';
 export { default as GeneratorBaseApplication } from './base-application/index.mjs';

package/dist/generators/info/generator.mjs

@@ -30,7 +30,7 @@ export default class InfoGenerator extends BaseApplicationGenerator {
         super(args, options, {
             jhipsterBootstrap: false,
             storeJHipsterVersion: false,
-            customInstallTask: true,
+            customInstallTask: options.commandName === 'info' ? true : undefined,
             customCommitTask: true,
             ...features,
         });
@@ -41,13 +41,8 @@ export default class InfoGenerator extends BaseApplicationGenerator {
                 this.log.log(chalk.white('Welcome to the JHipster Information Sub-Generator\n'));
             },
             async checkJHipster() {
-                try {
-                    const { stdout } = await this.spawnCommand('npm list generator-jhipster', { stdio: 'pipe' });
-                    console.log(`\n\`\`\`\n${stdout}\`\`\`\n`);
-                }
-                catch (error) {
-                    console.log(`\n\`\`\`\n${error.stdout}\`\`\`\n`);
-                }
+                const { stdout } = await this.spawnCommand('npm list generator-jhipster', { stdio: 'pipe', reject: false });
+                console.log(`\n\`\`\`\n${stdout}\`\`\`\n`);
             },
             displayConfiguration() {
                 // Omit sensitive information.
@@ -108,7 +103,7 @@ export default class InfoGenerator extends BaseApplicationGenerator {
     }
     async checkCommand(command, args, printInfo = ({ stdout }) => console.log(stdout)) {
         try {
-            printInfo(await this.spawnCommand(command, args, { stdio: 'pipe' }));
+            printInfo(await this.spawn(command, args, { stdio: 'pipe' }));
         }
         catch (_error) {
             console.log(chalk.red(`'${command}' command could not be found`));

package/dist/generators/init/generator.mjs

@@ -29,10 +29,12 @@ import { packageJson } from '../../lib/index.mjs';
  */
 export default class InitGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_INIT);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+        }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
@@ -60,8 +62,8 @@ export default class InitGenerator extends BaseApplicationGenerator {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
     get composing() {
-        return this.asLoadingTaskGroup({
-            async loadConfig() {
+        return this.asComposingTaskGroup({
+            async compose() {
                 await this.composeWithJHipster(GENERATOR_GIT);
             },
         });
@@ -91,6 +93,21 @@ export default class InitGenerator extends BaseApplicationGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
+            addPrettierDependencies({ application }) {
+                this.packageJson.merge({
+                    scripts: {
+                        'prettier-check': 'prettier --check "{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
+                        'prettier-format': 'prettier --write "{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
+                    },
+                    devDependencies: {
+                        prettier: application.nodeDependencies.prettier,
+                        'prettier-plugin-packagejson': application.nodeDependencies['prettier-plugin-packagejson'],
+                    },
+                    engines: {
+                        node: application.applicationNodeEngine,
+                    },
+                });
+            },
             addCommitHookDependencies({ application }) {
                 if (application.skipCommitHook)
                     return;

package/dist/generators/init/templates/package.json.ejs

@@ -26,16 +26,9 @@
     "node_modules"
   ],
   "dependencies": {},
-  "devDependencies": {
-    "prettier": "<%= nodeDependencies['prettier'] %>",
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>"
-  },
+  "devDependencies": {},
   "engines": {
     "node": "<%= applicationNodeEngine %>"
   },
-  "scripts": {
-    "prettier-check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\"",
-    "prettier-format": "prettier --write \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\""
-  }
+  "scripts": {}
 }

package/dist/generators/java/command.mjs

@@ -8,6 +8,25 @@ const command = {
         packageInfoFile: {
             description: 'write package-info.java file for every package',
             type: Boolean,
+            default: true,
+            scope: 'generator',
+            hide: true,
+        },
+        generateEntities: {
+            type: Boolean,
+            default: true,
+            scope: 'generator',
+            hide: true,
+        },
+        useJakartaValidation: {
+            type: Boolean,
+            default: true,
+            scope: 'generator',
+            hide: true,
+        },
+        generateEnums: {
+            type: Boolean,
+            default: true,
             scope: 'generator',
             hide: true,
         },

package/dist/generators/java/entity-files.mjs

@@ -0,0 +1,27 @@
+import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from './support/index.mjs';
+export const entityServerFiles = {
+    model: [
+        javaMainPackageTemplatesBlock({
+            templates: ['_entityPackage_/domain/_persistClass_.java.jhi'],
+        }),
+    ],
+    modelTestFiles: [
+        javaTestPackageTemplatesBlock({
+            templates: ['_entityPackage_/domain/_persistClass_Test.java'],
+        }),
+    ],
+    server: [
+        javaMainPackageTemplatesBlock({
+            condition: ctx => ctx.useJakartaValidation,
+            templates: ['_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation'],
+        }),
+    ],
+};
+export const enumFiles = {
+    enumFiles: [
+        javaMainPackageTemplatesBlock({
+            renameTo: (data, filepath) => filepath.replace('_enumName_', data.enumName),
+            templates: ['_entityPackage_/domain/enumeration/_enumName_.java'],
+        }),
+    ],
+};

package/dist/generators/java/generator.mjs

@@ -25,18 +25,25 @@ import { packageInfoTransform, generatedAnnotationTransform, checkJava } from '.
 import command from './command.mjs';
 import { JAVA_COMPATIBLE_VERSIONS } from '../generator-constants.mjs';
 import { matchMainJavaFiles } from './support/package-info-transform.mjs';
+import { entityServerFiles, enumFiles } from './entity-files.mjs';
+import { getEnumInfo } from '../base-application/support/index.mjs';
 export default class JavaGenerator extends BaseApplicationGenerator {
-    packageInfoFile = true;
+    packageInfoFile;
+    generateEntities;
+    useJakartaValidation;
+    generateEnums;
     async beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_JAVA);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+        }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
             loadConfig() {
-                this.parseJHipsterOptions(command.options);
+                this.parseJHipsterCommand(command);
             },
             validateJava() {
                 if (!this.skipChecks) {
@@ -95,6 +102,44 @@ export default class JavaGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
+    get writingEntities() {
+        return this.asWritingEntitiesTaskGroup({
+            async writeServerFiles({ application, entities }) {
+                if (!this.generateEntities)
+                    return;
+                const { useJakartaValidation } = this;
+                for (const entity of entities.filter(entity => !entity.skipServer && !entity.builtIn)) {
+                    await this.writeFiles({
+                        sections: entityServerFiles,
+                        context: { ...application, ...entity, useJakartaValidation },
+                    });
+                }
+            },
+            async writeEnumFiles({ application, entities }) {
+                if (!this.generateEnums || !this.generateEntities)
+                    return;
+                for (const entity of entities.filter(entity => !entity.skipServer)) {
+                    for (const field of entity.fields.filter(field => field.fieldIsEnum)) {
+                        const enumInfo = {
+                            ...getEnumInfo(field, entity.clientRootFolder),
+                            frontendAppName: entity.frontendAppName,
+                            packageName: application.packageName,
+                            javaPackageSrcDir: application.javaPackageSrcDir,
+                            entityJavaPackageFolder: entity.entityJavaPackageFolder,
+                            entityAbsolutePackage: entity.entityAbsolutePackage || application.packageName,
+                        };
+                        await this.writeFiles({
+                            sections: enumFiles,
+                            context: enumInfo,
+                        });
+                    }
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING_ENTITIES]() {
+        return this.delegateTasksToBlueprint(() => this.writingEntities);
+    }
     /**
      * Check if a supported Java is installed
      *

package/dist/generators/java/support/files.mjs

@@ -17,58 +17,67 @@
  * limitations under the License.
  */
 import { SERVER_TEST_SRC_DIR, SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../../generator-constants.mjs';
-export const replaceFilePathVariables = (data, filePath) => filePath?.replace(/_package_/, data.packageName)?.replace(/_\w*/, '');
 export const replaceEntityFilePathVariables = (data, filePath) => {
     filePath = filePath
-        ?.replace(/_package_/, data.entityJavaPackageFolder)
-        ?.replace(/_PersistClass_/, data.persistClass)
-        ?.replace(/_EntityClass_/, data.entityClass)
-        ?.replace(/_DtoClass_/, data.dtoClass);
+        ?.replace(/_package_/, data.packageFolder)
+        ?.replace(/_entityPackage_/, data.entityJavaPackageFolder)
+        ?.replace(/_mainClass_/, data.mainClass)
+        ?.replace(/_persistClass_/, data.persistClass)
+        ?.replace(/_entityClass_/, data.entityClass)
+        ?.replace(/_dtoClass_/, data.dtoClass);
     return filePath?.includes('.jhi.') ? filePath : filePath?.replace(/_\w*/, '');
 };
 /**
  * Move the template to `javaPackageSrcDir` (defaults to`src/main/java/${packageFolder}/${filePath}`).
  * Removes trailing specifiers.
  */
-export const moveToJavaPackageSrcDir = (data, filePath) => `${data.javaPackageSrcDir}${replaceFilePathVariables(data, filePath) ?? ''}`;
+export const moveToJavaPackageSrcDir = (data, filePath) => `${data.javaPackageSrcDir}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 /**
  * Move the template to `javaPackageTestDir` (defaults to`src/main/java/${packageFolder}/${filePath}`).
  * Removes trailing specifiers.
  */
-export const moveToJavaPackageTestDir = (data, filePath) => `${data.javaPackageTestDir}${replaceFilePathVariables(data, filePath) ?? ''}`;
+export const moveToJavaPackageTestDir = (data, filePath) => `${data.javaPackageTestDir}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 export const moveToJavaEntityPackageSrcDir = (data, filePath) => `${data.srcMainJava}${data.entityAbsoluteFolder}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 export const moveToJavaEntityPackageTestDir = (data, filePath) => `${data.srcTestJava}${data.entityAbsoluteFolder}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 export const moveToSrcMainResourcesDir = (data, filePath) => `${data.srcMainResources}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 export const moveToSrcTestResourcesDir = (data, filePath) => `${data.srcTestResources}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
-export const javaMainPackageTemplatesBlock = (relativePath = '') => {
-    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
+export function javaMainPackageTemplatesBlock(blockOrRelativePath = '') {
+    return javaBlock({
+        srcPath: `${SERVER_MAIN_SRC_DIR}_package_/`,
+        destProperty: 'javaPackageSrcDir',
+        blockOrRelativePath,
+    });
+}
+export function javaMainResourceTemplatesBlock(blockOrRelativePath = '') {
+    return javaBlock({
+        srcPath: SERVER_MAIN_RES_DIR,
+        destProperty: 'srcMainResources',
+        blockOrRelativePath,
+    });
+}
+export function javaTestResourceTemplatesBlock(blockOrRelativePath = '') {
+    return javaBlock({
+        srcPath: SERVER_TEST_RES_DIR,
+        destProperty: 'srcTestResources',
+        blockOrRelativePath,
+    });
+}
+export function javaTestPackageTemplatesBlock(blockOrRelativePath = '') {
+    return javaBlock({
+        srcPath: `${SERVER_TEST_SRC_DIR}_package_/`,
+        destProperty: 'javaPackageTestDir',
+        blockOrRelativePath,
+    });
+}
+function javaBlock({ srcPath, destProperty, blockOrRelativePath = '', }) {
+    const block = typeof blockOrRelativePath !== 'string' ? blockOrRelativePath : undefined;
+    const blockRenameTo = typeof block?.renameTo === 'function' ? block.renameTo : undefined;
+    const relativePath = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : blockOrRelativePath.relativePath ?? '';
     return {
-        path: `${SERVER_MAIN_SRC_DIR}_package_/${relativePath}`,
-        renameTo: (data, filePath) => `${data.javaPackageSrcDir}${relativePath}${data.entityJavaPackageFolder ?? ''}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
-        ...(typeof relativePath === 'object' ? relativePath : undefined),
+        path: `${srcPath}${relativePath}`,
+        ...block,
+        renameTo(data, filePath) {
+            return `${data[destProperty]}${replaceEntityFilePathVariables(data, relativePath) ?? ''}${replaceEntityFilePathVariables(data, blockRenameTo?.call?.(this, data, filePath) ?? filePath) ?? ''}`;
+        },
     };
-};
-export const javaMainResourceTemplatesBlock = (relativePath = '') => {
-    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-    return {
-        path: `${SERVER_MAIN_RES_DIR}${relativePath}`,
-        renameTo: (data, filePath) => `${data.srcMainResources}${relativePath}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
-        ...(typeof relativePath === 'object' ? relativePath : undefined),
-    };
-};
-export const javaTestResourceTemplatesBlock = (relativePath = '') => {
-    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-    return {
-        path: `${SERVER_TEST_RES_DIR}${relativePath}`,
-        renameTo: (data, filePath) => `${data.srcTestResources}${relativePath}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
-        ...(typeof relativePath === 'object' ? relativePath : undefined),
-    };
-};
-export const javaTestPackageTemplatesBlock = (relativePath = '') => {
-    relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-    return {
-        path: `${SERVER_TEST_SRC_DIR}_package_/${relativePath}`,
-        renameTo: (data, filePath) => `${data.javaPackageTestDir}${relativePath}${data.entityJavaPackageFolder ?? ''}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
-        ...(typeof relativePath === 'object' ? relativePath : undefined),
-    };
-};
+}

package/dist/generators/java/support/util.mjs

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { getMicroserviceAppName } from '../../base/support/index.mjs';
 const { upperFirst } = _;
 /**