generator-jhipster 7.2.0 → 7.4.1

package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs

@@ -16,46 +16,38 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.web.rest;
+package <%= entityAbsolutePackage %>.web.rest;
 
 <%_
 const viaService = !serviceNo;
-
-let manyToManyWithUser = false;
-for (const relationship of relationships) {
-  if (relationship.otherEntityUser && relationship.relationshipManyToMany) {
-    manyToManyWithUser = true;
-    break;
-  }
-}
 _%>
 <%_ if (!dtoMapstruct || serviceNo) { _%>
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ } _%>
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (!serviceNo) { _%>
-import <%= packageName %>.service.<%= entityClass %>Service;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>Service;
 <%_ } else { _%>
   <%_ if (isUsingMapsId === true) { _%>
-import <%= packageName %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
   <%_ } _%>
   <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
   <%_ } _%>
 <%_ } _%>
 <%_ if (saveUserSnapshot) { _%>
-import <%= packageName %>.repository.UserRepository;
+import <%= entityAbsolutePackage %>.repository.UserRepository;
 <%_ } _%>
 import <%= packageName %>.web.rest.errors.BadRequestAlertException;
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
   <%_ if (serviceNo) { _%>
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
   <%_ } _%>
 <%_ } _%>
 <%_ if (jpaMetamodelFiltering) {  _%>
-import <%= packageName %>.service.criteria.<%= entityClass %>Criteria;
-import <%= packageName %>.service.<%= entityClass %>QueryService;
+import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>QueryService;
 <%_ } _%>
 
 import tech.jhipster.web.util.HeaderUtil;
@@ -134,7 +126,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 <%_ } _%>
 
 /**
- * REST controller for managing {@link <%= packageName %>.domain.<%= persistClass %>}.
+ * REST controller for managing {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>}.
  */
 @RestController
 @RequestMapping("/api")
@@ -177,17 +169,19 @@ public class <%= entityClass %>Resource {
             throw new BadRequestAlertException("A new <%= entityInstance %> cannot already have an ID", ENTITY_NAME, "idexists");
         }
   <%_ if (saveUserSnapshot) { _%>
-    <%_ if (manyToManyWithUser) { _%>
-        if (<%= instanceName %>.getUsers() != null) {
-            // Save users in case they are new and only exists in gateway
-            userRepository.saveAll(<%= instanceName %>.getUsers());
-        }
-    <%_ } else { _%>
-        if (<%= instanceName %>.getUser() != null) {
-            // Save user in case it's new and only exists in gateway
-            userRepository.save(<%= instanceName %>.getUser());
-        }
-    <%_ } _%>
+    <% for (const userRelationship of relationships.filter(rel => rel.otherEntity.builtInUser)) { %>
+      <%_ if (userRelationship.collection) { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>() != null) { 
+            // Save users in case they are new and only exist in gateway 
+            userRepository.saveAll(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>()); 
+        } 
+      <%_ } else { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>() != null) { 
+            // Save user in case it's new and only exists in gateway 
+            userRepository.save(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>()); 
+        } 
+      <%_ } _%>
+    <% } %>
   <%_ } _%>
   <%_ for (field of primaryKey.fields.filter(f => f.autoGenerateByService)) { _%>
         <%= instanceName %>.set<%= field.fieldNameCapitalized %>(UUID.randomUUID());
@@ -245,17 +239,19 @@ public class <%= entityClass %>Resource {
   <%_ } _%>
 
   <%_ if (saveUserSnapshot) { _%>
-    <%_ if (manyToManyWithUser) { _%>
-        if (<%= instanceName %>.getUsers() != null) {
-            // Save users in case they are new and only exists in gateway
-            userRepository.saveAll(<%= instanceName %>.getUsers());
-        }
-    <%_ } else { _%>
-        if (<%= instanceName %>.getUser() != null) {
-            // Save user in case it's new and only exists in gateway
-            userRepository.save(<%= instanceName %>.getUser());
-        }
-    <%_ } _%>
+    <% for (const userRelationship of relationships.filter(rel => rel.otherEntity.builtInUser)) { %>
+      <%_ if (userRelationship.collection) { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>() != null) { 
+            // Save users in case they are new and only exist in gateway 
+            userRepository.saveAll(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>()); 
+        } 
+      <%_ } else { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>() != null) { 
+            // Save user in case it's new and only exists in gateway 
+            userRepository.save(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>()); 
+        } 
+      <%_ } _%>
+    <% } %>
   <%_ } _%>
 <%- include('/partials/save_template', {asEntity, asDto, viaService: viaService, returnDirectly: false, isUsingMapsId: false, mapsIdAssoc: mapsIdAssoc}); -%>
   <%_ if (!reactive) { _%>
@@ -308,17 +304,19 @@ public class <%= entityClass %>Resource {
   <%_ } _%>
 
   <%_ if (saveUserSnapshot) { _%>
-    <%_ if (manyToManyWithUser) { _%>
-            if (<%= instanceName %>.getUsers() != null) {
-                // Save users in case they are new and only exists in gateway
-                userRepository.saveAll(<%= instanceName %>.getUsers());
-            }
-    <%_ } else { _%>
-            if (<%= instanceName %>.getUser() != null) {
-                // Save user in case it's new and only exists in gateway
-                userRepository.save(<%= instanceName %>.getUser());
-            }
-    <%_ } _%>
+    <% for (const userRelationship of relationships.filter(rel => rel.otherEntity.builtInUser)) { %>
+      <%_ if (userRelationship.collection) { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>() != null) { 
+            // Save users in case they are new and only exist in gateway 
+            userRepository.saveAll(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalizedPlural %>()); 
+        } 
+      <%_ } else { _%> 
+        if (<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>() != null) { 
+            // Save user in case it's new and only exists in gateway 
+            userRepository.save(<%= instanceName %>.get<%= userRelationship.relationshipNameCapitalized %>()); 
+        } 
+      <%_ } _%>
+    <% } %>
   <%_ } _%>
 
             <%- include('../../common/patch_template', {asEntity, asDto, isService: false, viaService: viaService}); -%>

