generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs

@@ -1,10 +1,10 @@
 import { readdir } from 'node:fs/promises';
 import { readFileSync } from 'node:fs';
 import BaseGenerator from 'generator-jhipster/generators/base';
-import command from './command.mjs';
 
 export default class extends BaseGenerator {
   sampleName;
+  all;
 
   constructor(args, opts, features) {
     super(args, opts, { ...features, jhipsterBootstrap: false });
@@ -26,15 +26,7 @@ export default class extends BaseGenerator {
   get [BaseGenerator.PROMPTING]() {
     return this.asPromptingTaskGroup({
       async askForSample() {
-        if (!this.sampleName) {
-          const answers = await this.prompt({
-            type: 'list',
-            name: 'sampleName',
-            message: 'which sample do you want to generate?',
-            choices: async () => readdir(this.templatePath('samples')),
-          })
-          this.sampleName = answers.sampleName;
-        }
+        await this.promptCurrentJHipsterCommand();
       },
     });
   }
@@ -42,7 +34,11 @@ export default class extends BaseGenerator {
   get [BaseGenerator.WRITING]() {
     return this.asWritingTaskGroup({
       async copySample() {
-        this.copyTemplate(`samples/${this.sampleName}`, this.sampleName, { noGlob: true });
+        if (this.all) {
+          this.copyTemplate('samples/*.jdl', '');
+        } else {
+          this.copyTemplate(`samples/${this.sampleName}`, this.sampleName, { noGlob: true });
+        }
       },
     });
   }
@@ -54,13 +50,13 @@ export default class extends BaseGenerator {
         const projectVersion = `${packageJson.version}-git`;
 
         await this.composeWithJHipster('jdl', {
-          generatorArgs: [this.sampleName],
+          generatorArgs: this.all ? await readdir(this.templatePath('samples')) : [this.sampleName],
           generatorOptions: {
             skipJhipsterDependencies: true,
             insight: false,
             skipChecks: true,
-            skipInstall: true,
             projectVersion,
+            ...(this.all ? { workspaces: true, monorepository: true } : { skipInstall: true }),
           },
         });
       },

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,20 @@
+import { existsSync, appendFileSync } from 'node:fs';
+import os from 'node:os';
+import BaseGenerator from 'generator-jhipster/generators/base';
+import { setGithubTaskOutput } from 'generator-jhipster/testing';
+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'));
+        setGithubTaskOutput('matrix', matrix);
+      },
+    });
+  }
+}

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/.github/workflows/build-cache.yml.ejs

@@ -0,0 +1,39 @@
+name: build-cache
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
+jobs:
+  build-cache:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}/app
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: generator-jhipster-<%= baseName %>
+      - uses: jhipster/actions/setup-runner@v0
+        with:
+          node-version: 20
+          binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
+      - uses: jhipster/actions/cache-npm-dependencies@v0
+        with:
+          generator-path: generator-jhipster-<%= baseName %>
+        if: always()
+      - run: cli.cjs generate-sample --all
+        continue-on-error: true
+      - run: npm run backend:build-cache --workspaces
+        continue-on-error: true
+      - uses: jhipster/actions/save-cache@v0
+        if: always()
+        with:
+          key: ${{ github.run_id }}
+          npm: true
+          maven: true
+          gradle: true
+      - uses: jhipster/actions/restore-cache@v0
+        with:
+          npm: true
+          maven: true
+          gradle: true

package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs

@@ -0,0 +1,105 @@
+name: Verify Sample Projects
+on:
+  push:
+    branches:
+      - 'main'
+      - '**maintenance'
+    paths-ignore:
+      - 'package*.json'
+  pull_request:
+    branches:
+      - '*'
+permissions:
+  contents: read
+jobs:
+  build-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.build.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: <%- nodeVersion.split('.', 2)[0] %>
+      - id: build
+        run: |
+          npm install
+          ./cli/cli.cjs github-build-matrix
+  samples:
+    name: ${{ matrix.sample-name }}
+    runs-on: ubuntu-latest
+    needs: build-matrix
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}/app
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.build-matrix.outputs.matrix)}}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: generator-jhipster-<%= baseName %>
+          fetch-depth: 2
+      - uses: jhipster/actions/setup-runner@v0
+        with:
+          java-version: ${{ matrix.java-version }}
+          node-version: ${{ matrix.node-version }}
+          maven-cache: true
+          gradle-cache: true
+          binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
+      - name: 'Install blueprint'
+        run: npm install
+        working-directory: ${{ github.workspace }}/generator-jhipster-<%= baseName %>
+      - name: 'Generate Project'
+        run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force
+      - uses: jhipster/actions/compare-sample@v0
+        id: compare
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
+        with:
+          generator-path: generator-jhipster-<%= baseName %>
+          cmd: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force --skip-install
+      - run: npm run ci:backend:test
+        if: steps.compare.outputs.equals != 'true'
+        id: backend
+      - run: npm run ci:frontend:test --if-present
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:package
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:prepare
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:run --if-present
+        if: steps.compare.outputs.equals != 'true'
+        id: e2e
+      - name: 'BACKEND: Store failure logs'
+        uses: actions/upload-artifact@v4
+        if: always() && steps.backend.outcome == 'failure'
+        with:
+          name: log-${{ matrix.sample-name }}
+          path: |
+            ${{ github.workspace }}/app/build/test-results/**/*.xml
+            ${{ github.workspace }}/app/target/surefire-reports
+      - name: 'E2E: Store failure screenshots'
+        uses: actions/upload-artifact@v4
+        if: always() && steps.e2e.outcome == 'failure'
+        with:
+          name: screenshots-${{ matrix.sample-name }}
+          path: ${{ github.workspace }}/app/**/cypress/screenshots
+      - name: Dump docker logs
+        if: always()
+        uses: jwalton/gh-docker-logs@v2
+  check-samples:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: [samples]
+    if: always()
+    steps:
+      - run: |
+          echo '${{ toJSON(needs) }}'
+          if [ 'skipped' == '${{ needs.samples.result }}' ] || [ 'success' == '${{ needs.samples.result }}' ] || [ 'closed' == '${{ github.event.action }}' ]; then
+            exit 0
+          fi
+          exit 1

package/dist/generators/generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs

@@ -18,5 +18,5 @@
 -%>
 <&_ if (!fragment.section) { -&>
 # blueprint rules:
-**/templates/**/
+generators/**/templates/**/
 <&_ } -&>

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/eslint.config.js.ejs

@@ -0,0 +1,33 @@
+<%#
+ 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 globals from 'globals';
+import prettierRecommended from 'eslint-plugin-prettier/recommended';
+import jhipsterRecommended from 'generator-jhipster/eslint/recommended';
+
+export default [
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+  jhipsterRecommended,
+  prettierRecommended,
+];

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,10 +21,10 @@ 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.6.0';
 // Version of Java
 export const JAVA_VERSION = '17';
-export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
+export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21', '22'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM

package/dist/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/dist/generators/heroku/generator.js

