generator-jhipster 8.2.0 → 8.3.0

package/dist/generators/java/generators/build-tool/generator.js

@@ -0,0 +1,143 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+import { buildToolTypes } from '../../../../jdl/index.js';
+import BaseApplicationGenerator from '../../../base-application/index.js';
+import { GENERATOR_GRADLE, GENERATOR_MAVEN } from '../../../generator-list.js';
+import { javaScopeToGradleScope } from '../../support/index.js';
+const { GRADLE, MAVEN } = buildToolTypes;
+export default class BuildToolGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster('jhipster:java:bootstrap');
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            async initializing() {
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get prompting() {
+        return this.asPromptingTaskGroup({
+            async promptCommand({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PROMPTING]() {
+        return this.delegateTasksToBlueprint(() => this.prompting);
+    }
+    get composing() {
+        return this.asComposingTaskGroup({
+            async composing() {
+                const { buildTool } = this.jhipsterConfigWithDefaults;
+                if (buildTool === GRADLE) {
+                    await this.composeWithJHipster(GENERATOR_GRADLE);
+                }
+                else if (buildTool === MAVEN) {
+                    await this.composeWithJHipster(GENERATOR_MAVEN);
+                }
+                else {
+                    throw new Error(`Build tool ${buildTool} is not supported`);
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.COMPOSING]() {
+        return this.delegateTasksToBlueprint(() => this.composing);
+    }
+    get preparing() {
+        return this.asPreparingTaskGroup({
+            prepareJavaApplication({ application, source }) {
+                source.addJavaDependencies = (dependencies, options) => {
+                    if (application.buildToolMaven) {
+                        const annotationProcessors = dependencies.filter(dep => dep.scope === 'annotationProcessor');
+                        const importDependencies = dependencies.filter(dep => dep.scope === 'import');
+                        const commonDependencies = dependencies.filter(dep => !['annotationProcessor', 'import'].includes(dep.scope));
+                        const convertVersionToRef = ({ version, versionRef, ...artifact }) => version || versionRef ? { ...artifact, version: `\${${versionRef ?? artifact.artifactId}.version}` } : artifact;
+                        const removeScope = ({ scope: _scope, ...artifact }) => artifact;
+                        source.addMavenDefinition?.({
+                            properties: dependencies
+                                .filter(dep => dep.version)
+                                .map(({ artifactId, version }) => ({ property: `${artifactId}.version`, value: version })),
+                            dependencies: [
+                                ...commonDependencies.map(convertVersionToRef),
+                                // Add a provided scope for annotation processors so that version is not required in annotationProcessor dependencies
+                                ...annotationProcessors.filter(dep => !dep.version).map(artifact => ({ ...artifact, scope: 'provided' })),
+                            ],
+                            dependencyManagement: importDependencies.map(convertVersionToRef),
+                            annotationProcessors: annotationProcessors.map(convertVersionToRef).map(removeScope),
+                        });
+                    }
+                    if (application.buildToolGradle) {
+                        source.addGradleDependencies?.(dependencies
+                            .filter(dep => !dep.version && !dep.versionRef)
+                            .map(({ scope, type, ...artifact }) => ({
+                            ...artifact,
+                            scope: javaScopeToGradleScope({ scope, type }),
+                        })), options);
+                        source.addGradleDependencyCatalogLibraries?.(dependencies
+                            .filter(dep => dep.version || dep.versionRef)
+                            .map(({ scope, type, groupId, artifactId, version, versionRef }) => {
+                            const library = {
+                                libraryName: artifactId,
+                                module: `${groupId}:${artifactId}`,
+                                scope: javaScopeToGradleScope({ scope, type }),
+                            };
+                            return version ? { ...library, version } : { ...library, 'version.ref': versionRef };
+                        }), options);
+                    }
+                };
+                source.addJavaDefinition = (definition, options) => {
+                    const { dependencies, versions } = definition;
+                    if (dependencies) {
+                        source.addJavaDependencies(dependencies.filter(dep => {
+                            if (dep.versionRef) {
+                                return versions?.find(({ name }) => name === dep.versionRef)?.version;
+                            }
+                            return true;
+                        }), options);
+                    }
+                    if (versions) {
+                        if (application.buildToolMaven) {
+                            source.addMavenDefinition({
+                                properties: versions.filter(v => v.version).map(({ name, version }) => ({ property: `${name}.version`, value: version })),
+                            });
+                        }
+                        if (application.buildToolGradle) {
+                            source.addGradleDependencyCatalogVersions?.(versions, options);
+                        }
+                    }
+                };
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
+}

package/dist/generators/{app/jdl/index.mjs → java/generators/build-tool/index.js}

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
+ * Copyright 2013-2024 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.
@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { default } from './application-options.mjs';
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/java/generators/code-quality/command.js

@@ -0,0 +1,5 @@
+const command = {
+    configs: {},
+    import: [],
+};
+export default command;

package/dist/generators/java/generators/code-quality/generator.js

@@ -0,0 +1,91 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+import BaseApplicationGenerator from '../../../base-application/index.js';
+export default class CodeQualityGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+            await this.dependsOnJHipster('jhipster:java:build-tool');
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get prompting() {
+        return this.asPromptingTaskGroup({
+            async promptCommand({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PROMPTING]() {
+        return this.delegateTasksToBlueprint(() => this.prompting);
+    }
+    get composing() {
+        return this.asComposingTaskGroup({
+            async compose() {
+                const { buildTool } = this.jhipsterConfigWithDefaults;
+                if (buildTool === 'maven') {
+                    await this.composeWithJHipster('jhipster:maven:code-quality');
+                }
+                else if (buildTool === 'gradle') {
+                    await this.composeWithJHipster('jhipster:gradle:code-quality');
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.COMPOSING]() {
+        return this.delegateTasksToBlueprint(() => this.composing);
+    }
+    get loading() {
+        return this.asLoadingTaskGroup({
+            async loadConfig({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [{ templates: ['checkstyle.xml'] }],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+}

package/dist/generators/{app/support/index.mjs → java/generators/code-quality/index.js}

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
+ * Copyright 2013-2024 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.
@@ -16,5 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './config.mjs';
-export { default as checkNode } from './check-node.mjs';
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/java/{command.mjs → generators/domain/command.js}

@@ -1,17 +1,5 @@
 const command = {
     options: {
-        withGeneratedFlag: {
-            description: 'Add a GeneratedByJHipster annotation to all generated java classes and interfaces',
-            type: Boolean,
-            scope: 'storage',
-        },
-        packageInfoFile: {
-            description: 'write package-info.java file for every package',
-            type: Boolean,
-            default: true,
-            scope: 'generator',
-            hide: true,
-        },
         generateEntities: {
             type: Boolean,
             default: true,
@@ -37,5 +25,6 @@ const command = {
             hide: true,
         },
     },
+    import: [],
 };
 export default command;

package/dist/generators/java/{entity-files.js → generators/domain/entity-files.js}

@@ -1,4 +1,4 @@
-import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from './support/index.js';
+import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from '../../support/index.js';
 export const entityServerFiles = {
     model: [
         javaMainPackageTemplatesBlock({

package/dist/generators/java/generators/domain/generator.js

@@ -0,0 +1,153 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+import BaseApplicationGenerator from '../../../base-application/index.js';
+import { mutateData } from '../../../base/support/index.js';
+import { javaBeanCase, javaTestPackageTemplatesBlock } from '../../../server/support/index.js';
+import { entityServerFiles, enumFiles } from './entity-files.js';
+import { getEnumInfo } from '../../../base-application/support/index.js';
+export default class DomainGenerator extends BaseApplicationGenerator {
+    generateEntities;
+    useJakartaValidation;
+    useJacksonIdentityInfo;
+    generateEnums;
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+            await this.dependsOnJHipster('jhipster:java:bootstrap');
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get preparingEachEntity() {
+        return this.asPreparingEachEntityTaskGroup({
+            prepareEntity({ entity }) {
+                mutateData(entity, {
+                    entityDomainLayer: true,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
+        return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
+    }
+    get preparingEachEntityField() {
+        return this.asPreparingEachEntityFieldTaskGroup({
+            prepareEntity({ entity, field }) {
+                field.propertyJavaBeanName = javaBeanCase(field.propertyName);
+                if (entity.dtoMapstruct || entity.builtIn) {
+                    field.propertyDtoJavaType = field.blobContentTypeText ? 'String' : field.fieldType;
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_FIELD]() {
+        return this.delegateTasksToBlueprint(() => this.preparingEachEntityField);
+    }
+    get preparingEachEntityRelationship() {
+        return this.asPreparingEachEntityRelationshipTaskGroup({
+            prepareEntity({ entity, relationship }) {
+                relationship.propertyJavaBeanName = javaBeanCase(relationship.propertyName);
+                if (entity.dtoMapstruct) {
+                    relationship.propertyDtoJavaType = relationship.collection
+                        ? `Set<${relationship.otherEntity.dtoClass}>`
+                        : relationship.otherEntity.dtoClass;
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_RELATIONSHIP]() {
+        return this.delegateTasksToBlueprint(() => this.preparingEachEntityRelationship);
+    }
+    get postPreparingEachEntity() {
+        return this.asPostPreparingEachEntityTaskGroup({
+            checkForCircularRelationships({ entity }) {
+                entity.skipJunitTests = entity.hasCyclicRequiredRelationship ? 'Cyclic required relationships detected' : undefined;
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_PREPARING_EACH_ENTITY]() {
+        return this.delegateTasksToBlueprint(() => this.postPreparingEachEntity);
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writeDomainBaseFiles({ application }) {
+                await this.writeFiles({
+                    blocks: [
+                        javaTestPackageTemplatesBlock({
+                            templates: ['domain/AssertUtils.java'],
+                        }),
+                    ],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get writingEntities() {
+        return this.asWritingEntitiesTaskGroup({
+            async writeServerFiles({ application, entities }) {
+                if (!this.generateEntities)
+                    return;
+                const { useJakartaValidation, useJacksonIdentityInfo } = this;
+                for (const entity of entities.filter(entity => !entity.skipServer)) {
+                    await this.writeFiles({
+                        sections: entityServerFiles,
+                        context: { ...application, ...entity, useJakartaValidation, useJacksonIdentityInfo },
+                    });
+                }
+            },
+            async writeEnumFiles({ application, entities }) {
+                if (!this.generateEnums)
+                    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);
+    }
+}

package/dist/generators/{app/jdl/application-options.mjs → java/generators/domain/index.js}

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
+ * Copyright 2013-2024 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.
@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { default } from '../../server/jdl/index.mjs';
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/java/generators/jib/command.js

@@ -0,0 +1,5 @@
+const command = {
+    configs: {},
+    import: [],
+};
+export default command;

package/dist/generators/java/generators/jib/generator.js

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+import BaseApplicationGenerator from '../../../base-application/index.js';
+export default class JibGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+            await this.dependsOnJHipster('jhipster:java:build-tool');
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get prompting() {
+        return this.asPromptingTaskGroup({
+            async promptCommand({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PROMPTING]() {
+        return this.delegateTasksToBlueprint(() => this.prompting);
+    }
+    get composing() {
+        return this.asComposingTaskGroup({
+            async compose() {
+                const { buildTool } = this.jhipsterConfigWithDefaults;
+                if (buildTool === 'maven') {
+                    await this.composeWithJHipster('jhipster:maven:jib');
+                }
+                else if (buildTool === 'gradle') {
+                    await this.composeWithJHipster('jhipster:gradle:jib');
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.COMPOSING]() {
+        return this.delegateTasksToBlueprint(() => this.composing);
+    }
+    get loading() {
+        return this.asLoadingTaskGroup({
+            async loadConfig({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async write({ application }) {
+                const { dockerServicesDir } = application;
+                await this.writeFiles({
+                    blocks: [
+                        {
+                            path: `${dockerServicesDir}jib/`,
+                            templates: ['entrypoint.sh'],
+                        },
+                    ],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+}

package/dist/generators/java/generators/jib/index.js

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/{server → java/generators/jib}/templates/src/main/docker/jib/entrypoint.sh.ejs

@@ -28,12 +28,14 @@ file_env() {
     unset "$fileVar"
 }
 
+<%_ if (backendTypeSpringBoot) { _%>
 file_env 'SPRING_DATASOURCE_URL'
 file_env 'SPRING_DATASOURCE_USERNAME'
 file_env 'SPRING_DATASOURCE_PASSWORD'
 file_env 'SPRING_LIQUIBASE_URL'
 file_env 'SPRING_LIQUIBASE_USER'
 file_env 'SPRING_LIQUIBASE_PASSWORD'
+<%_ } _%>
 file_env 'JHIPSTER_REGISTRY_PASSWORD'
 
 exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "<%= packageName %>.<%= mainClass %>"  "$@"

package/dist/generators/java/generators/node/command.js

@@ -0,0 +1,5 @@
+const command = {
+    configs: {},
+    import: [],
+};
+export default command;