package/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.domain;
+package <%= entityAbsolutePackage %>.domain;
 
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;

package/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.search;
+package <%= entityAbsolutePackage %>.repository.search;
 
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Configuration;

package/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.dto;
+package <%= entityAbsolutePackage %>.service.dto;
 
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;

package/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.mapper;
+package <%= entityAbsolutePackage %>.service.mapper;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.web.rest;
+package <%= entityAbsolutePackage %>.web.rest;
 
 <%_
 
@@ -57,11 +57,14 @@ if (databaseTypeSql && !reactive) {
 }
 
 _%>
+<%_ if (entityAbsolutePackage !== packageName) { _%>
+import <%= packageName %>.web.rest.TestUtil;
+<% } %>
 <%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_
 var imported = [];
 for (relationship of relationships) { // import entities in required relationships
@@ -70,34 +73,34 @@ for (relationship of relationships) { // import entities in required relationshi
   const isUsingMapsIdL1 = relationship.id;
   if (imported.indexOf(otherEntityNameCapitalized) === -1) {
     if ((relationshipValidate !== null && relationshipValidate === true) || jpaMetamodelFiltering || (isUsingMapsIdL1 === true)) { _%>
-import <%= packageName %>.domain.<%= asEntity(otherEntityNameCapitalized) %>;
+import <%= entityAbsolutePackage %>.domain.<%= asEntity(otherEntityNameCapitalized) %>;
 <%_
           imported.push(otherEntityNameCapitalized);
     }
   }
 } _%>
 <%_ if (saveUserSnapshot) { _%>
-import <%= packageName %>.repository.UserRepository;
+import <%= entityAbsolutePackage %>.repository.UserRepository;
 <%_ } _%>
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.service.EntityManager;
 <%_ } _%>
 <%_ if (isUsingMapsId && (!dtoMapstruct && serviceNo)) { _%>
-import <%= packageName %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
 <%_ } _%>
 <%_ if (!serviceNo && fieldsContainOwnerManyToMany) { _%>
-import <%= packageName %>.service.<%= entityClass %>Service;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>Service;
 <%_ } _%>
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 <%_ if (jpaMetamodelFiltering) { _%>
-import <%= packageName %>.service.criteria.<%= entityClass %>Criteria;
+import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
 <%_ } _%>
 
 <%_ if (databaseTypeSql && reactive) { _%>
@@ -216,7 +219,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 <%_ for (const field of fields.filter(field => !field.transient)) {
   if (field.fieldIsEnum) { _%>
-import <%= packageName %>.domain.enumeration.<%= field.fieldType %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 <%_ }
 } _%>
 /**
@@ -447,9 +450,9 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 <%_ } if (searchEngineElasticsearch) { _%>
 
     /**
-     * This repository is mocked in the <%= packageName %>.repository.search test package.
+     * This repository is mocked in the <%= entityAbsolutePackage %>.repository.search test package.
      *
-     * @see <%= packageName %>.repository.search.<%= entityClass %>SearchRepositoryMockConfiguration
+     * @see <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepositoryMockConfiguration
      */
     @Autowired
     private <%= entityClass %>SearchRepository mock<%= entityClass %>SearchRepository;

package/generators/gae/index.js

@@ -35,11 +35,11 @@ const { MAVEN, GRADLE } = require('../../jdl/jhipster/build-tool-types');
 
 const NO_CACHE_PROVIDER = cacheProviders.NO;
 
-let useBlueprints;
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_GAE);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_GAE);
+    }
   }
 
   _initializing() {
@@ -121,7 +121,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -607,7 +607,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -748,7 +748,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -761,7 +761,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -831,7 +831,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -877,7 +877,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 

package/generators/generator-base-blueprint.js

@@ -51,8 +51,13 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       // jhipsterContext is the original generator
       this.jhipsterContext = this.options.jhipsterContext;
 
-      // Fallback to the original generator if the file does not exists in the blueprint.
-      this.jhipsterTemplatesFolders.push(this.jhipsterTemplatePath());
+      try {
+        // Fallback to the original generator if the file does not exists in the blueprint.
+        this.jhipsterTemplatesFolders.push(this.jhipsterTemplatePath());
+      } catch (error) {
+        this.warning('Error adding current blueprint templates as alternative for JHipster templates.');
+        this.log(error);
+      }
     }
   }
 
