generator-jhipster 7.1.0 → 7.4.0

package/generators/gae/index.js

@@ -16,16 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* eslint-disable consistent-return */
 const os = require('os');
 const shelljs = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const _ = require('lodash');
 const { GENERATOR_GAE } = require('../generator-list');
-const BaseGenerator = require('../generator-base');
+const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const statistics = require('../statistics');
 const dockerPrompts = require('../docker-prompts');
-const { OptionNames } = require('../../jdl/jhipster/application-options');
 const constants = require('../generator-constants');
 const cacheProviders = require('../../jdl/jhipster/cache-types');
 const { MEMCACHED } = require('../../jdl/jhipster/cache-types');
@@ -34,24 +34,15 @@ const { MARIADB, MYSQL, POSTGRESQL } = require('../../jdl/jhipster/database-type
 const { MAVEN, GRADLE } = require('../../jdl/jhipster/build-tool-types');
 
 const NO_CACHE_PROVIDER = cacheProviders.NO;
-const {
-  APPLICATION_TYPE,
-  BASE_NAME,
-  BUILD_TOOL,
-  CACHE_PROVIDER,
-  CLIENT_PACKAGE_MANAGER,
-  DATABASE_TYPE,
-  ENABLE_HIBERNATE_CACHE,
-  PACKAGE_NAME,
-  PACKAGE_FOLDER,
-  PROD_DATABASE_TYPE,
-  SEARCH_ENGINE,
-  SERVICE_DISCOVERY_TYPE,
-  SKIP_CLIENT,
-} = OptionNames;
-
-module.exports = class extends BaseGenerator {
-  get initializing() {
+
+module.exports = class extends BaseBlueprintGenerator {
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_GAE);
+    }
+  }
+
+  _initializing() {
     return {
       sayHello() {
         this.log(chalk.bold('Welcome to Google App Engine Generator'));
@@ -97,24 +88,20 @@ module.exports = class extends BaseGenerator {
         );
       },
 
+      loadCommonConfig() {
+        this.loadAppConfig();
+        this.loadServerConfig();
+        this.loadPlatformConfig();
+        this.loadClientConfig();
+      },
+
       loadConfig() {
         const configuration = this.config;
         this.env.options.appPath = configuration.get('appPath') || constants.CLIENT_MAIN_SRC_DIR;
-        this.baseName = configuration.get(BASE_NAME);
         this.mainClass = this.getMainClassName();
-        this.packageName = configuration.get(PACKAGE_NAME);
-        this.packageFolder = configuration.get(PACKAGE_FOLDER);
-        this.cacheProvider = configuration.get(CACHE_PROVIDER) || NO_CACHE_PROVIDER;
-        this.enableHibernateCache =
-          configuration.get(ENABLE_HIBERNATE_CACHE) && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
-        this.databaseType = configuration.get(DATABASE_TYPE);
-        this.prodDatabaseType = configuration.get(PROD_DATABASE_TYPE);
-        this.searchEngine = configuration.get(SEARCH_ENGINE);
+        this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
+        this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
         this.frontendAppName = this.getFrontendAppName();
-        this.buildTool = configuration.get(BUILD_TOOL);
-        this.applicationType = configuration.get(APPLICATION_TYPE);
-        this.serviceDiscoveryType = configuration.get(SERVICE_DISCOVERY_TYPE);
-
         this.gcpProjectId = configuration.get('gcpProjectId');
         this.gcpCloudSqlInstanceName = configuration.get('gcpCloudSqlInstanceName');
         this.gcpCloudSqlUserName = configuration.get('gcpCloudSqlUserName');
@@ -128,14 +115,17 @@ module.exports = class extends BaseGenerator {
         this.gaeMinInstances = configuration.get('gaeMinInstances');
         this.gaeCloudSQLInstanceNeeded = configuration.get('gaeCloudSQLInstanceNeeded');
         this.CLIENT_DIST_DIR = this.getResourceBuildDirectoryForBuildTool(this.config.buildTool) + constants.CLIENT_DIST_DIR;
-        this.skipClient = this.config.get(SKIP_CLIENT);
-        this.clientPackageManager = this.config.get(CLIENT_PACKAGE_MANAGER);
         this.dasherizedBaseName = _.kebabCase(this.baseName);
       },
     };
   }
 
-  get prompting() {
+  get initializing() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
+  }
+
+  _prompting() {
     return {
       askForPath() {
         if (this.abort) return undefined;
@@ -616,11 +606,12 @@ module.exports = class extends BaseGenerator {
     };
   }
 
-  get default() {
-    return {};
+  get prompting() {
+    if (this.delegateToBlueprint) return {};
+    return this._prompting();
   }
 
-  get configuring() {
+  _configuring() {
     return {
       insight() {
         statistics.sendSubGenEvent('generator', GENERATOR_GAE);
@@ -756,7 +747,25 @@ module.exports = class extends BaseGenerator {
     };
   }
 
-  get writing() {
+  get configuring() {
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
+  }
+
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.loadDerivedAppConfig();
+      },
+    };
+  }
+
+  get loading() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
+
+  _writing() {
     return {
       copyFiles() {
         if (this.abort) return;
@@ -821,7 +830,12 @@ module.exports = class extends BaseGenerator {
     };
   }
 
-  get end() {
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
+  }
+
+  _end() {
     return {
       productionBuild() {
         if (this.abort) return;
@@ -862,6 +876,11 @@ module.exports = class extends BaseGenerator {
     };
   }
 
+  get end() {
+    if (this.delegateToBlueprint) return {};
+    return this._end();
+  }
+
   _defaultProjectId() {
     if (this.abort) return null;
     if (this.gcpProjectId) {

package/generators/gae/templates/dispatch.yaml.ejs

@@ -24,7 +24,7 @@
 
 dispatch:
   # Default service serves the typical web resources and all static resources.
-  <% for (appConfig of appConfigs) { %>
+<%_ for (appConfig of appConfigs) { _%>
   - url: "*/services/<%= appConfig.baseName %>/*"
     service: <%= appConfig.gaeServiceName %>
-  <% } %>
+<%_ } _%>

package/generators/generator-base-blueprint.js

@@ -32,8 +32,8 @@ const { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, norma
  * The method signatures in public API should not be changed without a major version change
  */
 module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
-  constructor(args, opts, features) {
-    super(args, opts, features);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     if (this.options.help) {
       return;
@@ -49,12 +49,10 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       this.blueprintConfig = this.blueprintStorage.createProxy();
 
       // jhipsterContext is the original generator
-      this.jhipsterContext = opts.jhipsterContext;
+      this.jhipsterContext = this.options.jhipsterContext;
 
-      if (this.jhipsterContext) {
-        // Fallback to the original generator if the file does not exists in the blueprint.
-        this.jhipsterTemplatesFolders.push(this.jhipsterContext.templatePath());
-      }
+      // Fallback to the original generator if the file does not exists in the blueprint.
+      this.jhipsterTemplatesFolders.push(this.jhipsterTemplatePath());
     }
   }
 
@@ -124,6 +122,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
 
   /**
    * @private
+   * @deprecated
    * Execute custom priorities if they are not declared
    * Should be used by jhipster official generators only.
    * @returns {Object} tasks
@@ -167,6 +166,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
 
   /**
    * @private
+   * @deprecated
    * Execute custom priorities if they are not declared
    * Should be used by jhipster official generators only.
    * @returns {Object} tasks
@@ -205,6 +205,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
 
   /**
    * @private
+   * @deprecated
    * Detect if a priority is implemented in the super class but missing in current one.
    * That indicates the blueprint was not updated with the custom priorities.
    * @param {string} priorityName - Priority to be checked.
@@ -225,39 +226,31 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
 
   /**
    * @private
-   * 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
+   * Composes with blueprint generators, if any.
+   * @param {String} subGen - sub generator
+   * @param {Object} extraOptions - extra options to pass to blueprint generator
    */
-  instantiateBlueprints(subGen, extraOptions) {
-    if (this.options.help) {
-      // Ignore blueprint registered options.
-      return false;
-    }
-    let useBlueprints = false;
+  async composeWithBlueprints(subGen, extraOptions) {
+    this.delegateToBlueprint = 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;
-          }
+    const blueprints = this.jhipsterConfig.blueprints || [];
+    for (const blueprint of blueprints) {
+      const blueprintGenerator = await 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.
+          this.delegateToBlueprint = true;
         }
-      });
+      }
     }
-    return useBlueprints;
   }
 
   /**
@@ -322,7 +315,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);
@@ -331,16 +324,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,
@@ -349,7 +343,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;
     }
@@ -419,6 +413,10 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     }
     const mainGeneratorJhipsterVersion = packagejs.version;
     const blueprintJhipsterVersion = blueprintPackageJson.dependencies && blueprintPackageJson.dependencies['generator-jhipster'];
+    if (blueprintJhipsterVersion && !semver.valid(blueprintJhipsterVersion) && !semver.validRange(blueprintJhipsterVersion)) {
+      this.info(`Blueprint ${blueprintPkgName} contains generator-jhipster dependency with non comparable version`);
+      return;
+    }
     if (blueprintJhipsterVersion) {
       if (mainGeneratorJhipsterVersion !== blueprintJhipsterVersion) {
         this.error(

package/generators/generator-base-docker.js

@@ -26,16 +26,14 @@ const statistics = require('./statistics');
 
 const constants = require('./generator-constants');
 
-const { CONSUL, EUREKA } = require('../jdl/jhipster/service-discovery-types');
 const { OptionNames } = require('../jdl/jhipster/application-options');
-const { PROMETHEUS, ELK } = require('../jdl/jhipster/monitoring-types');
 const { Options: DeploymentOptions } = require('../jdl/jhipster/deployment-options');
 
-const { JWT_SECRET_KEY, SERVICE_DISCOVERY_TYPE } = OptionNames;
+const { JWT_SECRET_KEY } = OptionNames;
 
 module.exports = class extends BlueprintBaseGenerator {
-  constructor(args, opts, features) {
-    super(args, opts, features);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     // This adds support for a `--skip-checks` flag
     this.option('skip-checks', {
@@ -146,28 +144,10 @@ module.exports = class extends BlueprintBaseGenerator {
     dest.directoryPath = config.directoryPath;
     dest.gatewayType = config.gatewayType;
     dest.clusteredDbApps = config.clusteredDbApps;
-    dest.monitoring = config.monitoring;
     dest.dockerRepositoryName = config.dockerRepositoryName;
     dest.dockerPushCommand = config.dockerPushCommand;
-    dest.serviceDiscoveryType = config[SERVICE_DISCOVERY_TYPE];
     dest.adminPassword = config.adminPassword;
     dest.jwtSecretKey = config[JWT_SECRET_KEY];
-
-    if (dest.serviceDiscoveryType === undefined) {
-      dest.serviceDiscoveryType = EUREKA;
-    }
-
-    this.loadDerivedDeploymentConfig(config, dest);
-  }
-
-  loadDerivedDeploymentConfig(
-    config = _.defaults({}, this.jhipsterConfig, DeploymentOptions.defaults(this.jhipsterConfig.deploymentType)),
-    dest = this
-  ) {
-    dest.serviceDiscoveryConsul = config.serviceDiscoveryType === CONSUL;
-    dest.serviceDiscoveryEureka = config.serviceDiscoveryType === EUREKA;
-
-    dest.monitoringPrometheus = config.monitoring === PROMETHEUS;
-    dest.monitoringELK = config.monitoring === ELK;
+    this.loadPlatformConfig(config, dest);
   }
 };

package/generators/generator-base-private.js

@@ -26,18 +26,16 @@ const semver = require('semver');
 const exec = require('child_process').exec;
 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');
 
@@ -64,8 +62,6 @@ const databaseTypes = require('../jdl/jhipster/database-types');
 const { MONGODB, NEO4J, COUCHBASE, CASSANDRA, SQL, ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, H2_DISK, H2_MEMORY } = databaseTypes;
 
 const { MAVEN } = require('../jdl/jhipster/build-tool-types');
-const { GATEWAY } = require('../jdl/jhipster/application-types');
-const { SPRING_WEBSOCKET } = require('../jdl/jhipster/websocket-types');
 
 /**
  * This is the Generator base private class.
@@ -76,8 +72,8 @@ const { SPRING_WEBSOCKET } = require('../jdl/jhipster/websocket-types');
  * The method signatures in private API can be changed without a major version change.
  */
 module.exports = class JHipsterBasePrivateGenerator extends Generator {
-  constructor(args, opts, features) {
-    super(args, opts, features);
+  constructor(args, options, features) {
+    super(args, options, features);
     // expose lodash to templates
     this._ = _;
   }
@@ -102,47 +98,6 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     return paths ? super.destinationPath(paths) : paths;
   }
 
-  /**
-   * Install I18N Client Files By Language
-   *
-   * @param {any} _this reference to generator
-   * @param {string} webappDir web app directory
-   * @param {string} lang language code
-   */
-  installI18nClientFilesByLanguage(_this, webappDir, lang) {
-    const generator = _this || this;
-    const prefix = this.fetchFromInstalledJHipster('languages/templates');
-    if (generator.applicationType === GATEWAY && generator.serviceDiscoveryType) {
-      generator.copyI18nFilesByName(generator, webappDir, 'gateway.json', lang);
-    }
-    if (generator.withAdminUi) {
-      generator.copyI18nFilesByName(generator, webappDir, 'configuration.json', lang);
-      generator.copyI18nFilesByName(generator, webappDir, 'logs.json', lang);
-      generator.copyI18nFilesByName(generator, webappDir, 'metrics.json', lang);
-    }
-    generator.copyI18nFilesByName(generator, webappDir, 'error.json', lang);
-    generator.copyI18nFilesByName(generator, webappDir, 'login.json', lang);
-    generator.copyI18nFilesByName(generator, webappDir, 'home.json', lang);
-    generator.copyI18nFilesByName(generator, webappDir, 'password.json', lang);
-    generator.copyI18nFilesByName(generator, webappDir, 'register.json', lang);
-    generator.copyI18nFilesByName(generator, webappDir, 'sessions.json', lang);
-    generator.copyI18nFilesByName(generator, webappDir, 'settings.json', lang);
-    generator.copyI18nFilesByName(generator, webappDir, 'user-management.json', lang);
-
-    // tracker.json for Websocket
-    if (this.websocket === SPRING_WEBSOCKET) {
-      generator.copyI18nFilesByName(generator, webappDir, 'tracker.json', lang);
-    }
-
-    // Templates
-    generator.template(`${prefix}/${webappDir}i18n/${lang}/activate.json.ejs`, `${webappDir}i18n/${lang}/activate.json`);
-    generator.template(`${prefix}/${webappDir}i18n/${lang}/global.json.ejs`, `${webappDir}i18n/${lang}/global.json`);
-    if (generator.withAdminUi) {
-      generator.template(`${prefix}/${webappDir}i18n/${lang}/health.json.ejs`, `${webappDir}i18n/${lang}/health.json`);
-    }
-    generator.template(`${prefix}/${webappDir}i18n/${lang}/reset.json.ejs`, `${webappDir}i18n/${lang}/reset.json`);
-  }
-
   /**
    * Install I18N Server Files By Language
    *
@@ -166,50 +121,6 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     }
   }
 
-  /**
-   * Copy I18N
-   *
-   * @param language
-   * @param prefix
-   */
-  copyI18n(language, prefix = '') {
-    try {
-      const fileName = this.entityTranslationKey;
-      this.template(
-        `${prefix ? `${prefix}/` : ''}i18n/entity_${language}.json.ejs`,
-        `${this.CLIENT_MAIN_SRC_DIR}i18n/${language}/${fileName}.json`
-      );
-      this.addEntityTranslationKey(this.entityTranslationKeyMenu, this.entityClassHumanized || _.startCase(this.entityClass), language);
-    } catch (e) {
-      this.debug('Error:', e);
-      // An exception is thrown if the folder doesn't exist
-      // do nothing
-    }
-  }
-
-  /**
-   * Copy Enum I18N
-   *
-   * @param language
-   * @param enumInfo
-   * @param prefix
-   */
-  copyEnumI18n(language, enumInfo, prefix = '') {
-    try {
-      this.template(
-        `${prefix ? `${prefix}/` : ''}i18n/enum.json.ejs`,
-        `${this.CLIENT_MAIN_SRC_DIR}i18n/${language}/${enumInfo.clientRootFolder}${enumInfo.enumInstance}.json`,
-        this,
-        {},
-        enumInfo
-      );
-    } catch (e) {
-      this.debug('Error:', e);
-      // An exception is thrown if the folder doesn't exist
-      // do nothing
-    }
-  }
-
   /**
    * Update Languages In Language Constant
    *
@@ -516,6 +427,9 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @returns default app name
    */
   getDefaultAppName() {
+    if (this.options.reproducible) {
+      return projectNameReproducibleConfigForTests.baseName;
+    }
     return /^[a-zA-Z0-9_]+$/.test(path.basename(process.cwd())) ? path.basename(process.cwd()) : 'jhipster';
   }
 
@@ -722,7 +636,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
           // if no files in Git from current folder then we assume that this is initial application generation
           this.gitExec('add .', { trace: false }, code => {
             if (code === 0) {
-              this.gitExec(`commit -m "${commitMsg}" -- .`, { trace: false }, code => {
+              this.gitExec(`commit --no-verify -m "${commitMsg}" -- .`, { trace: false }, code => {
                 if (code === 0) {
                   this.log(chalk.green.bold(`Application successfully committed to Git from ${process.cwd()}.`));
                 } else {
@@ -819,10 +733,16 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
       this.debug(`File ${destination} ignored`);
       return Promise.resolved();
     }
-    return jhipsterUtils.renderContent(source, _this, _context, options).then(res => {
-      _this.fs.write(customDestination, res);
-      return customDestination;
-    });
+    return jhipsterUtils
+      .renderContent(source, _this, _context, options)
+      .then(res => {
+        _this.fs.write(customDestination, res);
+        return customDestination;
+      })
+      .catch(error => {
+        this.warning(source);
+        throw error;
+      });
   }
 
   /**
@@ -886,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
+            )}`
           );
         }
       }
@@ -1072,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);
       }
@@ -1223,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);
   }
 
   /**