generator-jhipster 8.4.0 → 8.5.0

package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/build-matrix.mjs.ejs

@@ -0,0 +1,22 @@
+import { readdir } from 'fs/promises';
+import { RECOMMENDED_JAVA_VERSION, RECOMMENDED_NODE_VERSION } from 'generator-jhipster';
+import { fromMatrix } from 'generator-jhipster/testing';
+
+const defaultMatrix = {
+  os: ['ubuntu-latest'],
+  'node-version': [RECOMMENDED_NODE_VERSION],
+  'java-version': [RECOMMENDED_JAVA_VERSION],
+  'default-environment': ['prod'],
+};
+
+export const buildMatrix = async samplesFolder => {
+  const samples = await readdir(samplesFolder);
+  return {
+    include: Object.values(
+      fromMatrix({
+        ...defaultMatrix,
+        'sample-name': samples.filter(sample => !sample.includes('disabled')),
+      }),
+    ),
+  };
+};

package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.mjs.ejs

@@ -0,0 +1,24 @@
+import { existsSync, appendFileSync } from 'node:fs';
+import os from 'node:os';
+import BaseGenerator from 'generator-jhipster/generators/base';
+import { buildMatrix } from './build-matrix.mjs';
+
+export default class extends BaseGenerator {
+  constructor(args, opts, features) {
+    super(args, opts, { ...features, jhipsterBootstrap: false });
+  }
+
+  get [BaseGenerator.WRITING]() {
+    return this.asWritingTaskGroup({
+      async buildMatrix() {
+        const matrix = await buildMatrix(this.templatePath('../../generate-sample/templates/samples'));
+        const matrixoutput = `matrix<<EOF${os.EOL}${JSON.stringify(matrix)}${os.EOL}EOF${os.EOL}`;
+        const filePath = process.env['GITHUB_OUTPUT'];
+        console.log(matrixoutput);
+        if (filePath && existsSync(filePath)) {
+          appendFileSync(filePath, matrixoutput, { encoding: 'utf8' });
+        }
+      },
+    });
+  }
+}

package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/index.mjs.ejs

@@ -0,0 +1 @@
+export { default } from './generator.mjs';

package/dist/generators/generate-blueprint/templates/.eslintrc.json.ejs