@@ -224,44 +229,6 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     return false;
   }
 
-  /**
-   * @private
-   * @deprecated
-   * Instantiates the blueprint generators, if any.
-   * @param {string} subGen - sub generator
-   * @param {any} extraOptions - extra options to pass to blueprint generator
-   * @return {true} useBlueprints - true if one or more blueprints generators have been constructed; false otherwise
-   */
-  instantiateBlueprints(subGen, extraOptions) {
-    if (this.options.help) {
-      // Ignore blueprint registered options.
-      return false;
-    }
-    let useBlueprints = false;
-
-    if (!this.configOptions.blueprintConfigured) {
-      this.configOptions.blueprintConfigured = true;
-      this._configureBlueprints();
-    }
-
-    const blueprints = this.jhipsterConfig.blueprints;
-    if (blueprints && blueprints.length > 0) {
-      blueprints.forEach(blueprint => {
-        const blueprintGenerator = this._composeBlueprint(blueprint.name, subGen, extraOptions);
-        if (blueprintGenerator) {
-          if (blueprintGenerator.sbsBlueprint) {
-            // If sbsBlueprint, add templatePath to the original generator templatesFolder.
-            this.jhipsterTemplatesFolders.unshift(blueprintGenerator.templatePath());
-          } else {
-            // If the blueprints does not sets sbsBlueprint property, ignore normal workflow.
-            useBlueprints = true;
-          }
-        }
-      });
-    }
-    return useBlueprints;
-  }
-
   /**
    * @private
    * Composes with blueprint generators, if any.
@@ -353,7 +320,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
    * @param {any} options - options to pass to blueprint generator
    * @return {Generator|undefined}
    */
