generator-jhipster 8.6.0 → 8.7.0

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

@@ -19,9 +19,9 @@
 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';
 import { isReservedJavaKeyword } from '../../support/reserved-keywords.js';
+import { entityServerFiles, enumFiles } from './entity-files.js';
 export default class DomainGenerator extends BaseApplicationGenerator {
     generateEntities;
     useJakartaValidation;
@@ -36,16 +36,6 @@ export default class DomainGenerator extends BaseApplicationGenerator {
             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({
             checkForReservedKeyword({ entityName }) {
@@ -147,6 +137,7 @@ export default class DomainGenerator extends BaseApplicationGenerator {
                 for (const entity of entities.filter(entity => !entity.skipServer)) {
                     for (const field of entity.fields.filter(field => field.fieldIsEnum)) {
                         const enumInfo = {
+                            ...application,
                             ...getEnumInfo(field, entity.clientRootFolder),
                             frontendAppName: entity.frontendAppName,
                             packageName: application.packageName,

package/dist/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs

@@ -137,8 +137,8 @@ public class <%= persistClass %> <&- fragments.extendsSection() -&>implements Se
 for (relationship of relationships) {
   if (typeof relationship.fieldApiDescription) { _%>
 <%- relationship.relationshipJavadoc %>
-    <%_ if (!dtoMapstruct && relationship.relationshipyApiDescription) { _%>
-    @Schema(description = "<%- relationship.relationshipyApiDescription %>")
+    <%_ if (!dtoMapstruct && relationship.relationshipApiDescription) { _%>
+    @Schema(description = "<%- relationship.relationshipApiDescription %>")
     <%_ } _%>
   <%_ } _%>
 <&- fragments.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection() -&>

package/dist/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Asserts.java.ejs

@@ -82,6 +82,8 @@ public class <%= persistClass %>Asserts {
             .satisfies(e -> assertThat(e.get<%- relationship.propertyJavaBeanName %>()).as("check <%- relationship.propertyName %>").isEqualTo(actual.get<%- relationship.propertyJavaBeanName %>()))
   <%_ } _%>
         ;
+<%_ } else { _%>
+        // empty method
 <%_ } _%>
     }
 
@@ -108,7 +110,10 @@ public class <%= persistClass %>Asserts {
     <%_ } -%>
   <%_ } -%>
         ;
+<%_ } else { _%>
+        // empty method
 <%_ } _%>
+
     }
 
     /**
@@ -125,6 +130,8 @@ public class <%= persistClass %>Asserts {
             .satisfies(e -> assertThat(e.get<%- relationship.propertyJavaBeanName %>()).as("check <%- relationship.propertyName %>").isEqualTo(actual.get<%- relationship.propertyJavaBeanName %>()))
   <%_ } _%>
         ;
+<%_ } else { _%>
+        // empty method
 <%_ } _%>
     }
 }

package/dist/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs

@@ -30,5 +30,4 @@ public class AssertUtils {
     );
 
     public static Comparator<BigDecimal> bigDecimalCompareTo = Comparator.nullsFirst((e1, a2) -> e1.compareTo(a2));
-
 }

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

@@ -27,28 +27,6 @@ export default class JibGenerator extends BaseApplicationGenerator {
             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() {
@@ -65,16 +43,6 @@ export default class JibGenerator extends BaseApplicationGenerator {
     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 }) {

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

@@ -27,28 +27,6 @@ export default class NodeGenerator extends BaseApplicationGenerator {
             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() {
@@ -65,16 +43,6 @@ export default class NodeGenerator extends BaseApplicationGenerator {
     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 }) {

package/dist/generators/java/generators/openapi-generator/README.md

@@ -0,0 +1,7 @@
+# java:openapi-generator sub-generator
+
+Generates openapi import structure that generates backend code using `src/main/resources/swagger/api.yml` openapi definition.
+
+[openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master)
+[openapi-generator-maven-plugin](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin)
+[openapi-generator-gradle-plugin](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-gradle-plugin)

package/dist/generators/java/generators/openapi-generator/command.js

@@ -0,0 +1,14 @@
+const command = {
+    configs: {
+        addOpenapiGeneratorPlugin: {
+            cli: {
+                type: Boolean,
+                hide: true,
+            },
+            default: true,
+            scope: 'storage',
+        },
+    },
+    import: [],
+};
+export default command;

package/dist/generators/java/generators/openapi-generator/generator.js

@@ -0,0 +1,130 @@
+/**
+ * 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 { GRADLE_BUILD_SRC_MAIN_DIR } from '../../../generator-constants.js';
+import { javaMainResourceTemplatesBlock } from '../../support/files.js';
+export default class OpenapiGeneratorGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+            await this.dependsOnJHipster('jhipster:java:build-tool');
+        }
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            cleanup({ application, control }) {
+                control.cleanupFiles({
+                    '8.6.1': [[application.buildToolGradle, 'gradle/swagger.gradle']],
+                });
+            },
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [
+                        { templates: ['README.md.jhi.openapi-generator'] },
+                        javaMainResourceTemplatesBlock({ templates: ['swagger/api.yml'] }),
+                        {
+                            condition: ctx => ctx.buildToolGradle && ctx.addOpenapiGeneratorPlugin,
+                            templates: [`${GRADLE_BUILD_SRC_MAIN_DIR}/jhipster.openapi-generator-conventions.gradle`],
+                        },
+                    ],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            addDependencies({ source, application }) {
+                const { addOpenapiGeneratorPlugin, buildToolGradle, javaDependencies } = application;
+                source.addJavaDefinitions({
+                    dependencies: [
+                        {
+                            groupId: 'org.openapitools',
+                            artifactId: 'jackson-databind-nullable',
+                            version: javaDependencies['jackson-databind-nullable'],
+                        },
+                    ],
+                }, {
+                    condition: addOpenapiGeneratorPlugin,
+                    mavenDefinition: {
+                        properties: [
+                            { property: 'openapi-generator-maven-plugin.version', value: javaDependencies['openapi-generator-maven-plugin'] },
+                        ],
+                        plugins: [{ groupId: 'org.openapitools', artifactId: 'openapi-generator-maven-plugin' }],
+                        pluginManagement: [
+                            {
+                                groupId: 'org.openapitools',
+                                artifactId: 'openapi-generator-maven-plugin',
+                                // eslint-disable-next-line no-template-curly-in-string
+                                version: '${openapi-generator-maven-plugin.version}',
+                                additionalContent: `                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>\${project.basedir}/${application.srcMainResources}swagger/api.yml</inputSpec>
+                            <generatorName>spring</generatorName>
+                            <apiPackage>${application.packageName}.web.api</apiPackage>
+                            <modelPackage>${application.packageName}.service.api.dto</modelPackage>
+                            <supportingFilesToGenerate>ApiUtil.java</supportingFilesToGenerate>
+                            <skipValidateSpec>false</skipValidateSpec>
+                            <configOptions>${application.reactive
+                                    ? `
+                                <reactive>true</reactive>
+`
+                                    : ''}
+                                <delegatePattern>true</delegatePattern>
+                                <title>${application.dasherizedBaseName}</title>
+                                <useSpringBoot3>true</useSpringBoot3>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+`,
+                            },
+                        ],
+                    },
+                });
+                if (addOpenapiGeneratorPlugin) {
+                    if (buildToolGradle) {
+                        source.addGradleBuildSrcDependencyCatalogLibraries?.([
+                            {
+                                libraryName: 'openapi-generator',
+                                module: 'org.openapitools:openapi-generator-gradle-plugin',
+                                version: javaDependencies['gradle-openapi-generator'],
+                                scope: 'implementation',
+                            },
+                        ]);
+                        source.addGradlePlugin?.({ id: 'jhipster.openapi-generator-conventions' });
+                    }
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
+}

package/dist/generators/{init/constants.js → java/generators/openapi-generator/index.js}

@@ -16,6 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const SKIP_COMMIT_HOOK = 'skipCommitHook';
-export const SKIP_COMMIT_HOOK_DESCRIPTION = 'Skip adding husky commit hooks';
-export const SKIP_COMMIT_HOOK_DEFAULT_VALUE = false;
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/java/generators/openapi-generator/templates/README.md.jhi.openapi-generator.ejs

@@ -0,0 +1,48 @@
+<%#
+ 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.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.developmentSection) { -&>
+### Doing API-First development using openapi-generator-cli
+
+[OpenAPI-Generator]() is configured for this application. You can generate API code from the `src/main/resources/swagger/api.yml` definition file by running:
+<%_ if (buildToolMaven) { _%>
+```bash
+./mvnw generate-sources
+```
+<%_ } _%>
+<%_ if (buildToolGradle) { _%>
+```bash
+./gradlew openApiGenerate
+```
+<%_ } _%>
+Then implements the generated delegate classes with `@Service` classes.
+
+To edit the `api.yml` definition file, you can use a tool such as [Swagger-Editor](). Start a local instance of the swagger-editor using docker by running: `docker compose -f src/main/docker/swagger-editor.yml up -d`. The editor will then be reachable at [http://localhost:7742](http://localhost:7742).
+
+Refer to [Doing API-First development][] for more details.
+<&_ } -&>
+
+<&_ if (fragment.referenceSection) { -&>
+[OpenAPI-Generator]: https://openapi-generator.tech
+[Swagger-Editor]: https://editor.swagger.io
+[Doing API-First development]: <%= documentationArchiveUrl %>/doing-api-first-development/
+<&_ } -&>

package/dist/generators/{server/templates/gradle/swagger.gradle.ejs → java/generators/openapi-generator/templates/buildSrc/src/main/groovy/jhipster.openapi-generator-conventions.gradle.ejs}

@@ -16,11 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-/*
- * Plugin that provides API-first development using OpenAPI-generator to
- * generate Spring-MVC endpoint stubs at compile time from an OpenAPI definition file
- */
-apply plugin: "org.openapi.generator"
+plugins {
+    id "org.openapi.generator"
+}
 
 openApiGenerate {
     generatorName = "spring"

package/dist/generators/java/support/checks/index.js

@@ -1,2 +1 @@
-// eslint-disable-next-line import/prefer-default-export
 export { default as checkJava } from './check-java.js';

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_TEST_SRC_DIR, SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../../generator-constants.js';
+import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR } from '../../generator-constants.js';
 export const replaceEntityFilePathVariables = (data, filePath) => {
     filePath = filePath
         ?.replace(/_package_/, data.packageFolder)
@@ -72,7 +72,7 @@ export function javaTestPackageTemplatesBlock(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 ?? '';
+    const relativePath = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : (blockOrRelativePath.relativePath ?? '');
     return {
         path: `${srcPath}${relativePath}`,
         ...block,

package/dist/generators/java/support/key-store.js

@@ -1,10 +1,9 @@
-import { mkdir, lstat } from 'fs/promises';
+import { lstat, mkdir } from 'fs/promises';
 import { dirname } from 'path';
 import { execa } from 'execa';
 /**
  * Generate a KeyStore.
  */
-// eslint-disable-next-line import/prefer-default-export
 export async function generateKeyStore(keyStoreFile, { packageName }) {
     try {
         const stat = await lstat(keyStoreFile);

package/dist/generators/javascript/generators/bootstrap/command.js

@@ -0,0 +1,23 @@
+const command = {
+    configs: {
+        packageJsonNodeEngine: {
+            cli: {
+                // Accepts a boolean or a string
+                type: val => val,
+                hide: true,
+            },
+            scope: 'storage',
+        },
+        packageJsonType: {
+            cli: {
+                type: String,
+                hide: true,
+            },
+            choices: ['commonjs', 'module'],
+            default: 'commonjs',
+            scope: 'storage',
+        },
+    },
+    import: [],
+};
+export default command;

package/dist/generators/javascript/generators/bootstrap/generator.js

@@ -0,0 +1,82 @@
+/**
+ * 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 { packageJson } from '../../../../lib/index.js';
+import BaseApplicationGenerator from '../../../base-application/index.js';
+import { GENERATOR_PROJECT_NAME } from '../../../generator-list.js';
+export default class BootstrapGenerator extends BaseApplicationGenerator {
+    constructor(args, options, features) {
+        super(args, options, { queueCommandTasks: true, ...features });
+    }
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+        }
+    }
+    get loading() {
+        return this.asLoadingTaskGroup({
+            loadNodeDependencies({ application }) {
+                this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster('javascript', 'resources', 'package.json'));
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [{ templates: [{ override: false, file: 'package.json' }] }],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            addPrettierDependencies({ application }) {
+                const { packageJsonNodeEngine, packageJsonType, dasherizedBaseName, projectDescription } = application;
+                this.packageJson.defaults({
+                    name: dasherizedBaseName,
+                    version: '0.0.0',
+                    description: projectDescription,
+                    license: 'UNLICENSED',
+                });
+                if (packageJsonType) {
+                    this.packageJson.merge({ type: packageJsonType });
+                }
+                if (packageJsonNodeEngine) {
+                    this.packageJson.set('engines', {
+                        ...(this.packageJson.get('engines') ?? {}),
+                        node: typeof packageJsonNodeEngine === 'string' ? packageJsonNodeEngine : packageJson.engines.node,
+                    });
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
+}

package/dist/generators/javascript/generators/bootstrap/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/{common/templates/.prettierignore.jhi.ejs → javascript/generators/bootstrap/templates/package.json.ejs}

@@ -16,9 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-node_modules
-package-lock.json
-.git
-<%- temporaryDir %>
-
-<&- fragments.render({ join: '\n\n' }) &>
+{
+  "private": true,
+  "dependencies": {},
+  "devDependencies": {},
+  "engines": {},
+  "scripts": {}
+}

package/dist/generators/javascript/generators/eslint/command.js

@@ -0,0 +1,11 @@
+const command = {
+    configs: {
+        typescriptEslint: {
+            cli: {
+                type: Boolean,
+            },
+        },
+    },
+    import: [],
+};
+export default command;