@@ -1,11 +1,11 @@
 {
   "env": {
     "node": true,
-    "es2020": true
+    "es2022": true
   },
   "extends": ["eslint:recommended", "plugin:prettier/recommended"],
   "parserOptions": {
-    "ecmaVersion": 11,
+    "ecmaVersion": 13,
     "sourceType": "module"
   },
   "overrides": [

package/dist/generators/generate-blueprint/templates/README.md.ejs

@@ -22,7 +22,7 @@
 
 [![NPM version][npm-image]][npm-url]
 [![Generator][github-generator-image]][github-generator-url]
-[![Integration Test][github-integration-image]][github-integration-url]
+[![Samples][github-samples-image]][github-samples-url]
 
 # Introduction
 
@@ -30,9 +30,9 @@ This is a [JHipster](https://www.jhipster.tech/) blueprint, that is meant to be
 
 # Prerequisites
 
-As this is a [JHipster](https://www.jhipster.tech/) blueprint, we expect you have JHipster and its related tools already installed:
+As this is a [JHipster](https://www.jhipster.tech/) blueprint, we expect you have JHipster basic knowledge:
 
-- [Installing JHipster](https://www.jhipster.tech/installation/)
+- [JHipster](https://www.jhipster.tech/)
 
 # Installation
 
@@ -47,13 +47,21 @@ npm install -g generator-jhipster-<%= baseName %>
 To use this blueprint, run the below command
 
 ```bash
+<%_ if (cli) { _%>
+<%= cliName %>
+<%_ } else { _%>
 jhipster --blueprints <%= baseName %>
+<%_ } _%>
 ```
 
 You can look for updated <%= baseName %> blueprint specific options by running
 
 ```bash
+<%_ if (cli) { _%>
+<%= cliName %> app --help
+<%_ } else { _%>
 jhipster app --blueprints <%= baseName %> --help
+<%_ } _%>
 ```
 
 And looking for `(blueprint option: <%= baseName %>)` like
@@ -63,13 +71,13 @@ And looking for `(blueprint option: <%= baseName %>)` like
 To use an unreleased version, install it using git.
 
 ```bash
-npm install -g jhipster/generator-jhipster-<%= baseName %>#main
+npm install -g <%= githubRepository %>#main
 jhipster --blueprints <%= baseName %> --skip-jhipster-dependencies
 ```
 
 [npm-image]: https://img.shields.io/npm/v/generator-jhipster-<%= baseName %>.svg
 [npm-url]: https://npmjs.org/package/generator-jhipster-<%= baseName %>
-[github-generator-image]: https://github.com/jhipster/generator-jhipster-<%= baseName %>/actions/workflows/generator.yml/badge.svg
-[github-generator-url]: https://github.com/jhipster/generator-jhipster-<%= baseName %>/actions/workflows/generator.yml
-[github-integration-image]: https://github.com/jhipster/generator-jhipster-<%= baseName %>/actions/workflows/integration.yml/badge.svg
-[github-integration-url]: https://github.com/jhipster/generator-jhipster-<%= baseName %>/actions/workflows/integration.yml
+[github-generator-image]: https://github.com/<%= githubRepository %>/actions/workflows/generator.yml/badge.svg
+[github-generator-url]: https://github.com/<%= githubRepository %>/actions/workflows/generator.yml
+[github-samples-image]: https://github.com/<%= githubRepository %>/actions/workflows/samples.yml/badge.svg
+[github-samples-url]: https://github.com/<%= githubRepository %>/actions/workflows/samples.yml

package/dist/generators/generate-blueprint/templates/vitest.config.ts.ejs

@@ -5,5 +5,6 @@ export default defineConfig({
     pool: 'forks',
     hookTimeout: 20000,
     exclude: [...defaultExclude.filter(val => val !== '**/cypress/**'), '**/templates/**', '**/resources/**'],
+    setupFiles: ['./vitest.test-setup.ts'],
   },
 });

package/dist/generators/generator-constants.js

@@ -21,7 +21,7 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.4.0';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.5.0';
 // Version of Java
 export const JAVA_VERSION = '17';
 export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];

package/dist/generators/info/generator.js

@@ -121,9 +121,7 @@ export default class InfoGenerator extends BaseApplicationGenerator {
             this.getExistingEntities().forEach(entity => {
                 entities.set(entity.name, entity.definition);
             });
-            jdlObject = JSONToJDLEntityConverter.convertEntitiesToJDL({
-                entities,
-            });
+            jdlObject = JSONToJDLEntityConverter.convertEntitiesToJDL(entities);
             JSONToJDLOptionConverter.convertServerOptionsToJDL({ 'generator-jhipster': this.config.getAll() }, jdlObject);
         }
         catch (error) {

package/dist/generators/init/generator.js

@@ -101,8 +101,8 @@ export default class InitGenerator extends BaseApplicationGenerator {
             addPrettierDependencies({ application }) {
                 this.packageJson.merge({
                     scripts: {
-                        'prettier-check': 'prettier --check "{,**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
-                        'prettier-format': 'prettier --write "{,**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
+                        'prettier-check': 'prettier --check "{,**/}*.{md,json,yml,html,cjs,mjs,js,cts,mts,ts,tsx,css,scss,vue,java}"',
+                        'prettier-format': 'prettier --write "{,**/}*.{md,json,yml,html,cjs,mjs,js,cts,mts,ts,tsx,css,scss,vue,java}"',
                     },
                     devDependencies: {
                         prettier: application.nodeDependencies.prettier,

package/dist/generators/init/resources/.node-version

@@ -1 +1 @@
-20.12.2
+20.14.0

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

@@ -31,7 +31,10 @@ const command = {
                 type: 'list',
                 message: 'Would you like to use Maven or Gradle for building the backend?',
             },
-            choices: [MAVEN, GRADLE],
+            choices: [
+                { name: 'Maven', value: MAVEN },
+                { name: 'Gradle', value: GRADLE },
+            ],
             default: MAVEN,
             description: 'Provide build tool for the application when skipping server side generation',
             scope: 'storage',

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

@@ -134,7 +134,7 @@ public class <%= persistClass %> <&- fragments.extendsSection() -&>implements Se
 
 <%_
 // An embedded entity should not reference entities that embed it, unless the other entities are also embedded
-for (relationship of relationships.filter(relationship => !relationship.embedded || relationship.otherEntity.embedded || relationship.ownerSide)) {
+for (relationship of relationships) {
   if (typeof relationship.fieldApiDescription) { _%>
 <%- relationship.relationshipJavadoc %>
     <%_ if (!dtoMapstruct && relationship.relationshipyApiDescription) { _%>
@@ -223,10 +223,6 @@ for (relationship of relationships.filter(relationship => !relationship.embedded
 <&- fragments.classAdditionalFieldsMethodsSection('\n\n') -&>
 <%_
 for (const relationship of relationships) {
-  // An embedded entity should not reference entities that embed it, unless the other entities are also embedded
-  if (embedded && !relationship.otherEntity.embedded && !relationship.ownerSide) {
-    continue;
-  }
 _%>
   <%_ if (relationship.collection) { _%>
     public Set<<%= relationship.otherEntity.persistClass %>> get<%= relationship.relationshipNameCapitalizedPlural %>() {

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

@@ -78,7 +78,7 @@ public class <%= persistClass %>Asserts {
   <%_ for (const field of fields.filter(field => !field.transient && field.autoGenerate)) { _%>
             .satisfies(e -> assertThat(e.get<%- field.fieldInJavaBeanMethod %>()).as("check <%- field.propertyName %>").isEqualTo(actual.get<%- field.fieldInJavaBeanMethod %>()))
   <%_ } _%>
-  <%_ for (const relationship of relationships.filter(relationship => relationship.autoGenerate && !relationship.otherEntity.builtInUser)) { _%>
+  <%_ for (const relationship of relationships.filter(relationship => (!embedded || relationship.otherEntity.embedded) && relationship.autoGenerate && !relationship.otherEntity.builtInUser)) { _%>
             .satisfies(e -> assertThat(e.get<%- relationship.propertyJavaBeanName %>()).as("check <%- relationship.propertyName %>").isEqualTo(actual.get<%- relationship.propertyJavaBeanName %>()))
   <%_ } _%>
         ;
@@ -121,10 +121,10 @@ public class <%= persistClass %>Asserts {
 <%_ if (relationships.some(relationship => relationship.persistableRelationship && !relationship.id && !relationship.autoGenerate && !relationship.otherEntity.builtInUser)) { _%>
         assertThat(expected)
             .as("Verify <%- persistClass %> relationships")
-  <%_ for (const relationship of relationships.filter(relationship => relationship.persistableRelationship && !relationship.id && !relationship.autoGenerate && !relationship.otherEntity.builtInUser)) { _%>
+  <%_ for (const relationship of relationships.filter(relationship => (!embedded || relationship.otherEntity.embedded) && relationship.persistableRelationship && !relationship.id && !relationship.autoGenerate && !relationship.otherEntity.builtInUser)) { _%>
             .satisfies(e -> assertThat(e.get<%- relationship.propertyJavaBeanName %>()).as("check <%- relationship.propertyName %>").isEqualTo(actual.get<%- relationship.propertyJavaBeanName %>()))
   <%_ } _%>
         ;
 <%_ } _%>
     }
-}
+}

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

@@ -53,7 +53,7 @@ class <%= persistClass %>Test {
 <%_if (!updatableEntity) { _%>
 
     @Test
-    void hashCodeVerifier() throws Exception {
+    void hashCodeVerifier() {
         <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
         assertThat(<%= persistInstance %>.hashCode()).isZero();
 
@@ -62,10 +62,10 @@ class <%= persistClass %>Test {
         assertThat(<%= persistInstance %>).hasSameHashCodeAs(<%= persistInstance %>1);
     }
 <%_ } _%>
-<%_ for (const relationship of relationships.filter(relationship => !relationship.otherEntity.builtIn)) { _%>
+<%_ for (const relationship of relationships.filter(rel => !rel.otherEntity.builtIn && (!embedded || (rel.otherEntity.embedded && rel.ownerSide)))) { _%>
 
     @Test
-    void <%- relationship.relationshipName %>Test() throws Exception {
+    void <%- relationship.relationshipName %>Test() {
         <%= persistClass %> <%= persistInstance %> = get<%= persistClass %>RandomSampleGenerator();
         <%= relationship.otherEntity.persistClass %> <%= relationship.otherEntity.persistInstance %>Back = get<%= relationship.otherEntity.persistClass %>RandomSampleGenerator();
   <%_ if (relationship.collection) { _%>

package/dist/generators/java/support/add-java-annotation.js

@@ -16,16 +16,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export default function addJavaAnnotation(content, { package: packageName, annotation }) {
+import { escapeRegExp } from 'lodash-es';
+const addJavaImportToContent = (content, identifier, { staticImport } = {}) => {
+    const importStatement = `import ${staticImport ? 'static ' : ''}${identifier};`;
+    return new RegExp(escapeRegExp(importStatement)).test(content)
+        ? content
+        : content.replace(/(package [\w.]+;\n\n?)/, `$1${importStatement}\n`);
+};
+export function addJavaImport(contentOrIdentifier, identifierOrType, type) {
+    if (typeof identifierOrType === 'string') {
+        return addJavaImportToContent(contentOrIdentifier, identifierOrType, type);
+    }
+    return (content) => addJavaImportToContent(content, contentOrIdentifier, identifierOrType);
+}
+const addJavaAnnotationToContent = (content, annotationDef) => {
+    const { package: packageName, annotation, parameters } = annotationDef;
     if (packageName) {
-        if (!new RegExp(`import ${packageName.replace('.', '\\.')}.${annotation};`).test(content)) {
-            // add the import statement just after the package statement, prettier will arrange it correctly
-            content = content.replace(/(package [\w.]+;\n)/, `$1import ${packageName}.${annotation};\n`);
-        }
+        content = addJavaImport(content, `${packageName}.${annotation}`);
     }
-    if (!new RegExp(`\n@${annotation}\n`).test(content)) {
+    const annotationToAdd = parameters ? `${annotation}(${parameters()})` : annotation;
+    if (!new RegExp(escapeRegExp(`\n@${annotationToAdd}\n`)).test(content)) {
+        if (new RegExp(escapeRegExp(`\n@${annotation}(`)).test(content)) {
+            throw new Error(`Annotation already exists: ${annotation} replace is not implemented yet.`);
+        }
         // add the annotation before class or interface
-        content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/g, `\n@${annotation}\n$1`);
+        content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/g, `\n@${annotationToAdd}\n$1`);
     }
     return content;
+};
+export function addJavaAnnotation(contentOrAnnotation, annotation) {
+    if (typeof contentOrAnnotation === 'string') {
+        return addJavaAnnotationToContent(contentOrAnnotation, annotation);
+    }
+    return (content) => addJavaAnnotationToContent(content, contentOrAnnotation);
 }

package/dist/generators/java/support/generated-annotation-transform.js

@@ -19,7 +19,7 @@
 import { extname } from 'path';
 import { passthrough } from '@yeoman/transform';
 import { isFileStateDeleted } from 'mem-fs-editor/state';
-import addJavaAnnotation from './add-java-annotation.js';
+import { addJavaAnnotation } from './add-java-annotation.js';
 const generatedAnnotationTransform = packageName => {
     return passthrough(file => {
         if (!file.path.endsWith('package-info.java') &&

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { default as addJavaAnnotation } from './add-java-annotation.js';
+export * from './add-java-annotation.js';
 export * from './artifacts.js';
 export * from './checks/index.js';
 export * from './doc.js';

package/dist/generators/jdl/generator.js

@@ -156,8 +156,8 @@ export default class JdlGenerator extends BaseGenerator {
                             app.sharedFs = createMemFs();
                         }
                     }
+                    addApplicationIndex(this.applications);
                 }
-                addApplicationIndex(this.applications);
                 customizeForMicroservices(this.exportedApplicationsWithEntities);
             },
             async generateJson() {

package/dist/generators/kubernetes/files.js

@@ -101,7 +101,7 @@ export function writeFiles() {
             "https://${appConfig.baseName.toLowerCase()}:${appConfig.composePort}/*", `;
                     }
                     this.keycloakRedirectUris += `"http://localhost:${appConfig.composePort}/*",
-            "https://localhost:${appConfig.composePort}/*", `;
+            "https://localhost:${appConfig.composePort}/*",`;
                     if (appConfig.devServerPort !== undefined) {
                         this.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPort}/*", `;
                     }

package/dist/generators/kubernetes/templates/db/mysql.yml.ejs

@@ -70,7 +70,6 @@ spec:
           value: <%= app.baseName.toLowerCase() %>
         args:
         - --lower_case_table_names=1
-        - --skip-ssl
         - --character_set_server=utf8mb4
         - --explicit_defaults_for_timestamp
         ports:

package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs

@@ -36,7 +36,7 @@ data:
       "oauth2DevicePollingInterval": 5,
       "enabled": true,
       "sslRequired": "external",
-      "registrationAllowed": false,
+      "registrationAllowed": true,
       "registrationEmailAsUsername": false,
       "rememberMe": false,
       "verifyEmail": false,
@@ -459,6 +459,9 @@ data:
       "requiredCredentials": [
         "password"
       ],
+      "defaultGroups": [
+        "/Users"
+      ],
       "otpPolicyType": "totp",
       "otpPolicyAlgorithm": "HmacSHA1",
       "otpPolicyInitialCounter": 0,
@@ -2305,6 +2308,14 @@ data:
               "priority": 60,
               "userSetupAllowed": false,
               "autheticatorFlow": false
+            },
+            {
+              "authenticator": "registration-terms-and-conditions",
+              "authenticatorFlow": false,
+              "requirement": "DISABLED",
+              "priority": 70,
+              "autheticatorFlow": false,
+              "userSetupAllowed": false
             }
           ]
         },
@@ -2396,9 +2407,9 @@ data:
           "config": {}
         },
         {
-          "alias": "terms_and_conditions",
+          "alias": "TERMS_AND_CONDITIONS",
           "name": "Terms and Conditions",
-          "providerId": "terms_and_conditions",
+          "providerId": "TERMS_AND_CONDITIONS",
           "enabled": false,
           "defaultAction": false,
           "priority": 20,

package/dist/generators/languages/generator.js

@@ -32,6 +32,8 @@ import { updateLanguagesTask as updateLanguagesInJava } from '../server/support/
 import { SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js';
 import { QUEUES } from '../base-application/priorities.js';
 import { PRIORITY_NAMES } from '../base/priorities.js';
+import { clientFrameworkTypes } from '../../jdl/index.js';
+const { NO: NO_CLIENT_FRAMEWORK, ANGULAR } = clientFrameworkTypes;
 /**
  * This is the base class for a generator that generates entities.
  *
@@ -64,8 +66,8 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
             await this.dependsOnBootstrapApplication();
         }
         if (!this.jhipsterConfigWithDefaults.skipClient &&
-            this.jhipsterConfigWithDefaults.clientFramework !== 'no' &&
-            (!this.jhipsterConfig.enableTranslation || this.jhipsterConfigWithDefaults.clientFramework === 'angular')) {
+            this.jhipsterConfigWithDefaults.clientFramework !== NO_CLIENT_FRAMEWORK &&
+            (!this.jhipsterConfig.enableTranslation || this.jhipsterConfigWithDefaults.clientFramework === ANGULAR)) {
             // We must write languages files for translation process for entities only generation.
             // Angular frontend uses translation files even if enableTranslation is enabled.
             // As side effect, with angular frontends, translation files will be written for nativeLanguage for entity only generation.

package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+wrapperVersion=3.3.2
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip