generator-jhipster 8.0.0-rc.1 → 8.1.0

package/dist/generators/heroku/templates/Procfile.ejs

@@ -16,4 +16,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-web: java $JAVA_OPTS <% if (applicationTypeGateway || dynoSize === 'Free') { %>-Xmx256m<% } %> -jar <% if (buildToolMaven) { %>target<% } %><% if (buildToolGradle) { %>build/libs<% } %>/*.jar --spring.profiles.active=prod,heroku<% if (databaseTypeMongodb) { %> --spring.data.mongodb.database=$(echo "$MONGODB_URI" | sed "s/^.*:[0-9]*\///g")<% } %>
+web: java $JAVA_OPTS <% if (applicationTypeGateway || dynoSize === 'Basic') { %>-Xmx256m<% } %> -jar <% if (buildToolMaven) { %>target<% } %><% if (buildToolGradle) { %>build/libs<% } %>/*.jar --spring.profiles.active=prod,heroku<% if (databaseTypeMongodb) { %> --spring.data.mongodb.database=$(echo "$MONGODB_URI" | sed "s/^.*:[0-9]*\///g")<% } %>

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

@@ -78,17 +78,5 @@ spring:
   elasticsearch:
     uris: ${BONSAI_URL}
 <%_ } _%>
-<%_ if (useOkta) { _%>
-  security:
-    oauth2:
-      client:
-        provider:
-          oidc:
-            issuer-uri: ${OKTA_OAUTH2_ISSUER}
-        registration:
-          oidc:
-            client-id: ${OKTA_OAUTH2_CLIENT_ID_WEB}
-            client-secret: ${OKTA_OAUTH2_CLIENT_SECRET_WEB}
-<%_ } _%>
 server:
   port: ${PORT:8080}

package/dist/generators/info/generator.mjs

@@ -25,13 +25,14 @@ import JSONToJDLEntityConverter from '../../jdl/converters/json-to-jdl-entity-co
 import JSONToJDLOptionConverter from '../../jdl/converters/json-to-jdl-option-converter.js';
 import { YO_RC_FILE } from '../generator-constants.mjs';
 import { replaceSensitiveConfig } from './support/utils.mjs';
+const isInfoCommand = commandName => commandName === 'info' || undefined;
 export default class InfoGenerator extends BaseApplicationGenerator {
     constructor(args, options, features) {
         super(args, options, {
             jhipsterBootstrap: false,
             storeJHipsterVersion: false,
-            customInstallTask: options.commandName === 'info' ? true : undefined,
-            customCommitTask: true,
+            customInstallTask: isInfoCommand(options.commandName),
+            customCommitTask: isInfoCommand(options.commandName),
             ...features,
         });
     }
@@ -55,8 +56,9 @@ export default class InfoGenerator extends BaseApplicationGenerator {
                 else {
                     console.log('\n##### **JHipster configuration not found**\n');
                 }
-                if (this.jhipsterConfig.packages && this.jhipsterConfig.packages.length > 0) {
-                    for (const pkg of this.jhipsterConfig.packages) {
+                const packages = this.jhipsterConfig.appsFolders ?? this.jhipsterConfig.packages ?? [];
+                if (packages.length > 0) {
+                    for (const pkg of packages) {
                         const yoRc = this.readDestinationJSON(this.destinationPath(pkg, YO_RC_FILE));
                         if (yoRc) {
                             const result = JSON.stringify(replaceSensitiveConfig(yoRc), null, 2);

package/dist/generators/init/generator.mjs

@@ -96,8 +96,8 @@ export default class InitGenerator extends BaseApplicationGenerator {
             addPrettierDependencies({ application }) {
                 this.packageJson.merge({
                     scripts: {
-                        'prettier-check': 'prettier --check "{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
-                        'prettier-format': 'prettier --write "{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
+                        '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}"',
                     },
                     devDependencies: {
                         prettier: application.nodeDependencies.prettier,

package/dist/generators/java/command.mjs

@@ -24,6 +24,12 @@ const command = {
             scope: 'generator',
             hide: true,
         },
+        useJacksonIdentityInfo: {
+            type: Boolean,
+            default: false,
+            scope: 'generator',
+            hide: true,
+        },
         generateEnums: {
             type: Boolean,
             default: true,

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

@@ -7,7 +7,7 @@ export const entityServerFiles = {
     ],
     modelTestFiles: [
         javaTestPackageTemplatesBlock({
-            templates: ['_entityPackage_/domain/_persistClass_Test.java'],
+            templates: ['_entityPackage_/domain/_persistClass_Test.java', '_entityPackage_/domain/_persistClass_TestSamples.java'],
         }),
     ],
     server: [
@@ -15,6 +15,10 @@ export const entityServerFiles = {
             condition: ctx => ctx.useJakartaValidation,
             templates: ['_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation'],
         }),
+        javaMainPackageTemplatesBlock({
+            condition: ctx => ctx.useJacksonIdentityInfo,
+            templates: ['_entityPackage_/domain/_persistClass_.java.jhi.jackson_identity_info'],
+        }),
     ],
 };
 export const enumFiles = {

package/dist/generators/java/generator.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isFilePending } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_JAVA, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.mjs';
 import writeTask from './files.mjs';
@@ -31,6 +31,7 @@ export default class JavaGenerator extends BaseApplicationGenerator {
     packageInfoFile;
     generateEntities;
     useJakartaValidation;
+    useJacksonIdentityInfo;
     generateEnums;
     async beforeQueue() {
         if (!this.fromBlueprint) {
@@ -59,18 +60,22 @@ export default class JavaGenerator extends BaseApplicationGenerator {
         return this.asDefaultTaskGroup({
             generatedAnnotation({ application }) {
                 if (this.jhipsterConfig.withGeneratedFlag) {
-                    this.queueTransformStream(generatedAnnotationTransform(application.packageName), {
+                    this.queueTransformStream({
                         name: 'adding @GeneratedByJHipster annotations',
-                        streamOptions: { filter: file => isFilePending(file) && file.path.endsWith('.java') },
-                    });
+                        filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && file.path.endsWith('.java'),
+                        refresh: false,
+                    }, generatedAnnotationTransform(application.packageName));
                 }
             },
             generatedPackageInfo({ application }) {
                 const mainPackageMatch = matchMainJavaFiles(application.srcMainJava);
                 if (this.packageInfoFile) {
-                    this.queueTransformStream(packageInfoTransform({
+                    this.queueTransformStream({
+                        name: 'adding package-info.java files',
+                        filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && mainPackageMatch.match(file.path),
+                        refresh: true,
+                    }, packageInfoTransform({
                         javaRoots: [this.destinationPath(application.srcMainJava)],
-                        editor: this.fs,
                         javadocs: {
                             ...Object.fromEntries(application.packageInfoJavadocs.map(doc => [doc.packageName, doc.documentation])),
                             [`${application.packageName}`]: 'Application root.',
@@ -80,12 +85,7 @@ export default class JavaGenerator extends BaseApplicationGenerator {
                             [`${application.packageName}.service`]: 'Service layer.',
                             [`${application.packageName}.web.rest`]: 'Rest layer.',
                         },
-                    }), {
-                        name: 'adding package-info.java files',
-                        streamOptions: {
-                            filter: file => isFilePending(file) && !file.path.endsWith('package-info.java') && mainPackageMatch.match(file.path),
-                        },
-                    });
+                    }));
                 }
             },
         });
@@ -107,16 +107,16 @@ export default class JavaGenerator extends BaseApplicationGenerator {
             async writeServerFiles({ application, entities }) {
                 if (!this.generateEntities)
                     return;
-                const { useJakartaValidation } = this;
+                const { useJakartaValidation, useJacksonIdentityInfo } = this;
                 for (const entity of entities.filter(entity => !entity.skipServer && !entity.builtIn)) {
                     await this.writeFiles({
                         sections: entityServerFiles,
-                        context: { ...application, ...entity, useJakartaValidation },
+                        context: { ...application, ...entity, useJakartaValidation, useJacksonIdentityInfo },
                     });
                 }
             },
             async writeEnumFiles({ application, entities }) {
-                if (!this.generateEnums || !this.generateEntities)
+                if (!this.generateEnums)
                     return;
                 for (const entity of entities.filter(entity => !entity.skipServer)) {
                     for (const field of entity.fields.filter(field => field.fieldIsEnum)) {

package/dist/generators/java/support/package-info-transform.mjs

@@ -17,24 +17,38 @@
  * limitations under the License.
  */
 import { dirname, join, relative } from 'path';