-  _composeBlueprint(blueprint, subGen, extraOptions = {}) {
+  async _composeBlueprint(blueprint, subGen, extraOptions = {}) {
     blueprint = normalizeBlueprintName(blueprint);
     if (!this.configOptions.skipChecks && !this.options.skipChecks) {
       this._checkBlueprint(blueprint);
@@ -362,16 +329,17 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     const generatorName = packageNameToNamespace(blueprint);
     const generatorNamespace = `${generatorName}:${subGen}`;
     if (!this.env.isPackageRegistered(generatorName)) {
-      this.env.lookup({ filterPaths: true, packagePatterns: blueprint });
+      await this.env.lookup({ filterPaths: true, packagePatterns: blueprint });
     }
-    if (!this.env.get(generatorNamespace)) {
+    if (!(await this.env.get(generatorNamespace))) {
       this.debug(
-        `No blueprint found for blueprint ${chalk.yellow(blueprint)} and ${chalk.yellow(
-          subGen
+        `No blueprint found for blueprint ${chalk.yellow(blueprint)} and ${chalk.yellow(subGen)} with namespace ${chalk.yellow(
+          generatorNamespace
         )} subgenerator: falling back to default generator`
       );
       return undefined;
     }
+    this.debug(`Found blueprint ${chalk.yellow(blueprint)} and ${chalk.yellow(subGen)} with namespace ${chalk.yellow(generatorNamespace)}`);
 
     const finalOptions = {
       ...this.options,
@@ -380,7 +348,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       jhipsterContext: this,
     };
 
-    const blueprintGenerator = this.composeWith(generatorNamespace, finalOptions, true);
+    const blueprintGenerator = await this.composeWith(generatorNamespace, finalOptions, true);
     if (blueprintGenerator instanceof Error) {
       throw blueprintGenerator;
     }

package/generators/generator-base-private.js

@@ -29,16 +29,13 @@ const https = require('https');
 const { reproducibleConfigForTests: projectNameReproducibleConfigForTests } = require('./project-name/config.cjs');
 const packagejs = require('../package.json');
 const jhipsterUtils = require('./utils');
-const constants = require('./generator-constants');
+const { JAVA_COMPATIBLE_VERSIONS, SERVER_TEST_SRC_DIR, SUPPORTED_CLIENT_FRAMEWORKS } = require('./generator-constants');
 const { languageToJavaLanguage } = require('./utils');
 const JSONToJDLEntityConverter = require('../jdl/converters/json-to-jdl-entity-converter');
 const JSONToJDLOptionConverter = require('../jdl/converters/json-to-jdl-option-converter');
 const { stringify } = require('../utils');
 
-const SERVER_TEST_SRC_DIR = constants.SERVER_TEST_SRC_DIR;
-const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
-const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
-const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
+const { ANGULAR, REACT, VUE } = SUPPORTED_CLIENT_FRAMEWORKS;
 const dbTypes = require('../jdl/jhipster/field-types');
 const { REQUIRED } = require('../jdl/jhipster/validations');
 
@@ -809,17 +806,12 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
         this.warning('Java is not found on your computer.');
       } else {
         const javaVersion = stderr.match(/(?:java|openjdk) version "(.*)"/)[1];
-        if (
-          !javaVersion.match(new RegExp('16')) &&
-          !javaVersion.match(new RegExp('15')) &&
-          !javaVersion.match(new RegExp('14')) &&
-          !javaVersion.match(new RegExp('13')) &&
-          !javaVersion.match(new RegExp('12')) &&
-          !javaVersion.match(new RegExp('11')) &&
-          !javaVersion.match(new RegExp('1.8'.replace('.', '\\.')))
-        ) {
+        if (!javaVersion.match(new RegExp(`(${JAVA_COMPATIBLE_VERSIONS.map(ver => `^${ver}`).join('|')})`))) {
+          const [latest, ...others] = JAVA_COMPATIBLE_VERSIONS.reverse();
           this.warning(
-            `Java 8, 11, 12, 13, 14, 15 or 16 are not found on your computer. Your Java version is: ${chalk.yellow(javaVersion)}`
+            `Java ${others.reverse().join(', ')} or ${latest} are not found on your computer. Your Java version is: ${chalk.yellow(
+              javaVersion
+            )}`
           );
         }
       }
@@ -995,8 +987,9 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
       const fileName = _.kebabCase(field.fieldType);
       if (field.fieldIsEnum && (!uniqueEnums[field.fieldType] || (uniqueEnums[field.fieldType] && field.fieldValues.length !== 0))) {
         const importType = `${field.fieldType}`;
+        const basePath = clientFramework === VUE ? '@' : 'app';
         const modelPath = clientFramework === ANGULAR ? 'entities' : 'shared/model';
-        const importPath = `app/${modelPath}/enumerations/${fileName}.model`;
+        const importPath = `${basePath}/${modelPath}/enumerations/${fileName}.model`;
         uniqueEnums[field.fieldType] = field.fieldType;
         typeImports.set(importType, importPath);
       }
@@ -1146,13 +1139,40 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @param {any} primaryKey - primary key definition.
    * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
    */
-  generateTestEntityPrimaryKey(primaryKey, index = 'random') {
+  generateTestEntityPrimaryKey(primaryKey, index) {
+    return JSON.stringify(
+      this.generateTestEntity(
+        primaryKey.fields.map(f => f.reference),
+        index
+      )
+    );
+  }
+
+  /**
+   * Generate a test entity, according to the type
+   *
+   * @param {any} primaryKey - primary key definition.
+   * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
+   */
+  generateTestEntity(references, index = 'random') {
     const random = index === 'random';
-    const entries = primaryKey.ids.map(id => {
-      const value = random ? id.field.generateFakeData('raw') : this.generateTestEntityId(id.field.fieldType, index, false);
-      return [id.name, value];
-    });
-    return JSON.stringify(Object.fromEntries(entries));
+    const entries = references
+      .map(reference => {
+        if (random && reference.field) {
+          const field = reference.field;
+          const fakeData = field.generateFakeData('json-serializable');
+          if (reference.field.fieldWithContentType) {
+            return [
+              [reference.name, fakeData],
+              [field.contentTypeFieldName, 'unknown'],
+            ];
+          }
+          return [[reference.name, fakeData]];
+        }
+        return [[reference.name, this.generateTestEntityId(reference.type, index, false)]];
+      })
+      .flat();
+    return Object.fromEntries(entries);
   }
 
   /**