@@ -476,7 +476,7 @@ export default class HerokuGenerator extends BaseGenerator {
      * @param {string} other - explicit other thing: build, dependencies...
      */
     addMavenProfile(profileId, other) {
-        createPomStorage(this).addProfile({ id: profileId, content: other });
+        createPomStorage(this, { sortFile: false }).addProfile({ id: profileId, content: other });
     }
     /**
      * @param  {string} command

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/info/support/extract-info.js

@@ -0,0 +1,60 @@
+import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
+export const extractDataFromInfo = (info) => {
+    const regexp = /<summary>(?<title>(?:(?!<\/summary>).)+)<\/summary>\s+<pre>(?<body>(?:(?!<\/pre>).)+)/gs;
+    let yoRcContent;
+    let jdlEntitiesDefinitions;
+    let jdlDefinitions;
+    let workspacesFolders;
+    const files = [];
+    for (const match of info.matchAll(regexp)) {
+        const { title, body } = match.groups ?? {};
+        if (title?.trim() && body?.trim()) {
+            if (title.includes('.yo-rc.json file')) {
+                if (title.includes(' for ')) {
+                    const folder = title.split(' for ')[1].trim();
+                    files.push({ filename: `${folder}/.yo-rc.json`, content: body.trim() });
+                }
+                else {
+                    yoRcContent = body.trim();
+                }
+            }
+            else if (title.includes('JDL entity definitions')) {
+                jdlEntitiesDefinitions = body.trim();
+            }
+            else if (title.includes('JDL definitions')) {
+                // JDL definitions can be be a placehoder
+                if (body.includes('application')) {
+                    jdlDefinitions = body.trim();
+                }
+            }
+        }
+    }
+    let yoRcBlank = true;
+    let yoRcValid = false;
+    if (yoRcContent) {
+        yoRcBlank = false;
+        try {
+            let content = JSON.parse(yoRcContent);
+            content = GENERATOR_JHIPSTER in content ? content : { [GENERATOR_JHIPSTER]: content };
+            workspacesFolders = content[GENERATOR_JHIPSTER].appsFolders;
+            yoRcContent = JSON.stringify(content);
+            yoRcValid = true;
+        }
+        catch (error) {
+            // eslint-disable-next-line no-console
+            console.log('Invalid .yo-rc.json file', error);
+        }
+    }
+    if (jdlDefinitions) {
+        files.push({ filename: 'app.jdl', content: jdlDefinitions });
+        yoRcContent = undefined;
+        jdlEntitiesDefinitions = undefined;
+    }
+    if (jdlEntitiesDefinitions) {
+        files.push({ filename: 'entities.jdl', content: jdlEntitiesDefinitions });
+    }
+    if (yoRcContent) {
+        files.push({ filename: '.yo-rc.json', content: yoRcContent });
+    }
+    return { yoRcContent, jdlEntitiesDefinitions, jdlDefinitions, yoRcBlank, yoRcValid, files, workspacesFolders };
+};

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

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export * from './utils.js';
+export * from './extract-info.js';

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.15.0

package/dist/generators/init/resources/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "husky": "7.0.2",
-    "lint-staged": "11.0.0"
+    "husky": "9.0.11",
+    "lint-staged": "15.2.7"
   }
 }

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

@@ -19,7 +19,7 @@
 import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../../../base-application/index.js';
 import { JAVA_COMPATIBLE_VERSIONS } from '../../../generator-constants.js';
-import { packageInfoTransform, generatedAnnotationTransform, checkJava, isReservedJavaKeyword, matchMainJavaFiles, javaMainPackageTemplatesBlock, } from '../../support/index.js';
+import { packageInfoTransform, generatedAnnotationTransform, checkJava, isReservedJavaKeyword, matchMainJavaFiles, javaMainPackageTemplatesBlock, addJavaImport, addJavaAnnotation, } from '../../support/index.js';
 export default class BootstrapGenerator extends BaseApplicationGenerator {
     packageInfoFile;
     async beforeQueue() {
@@ -87,6 +87,9 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
                 source.hasJavaProperty = (property) => application.javaProperties[property] !== undefined;
                 source.hasJavaManagedProperty = (property) => application.javaManagedProperties[property] !== undefined;
             },
+            needles({ source }) {
+                source.editJavaFile = (file, { staticImports = [], imports = [], annotations = [] }, ...editFileCallback) => this.editFile(file, ...staticImports.map(classPath => addJavaImport(classPath, { staticImport: true })), ...imports.map(classPath => addJavaImport(classPath)), ...annotations.map(annotation => addJavaAnnotation(annotation)), ...editFileCallback);
+            },
         });
     }
     get [BaseApplicationGenerator.PREPARING]() {
@@ -102,7 +105,7 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
                 application.domains = entityPackages;
             },
             generatedAnnotation({ application }) {
-                if (this.jhipsterConfig.withGeneratedFlag) {
+                if (this.jhipsterConfig.withGeneratedFlag && application.backendTypeJavaAny) {
                     this.queueTransformStream({
                         name: 'adding @GeneratedByJHipster annotations',
                         filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && file.path.endsWith('.java'),
@@ -111,6 +114,8 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
                 }
             },
             generatedPackageInfo({ application }) {
+                if (!application.backendTypeJavaAny)
+                    return;
                 const { srcMainJava } = application;
                 if (this.packageInfoFile && srcMainJava) {
                     const mainPackageMatch = matchMainJavaFiles(srcMainJava);
@@ -145,6 +150,8 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
     get writing() {
         return this.asWritingTaskGroup({
             async writing({ application }) {
+                if (!application.backendTypeJavaAny)
+                    return;
                 await this.writeFiles({
                     blocks: [
                         javaMainPackageTemplatesBlock({

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

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { buildToolTypes } from '../../../../jdl/index.js';
-import { GENERATOR_GRADLE } from '../../../generator-list.js';
+import { GENERATOR_GRADLE, GENERATOR_MAVEN } from '../../../generator-list.js';
 const { GRADLE, MAVEN } = buildToolTypes;
 const command = {
     options: {},
@@ -31,12 +31,15 @@ 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',
         },
     },
-    import: [GENERATOR_GRADLE],
+    import: [GENERATOR_GRADLE, GENERATOR_MAVEN],
 };
 export default command;

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) { _%>