-import { passthrough } from '@yeoman/transform';
+import { passthrough } from 'p-transform';
+import { loadFile } from 'mem-fs';
 import { Minimatch } from 'minimatch';
+import { setModifiedFileState } from 'mem-fs-editor/state';
 const DEFAULT_DOC = 'This package file was generated by JHipster';
-const packageInfoTransform = ({ javaRoots, editor, javadocs }) => {
+const packageInfoTransform = ({ javaRoots, javadocs }) => {
+    const existingPackageInfoFiles = [];
     return passthrough(function (file) {
+        if (file.path.endsWith('package-info.java')) {
+            existingPackageInfoFiles.push(file.path);
+            return;
+        }
         for (const root of javaRoots) {
             if (file.path.startsWith(root)) {
                 const directory = dirname(file.path);
                 const packageName = relative(root, directory).replaceAll(/[/\\]/g, '.');
-                const packageInfoFile = join(directory, 'package-info.java');
-                const packageJavadoc = javadocs?.[packageName] ?? DEFAULT_DOC;
-                if (!editor.exists(packageInfoFile)) {
-                    editor.write(packageInfoFile, `/**
+                const packageInfoFilePath = join(directory, 'package-info.java');
+                if (existingPackageInfoFiles.includes(packageInfoFilePath)) {
+                    return;
+                }
+                const packageInfoFile = loadFile(packageInfoFilePath);
+                if (!packageInfoFile.contents) {
+                    const packageJavadoc = javadocs?.[packageName] ?? DEFAULT_DOC;
+                    packageInfoFile.contents = Buffer.from(`/**
  * ${packageJavadoc}
  */
 package ${packageName};
 `);
+                    setModifiedFileState(packageInfoFile);
+                    this.push(packageInfoFile);
                 }
+                existingPackageInfoFiles.push(packageInfoFilePath);
             }
         }
     });

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

@@ -54,7 +54,7 @@ package <%= entityAbsolutePackage %>.domain;
 <%_ if (relationshipsContainOtherSideIgnore) { _%>
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 <%_ } _%>
-<%_ if (!dtoMapstruct && (typeof javadoc !== 'undefined' || importApiModelProperty)) { _%>
+<%_ if (!dtoMapstruct && (entityApiDescription || importApiModelProperty)) { _%>
 import io.swagger.v3.oas.annotations.media.Schema;
 <%_ } _%>
 
@@ -85,15 +85,15 @@ import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 import <%= otherEntity.entityAbsoluteClass %>;
 <%_ } _%>
 
-<%_ if (typeof javadoc === 'undefined') { _%>
+<%_ if (entityJavadoc) { _%>
+<%- entityJavadoc %>
+<%_ } else { _%>
 /**
  * A <%= persistClass %>.
  */
-<%_ } else { _%>
-<%- entityJavadoc %>
-  <%_ if (!dtoMapstruct) { _%>
+<%_ } _%>
+<%_ if (!dtoMapstruct && entityApiDescription) { _%>
 @Schema(description = "<%- entityApiDescription %>")
-  <%_ } _%>
 <%_ } _%>
 <&- fragments.annotationSection() -&>
 @SuppressWarnings("common-java:DuplicatedBlocks")
@@ -111,10 +111,10 @@ public class <%= persistClass %> <&- fragments.extendsSection() -&>implements Se
 <%_ for (const field of fields.filter(field => !field.javaInherited && !field.transient && (embedded || !field.id || !primaryKey.composite))) { _%>
 <&- fragments.field<%- field.fieldNameCapitalized %>CustomDeclarationSection() -&>
 <&_ if (!fragments.field<%- field.fieldNameCapitalized %>CustomDeclarationSection()) { -&>
-  <%_ if (typeof field.javadoc !== 'undefined') { _%>
+  <%_ if (field.fieldJavadoc) { _%>
 <%- field.fieldJavadoc %>
   <%_ } _%>
-  <%_ if (!dtoMapstruct && typeof field.javadoc !== 'undefined') { _%>
+  <%_ if (!dtoMapstruct && field.fieldApiDescription) { _%>
     @Schema(description = "<%- field.fieldApiDescription %>"<% if (field.fieldValidationRequired) { %>, required = true<% } %>)
   <%_ } _%>
 <&- fragments.field<%- field.fieldNameCapitalized %>AnnotationSection() -&>
@@ -132,9 +132,9 @@ 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)) {
-  if (typeof relationship.javadoc !== 'undefined') { _%>
+  if (typeof relationship.fieldApiDescription) { _%>
 <%- relationship.relationshipJavadoc %>
-    <%_ if (!dtoMapstruct) { _%>
+    <%_ if (!dtoMapstruct && relationship.relationshipyApiDescription) { _%>
     @Schema(description = "<%- relationship.relationshipyApiDescription %>")
     <%_ } _%>
   <%_ } _%>
@@ -240,16 +240,16 @@ _%>
 <&_ if (!fragments.relationship<%- relationship.relationshipNameCapitalized %>CustomSetSection()) { -&>
   <%_ if (relationship.collection) { _%>
     public void set<%= relationship.relationshipNameCapitalizedPlural %>(Set<<%= relationship.otherEntity.persistClass %>> <%= relationship.otherEntityNamePlural %>) {
-    <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%>
+    <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference) { _%>
         if (this.<%= relationship.relationshipFieldNamePlural %> != null) {
-      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+      <%_ if (relationship.otherRelationship.collection) { _%>
             this.<%= relationship.relationshipFieldNamePlural %>.forEach(i -> i.remove<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
       <%_ } else { _%>
             this.<%= relationship.relationshipFieldNamePlural %>.forEach(i -> i.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null));
       <%_ } _%>
         }
         if (<%= relationship.otherEntityNamePlural %> != null) {
-      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+      <%_ if (relationship.otherRelationship.collection) { _%>
             <%= relationship.otherEntityNamePlural %>.forEach(i -> i.add<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
       <%_ } else { _%>
             <%= relationship.otherEntityNamePlural %>.forEach(i -> i.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
@@ -260,16 +260,16 @@ _%>
     }
   <%_ } else { _%>
     public void set<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
-    <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%>
+    <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference) { _%>
         if (this.<%= relationship.relationshipFieldName %> != null) {
-      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+      <%_ if (relationship.otherRelationship.collection) { _%>
             this.<%= relationship.relationshipFieldName %>.remove<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
       <%_ } else { _%>
             this.<%= relationship.relationshipFieldName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
       <%_ } _%>
         }
         if (<%= relationship.otherEntityName %> != null) {
-      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+      <%_ if (relationship.otherRelationship.collection) { _%>
             <%= relationship.otherEntityName %>.add<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
       <%_ } else { _%>
             <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
@@ -292,13 +292,11 @@ _%>
 <&_ if (!fragments.relationship<%- relationship.relationshipNameCapitalized %>CustomAddSection()) { -&>
     public <%= persistClass %> add<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
         this.<%= relationship.relationshipFieldNamePlural %>.add(<%= relationship.otherEntityName %>);
-      <%_ if (!relationship.otherEntity.embedded || embedded && relationship.ownerSide) { _%>
-        <%_ if (relationship.otherRelationship) { _%>
-          <%_ if (!relationship.otherRelationship.collection) { _%>
-        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
-          <%_ } else if (relationship.otherRelationship.relationshipNamePlural && !relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+      <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference) { _%>
+        <%_ if (relationship.otherRelationship.collection) { _%>
         <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().add(this);
-          <%_ } _%>
+        <%_ } else { _%>
+        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
         <%_ } _%>
       <%_ } _%>
         return this;
@@ -309,13 +307,11 @@ _%>
 <&_ if (!fragments.relationship<%- relationship.relationshipNameCapitalized %>CustomRemoveSection()) { -&>
     public <%= persistClass %> remove<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
         this.<%= relationship.relationshipFieldNamePlural %>.remove(<%= relationship.otherEntityName %>);
-      <%_ if (!relationship.otherEntity.embedded || (embedded && relationship.ownerSide)) { _%>
-        <%_ if (relationship.otherRelationship) { _%>
-          <%_ if (!relationship.otherRelationship.collection) { _%>
-        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
-          <%_ } else if (!relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+      <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference) { _%>
+        <%_ if (relationship.otherRelationship.collection) { _%>
         <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().remove(this);
-          <%_ } _%>
+        <%_ } else { _%>
+        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
         <%_ } _%>
       <%_ } _%>
         return this;

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

@@ -0,0 +1,30 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ 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.importSection) { -&>
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "<%- primaryKey.name %>", scope = <%- persistClass %>.class)
+<&_ } -&>

package/dist/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/enumeration/_enumName_.java.ejs

@@ -18,12 +18,12 @@
 -%>
 package <%= entityAbsolutePackage %>.domain.enumeration;
 
-<%_ if (typeof javadoc === 'undefined') { _%>
+<%_ if (enumJavadoc) { _%>
+<%- enumJavadoc %>
+<%_ } else { _%>
 /**
  * The <%= enumName %> enumeration.
  */
-<%_ } else { _%>
-<%= javadoc %>
 <%_ } _%>
 public enum <%= enumName %> {
 <%_ if (withoutCustomValues) { _%>

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

@@ -18,12 +18,20 @@
 -%>
 package <%= entityAbsolutePackage %>.domain;
 
+import static <%= entityAbsolutePackage %>.domain.<%= persistClass %>TestSamples.*;
+<%_ for (const otherEntity of otherEntities.filter(otherEntity => !otherEntity.builtIn)) { _%>
+import static <%= otherEntity.entityAbsolutePackage %>.domain.<%= otherEntity.persistClass %>TestSamples.*;
+<%_ } _%>
+<%_ for (const otherEntity of otherEntities.filter(otherEntity => entityPackage !== otherEntity.entityPackage)) { _%>
+import <%= otherEntity.entityAbsolutePackage %>.domain.<%= otherEntity.persistClass %>;
+<%_ } _%>
+<%_ if (relationships.some(relationship => relationship.collection)) { _%>
+import java.util.HashSet;
+import java.util.Set;
+<%_ } _%>
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import <%= packageName %>.web.rest.TestUtil;
-<%_ if (primaryKey && primaryKey.hasUUID) { _%>
-import java.util.UUID;
-<%_ } _%>
 
 class <%= persistClass %>Test {
 
@@ -31,15 +39,85 @@ class <%= persistClass %>Test {
     void equalsVerifier() throws Exception {
         TestUtil.equalsVerifier(<%= persistClass %>.class);
 <%_if (!embedded) { _%>
-        <%= persistClass %> <%= persistInstance %>1 = new <%= persistClass %>();
-        <%= persistInstance %>1.set<%= primaryKey.nameCapitalized %>(<% if (primaryKey.typeInteger) { %>1<% } else if (primaryKey.typeLong) { %>1L<% } else if (primaryKey.typeString) { %>"id1"<% } else if (primaryKey.typeUUID) { %>UUID.randomUUID()<% } %>);
+        <%= persistClass %> <%= persistInstance %>1 = get<%= persistClass %>Sample1();
         <%= persistClass %> <%= persistInstance %>2 = new <%= persistClass %>();
+        assertThat(<%= persistInstance %>1).isNotEqualTo(<%= persistInstance %>2);
+
         <%= persistInstance %>2.set<%= primaryKey.nameCapitalized %>(<%= persistInstance %>1.get<%= primaryKey.nameCapitalized %>());
         assertThat(<%= persistInstance %>1).isEqualTo(<%= persistInstance %>2);
-        <%= persistInstance %>2.set<%= primaryKey.nameCapitalized %>(<% if (primaryKey.typeInteger) { %>2<% } else if (primaryKey.typeLong) { %>2L<% } else if (primaryKey.typeString) { %>"id2"<% } else if (primaryKey.typeUUID) { %>UUID.randomUUID()<% } %>);
-        assertThat(<%= persistInstance %>1).isNotEqualTo(<%= persistInstance %>2);
-        <%= persistInstance %>1.set<%= primaryKey.nameCapitalized %>(null);
+
+        <%= persistInstance %>2 = get<%= persistClass %>Sample2();
         assertThat(<%= persistInstance %>1).isNotEqualTo(<%= persistInstance %>2);
 <%_} _%>
     }
+<%_ for (const relationship of relationships.filter(relationship => !relationship.otherEntity.builtIn)) { _%>
+
+    @Test
+    void <%- relationship.relationshipName %>Test() throws Exception {
+        <%= persistClass %> <%= persistInstance %> = get<%= persistClass %>RandomSampleGenerator();
+        <%= relationship.otherEntity.persistClass %> <%= relationship.otherEntity.persistInstance %>Back = get<%= relationship.otherEntity.persistClass %>RandomSampleGenerator();
+  <%_ if (relationship.collection) { _%>
+
+        <%= persistInstance %>.add<%- relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistInstance %>Back);
+        assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).containsOnly(<%= relationship.otherEntity.persistInstance %>Back);
+  <%_ } else { _%>
+
+        <%= persistInstance %>.set<%- relationship.propertyNameCapitalized %>(<%= relationship.otherEntity.persistInstance %>Back);
+        assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).isEqualTo(<%= relationship.otherEntity.persistInstance %>Back);
+  <%_ } _%>
+  <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference && !relationship.otherEntity.embedded) { _%>
+    <%_ if (relationship.otherRelationship.collection) { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).containsOnly(<%= persistInstance %>);
+    <%_ } else { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).isEqualTo(<%= persistInstance %>);
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (relationship.collection) { _%>
+
+        <%= persistInstance %>.remove<%- relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistInstance %>Back);
+        assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).doesNotContain(<%= relationship.otherEntity.persistInstance %>Back);
+  <%_ } else { _%>
+
+    <%_ if (fluentMethods) { _%>
+        <%= persistInstance %>.<%- relationship.propertyName %>(null);
+    <%_ } else { _%>
+        <%= persistInstance %>.set<%- relationship.propertyNameCapitalized %>(null);
+    <%_ } _%>
+        assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).isNull();
+  <%_ } _%>
+  <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference && !relationship.otherEntity.embedded) { _%>
+    <%_ if (relationship.otherRelationship.collection) { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).doesNotContain(<%= persistInstance %>);
+    <%_ } else { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).isNull();
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (relationship.collection) { _%>
+
+    <%_ if (fluentMethods) { _%>
+        <%= persistInstance %>.<%- relationship.propertyName %>(new HashSet<>(Set.of(<%= relationship.otherEntity.persistInstance %>Back)));
+    <%_ } else { _%>
+        <%= persistInstance %>.set<%- relationship.propertyNameCapitalized %>(new HashSet<>(Set.of(<%= relationship.otherEntity.persistInstance %>Back)));
+    <%_ } _%>
+        assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).containsOnly(<%= relationship.otherEntity.persistInstance %>Back);
+    <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference && !relationship.otherEntity.embedded) { _%>
+      <%_ if (relationship.otherRelationship.collection) { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).containsOnly(<%= persistInstance %>);
+      <%_ } else { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).isEqualTo(<%= persistInstance %>);
+      <%_ } _%>
+    <%_ } _%>
+
+        <%= persistInstance %>.set<%- relationship.propertyNameCapitalized %>(new HashSet<>());
+        assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).doesNotContain(<%= relationship.otherEntity.persistInstance %>Back);
+    <%_ if (relationship.otherRelationship && relationship.relationshipUpdateBackReference && !relationship.otherEntity.embedded) { _%>
+      <%_ if (relationship.otherRelationship.collection) { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).doesNotContain(<%= persistInstance %>);
+      <%_ } else { _%>
+        assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).isNull();
+      <%_ } _%>
+    <%_ } _%>
+  <%_ } _%>
+    }
+<%_ } _%>
 }

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

@@ -0,0 +1,85 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= entityAbsolutePackage %>.domain;
+
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import <%= packageName %>.web.rest.TestUtil;
+<%_ if (fields.some(field => field.fieldTypeString) || fields.some(field => field.fieldTypeUUID)) { _%>
+import java.util.UUID;
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeLong || field.fieldTypeInteger)) { _%>
+import java.util.Random;
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeLong)) { _%>
+import java.util.concurrent.atomic.AtomicLong;
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeInteger)) { _%>
+import java.util.concurrent.atomic.AtomicInteger;
+<%_ } _%>
+
+<%_ const sampleFields = fields.filter(field => !field.mapstructExpression && (field.fieldTypeInteger || field.fieldTypeLong || field.fieldTypeString || field.fieldTypeUUID)); _%>
+public class <%= persistClass %>TestSamples {
+
+<%_ if (fields.some(field => field.fieldTypeLong || field.fieldTypeInteger)) { _%>
+    private static final Random random = new Random();
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeLong)) { _%>
+    private static final AtomicLong longCount = new AtomicLong(random.nextInt() + ( 2 * Integer.MAX_VALUE ));
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeInteger)) { _%>
+    private static final AtomicInteger intCount = new AtomicInteger(random.nextInt() + ( 2 * Short.MAX_VALUE ));
+<%_ } _%>
+
+    public static <%= persistClass %> get<%= persistClass %>Sample1() {
+<%_ if (fluentMethods) { _%>
+        return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample1 %>)<% }) %>;
+<%_ } else { _%>
+        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+  <%_ for (const field of sampleFields) { _%>
+        <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueSample1 %>);
+  <%_ } _%>
+        return <%= persistInstance %>;
+<%_ } _%>
+    }
+
+    public static <%= persistClass %> get<%= persistClass %>Sample2() {
+<%_ if (fluentMethods) { _%>
+        return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample2 %>)<% }) %>;
+<%_ } else { _%>
+        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+  <%_ for (const field of sampleFields) { _%>
+        <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueSample2 %>);
+  <%_ } _%>
+        return <%= persistInstance %>;
+<%_ } _%>
+    }
+
+    public static <%= persistClass %> get<%= persistClass %>RandomSampleGenerator() {
+<%_ if (fluentMethods) { _%>
+        return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueGenerator %>)<% }) %>;
+<%_ } else { _%>
+        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+  <%_ for (const field of sampleFields) { _%>
+        <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueGenerator %>);
+  <%_ } _%>
+        return <%= persistInstance %>;
+<%_ } _%>
+    }
+}