generator-jhipster 7.8.0 → 7.9.1

package/generators/generate-blueprint/constants.mjs

@@ -25,6 +25,7 @@ const prioritiesForSub = subGenerator => (subGenerator.startsWith('entit') ? ENT
 
 export const GENERATORS = 'generators';
 export const SUB_GENERATORS = 'subGenerators';
+export const ADDITIONAL_SUB_GENERATORS = 'additionalSubGenerators';
 export const DYNAMIC = 'dynamic';
 export const JS = 'js';
 
@@ -43,6 +44,11 @@ export const options = () => ({
     type: Array,
     scope: 'storage',
   },
+  [ADDITIONAL_SUB_GENERATORS]: {
+    desc: 'Comma separated additional sub generators to generate',
+    type: String,
+    scope: 'storage',
+  },
   [DYNAMIC]: {
     desc: 'Genate dynamic generators (advanced)',
     type: Boolean,
@@ -73,6 +79,7 @@ export const defaultConfig = () => ({
   [DYNAMIC]: false,
   [JS]: false,
   [SUB_GENERATORS]: [],
+  [ADDITIONAL_SUB_GENERATORS]: '',
 });
 
 export const defaultSubGeneratorConfig = () => ({
@@ -91,6 +98,7 @@ const allSubGeneratorConfig = subGenerator => ({
 export const allGeneratorsConfig = () => ({
   ...requiredConfig,
   [SUB_GENERATORS]: Object.values(GENERATOR_LIST),
+  [ADDITIONAL_SUB_GENERATORS]: '',
   [DYNAMIC]: false,
   [JS]: false,
   [GENERATORS]: Object.fromEntries(
@@ -110,6 +118,17 @@ export const prompts = () => {
       pageSize: 30,
       loop: false,
     },
+    {
+      type: 'input',
+      name: ADDITIONAL_SUB_GENERATORS,
+      message: 'Comma separated additional sub-generators.',
+      validate: input => {
+        if (input) {
+          return /^([\w,-]*)$/.test(input) ? true : 'Please provide valid generator names';
+        }
+        return true;
+      },
+    },
     {
       type: 'confirm',
       name: 'cli',
@@ -119,11 +138,12 @@ export const prompts = () => {
   ];
 };
 
-export const subGeneratorPrompts = subGenerator => {
+export const subGeneratorPrompts = (subGenerator, additionalSubGenerator) => {
   return [
     {
       type: 'confirm',
       name: SBS,
+      when: !additionalSubGenerator,
       message: `Is ${chalk.yellow(subGenerator)} generator a side-by-side blueprint?`,
       default: true,
     },
@@ -139,7 +159,7 @@ export const subGeneratorPrompts = subGenerator => {
       message: `What task do you want do implement at ${chalk.yellow(subGenerator)} generator?`,
       choices: prioritiesForSub(subGenerator),
       pageSize: 30,
-      default: answers => (answers.sbs ? [] : prioritiesForSub(subGenerator)),
+      default: answers => (answers.sbs || additionalSubGenerator ? [] : prioritiesForSub(subGenerator)),
       loop: false,
     },
   ];

package/generators/generate-blueprint/generator.mjs

@@ -21,6 +21,7 @@ import lodash from 'lodash';
 import { readFile } from 'fs/promises';
 
 import BaseBlueprintGenerator from '../generator-base-blueprint.js';
+import { SKIP_COMMIT_HOOK } from '../init/constants.cjs';
 import {
   PRIORITY_PREFIX,
   INITIALIZING_PRIORITY,
@@ -45,6 +46,7 @@ import {
   GENERATORS,
   PRIORITIES,
   SUB_GENERATORS,
+  ADDITIONAL_SUB_GENERATORS,
   WRITTEN,
 } from './constants.mjs';
 
@@ -73,6 +75,9 @@ export default class extends BaseBlueprintGenerator {
     if (this.options.defaults) {
       this.config.defaults(defaultConfig());
     }
+    this.config.defaults({
+      [SKIP_COMMIT_HOOK]: true,
+    });
   }
 
   /** @inheritdoc */
@@ -120,6 +125,16 @@ export default class extends BaseBlueprintGenerator {
           await this.prompt(subGeneratorPrompts(subGenerator), subGeneratorStorage);
         }
       },
+      async eachAdditionalSubGenerator() {
+        const additionalSubGenerators = this.config.get(ADDITIONAL_SUB_GENERATORS) || '';
+        for (const subGenerator of additionalSubGenerators
+          .split(',')
+          .map(sub => sub.trim())
+          .filter(Boolean)) {
+          const subGeneratorStorage = this.getSubGeneratorStorage(subGenerator);
+          await this.prompt(subGeneratorPrompts(subGenerator, true), subGeneratorStorage);
+        }
+      },
     };
   }
 
@@ -161,7 +176,8 @@ export default class extends BaseBlueprintGenerator {
     return {
       prepareCommands() {
         this.application.commands = [];
-        for (const generator of this.application[SUB_GENERATORS]) {
+        if (!this.application[GENERATORS]) return;
+        for (const generator of Object.keys(this.application[GENERATORS])) {
           const subGeneratorConfig = this.getSubGeneratorStorage(generator).getAll();
           if (subGeneratorConfig.command) {
             this.application.commands.push(generator);
@@ -184,8 +200,10 @@ export default class extends BaseBlueprintGenerator {
           sections: files,
           context: this.application,
         });
-        // function to use directly template
-        for (const generator of this.jhipsterConfig[SUB_GENERATORS] || []) {
+      },
+      async writingGenerators() {
+        if (!this.application[GENERATORS]) return;
+        for (const generator of Object.keys(this.application[GENERATORS])) {
           const subGeneratorStorage = this.getSubGeneratorStorage(generator);
           const subGeneratorConfig = subGeneratorStorage.getAll();
           const priorities = (subGeneratorConfig[PRIORITIES] || []).map(priority => ({
@@ -199,6 +217,7 @@ export default class extends BaseBlueprintGenerator {
             ...defaultSubGeneratorConfig(),
             ...subGeneratorConfig,
             generator,
+            customGenerator,
             jhipsterGenerator,
             subGenerator: generator,
             generatorClass: upperFirst(camelCase(jhipsterGenerator)),
@@ -234,8 +253,8 @@ export default class extends BaseBlueprintGenerator {
             lint: 'eslint .',
             'lint-fix': 'npm run ejslint && npm run lint -- --fix',
             mocha: 'mocha generators --no-insight --forbid-only',
-            'prettier-format': 'prettier --write "{,**/}*.{js,cjs,mjs,json,md,yml}"',
-            pretest: 'npm run lint',
+            'prettier-format': 'prettier --write "{,**/}*.{md,json,yml,html,js,cjs,mjs,ts,tsx,css,scss,vue,java}"',
+            pretest: 'npm run prettier-check && npm run lint',
             test: 'npm run mocha --',
             'update-snapshot': 'npm run mocha -- --no-parallel --updateSnapshot',
           },
@@ -331,7 +350,7 @@ To begin to work:
 - launch: ${chalk.yellow.bold('npm install')}
 - link: ${chalk.yellow.bold('npm link')}
 - link JHipster: ${chalk.yellow.bold('npm link generator-jhipster')}
-- test your module in a JHipster project: 
+- test your module in a JHipster project:
     - create a new directory and go into it
     - link the blueprint: ${chalk.yellow.bold(`npm link generator-jhipster-${this.moduleName}`)}
     - launch JHipster with flags: ${chalk.yellow.bold(`jhipster --blueprints ${this.moduleName}`)}

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

@@ -18,15 +18,17 @@
 -%>
 name: Generator
 on: [push, pull_request]
+permissions:
+  contents: read
 jobs:
   <%= baseName %>:
     name: npm-test
     runs-on: ubuntu-20.04
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 16
       - run: npm ci
       - run: npm run test

package/generators/generate-blueprint/templates/cli/commands.cjs.ejs

@@ -19,7 +19,8 @@
 module.exports = {
 <% for (const command of commands) { %>
   '<%= command %>': {
-    desc: 'Run <%= command %>',
+    desc: 'Run <%= command %> sub-generator (<%= baseName %> blueprint)',
+    blueprint: 'generator-jhipster-<%= baseName %>',
   },
 <% } %>
 };

package/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs

@@ -35,7 +35,6 @@ import {
 } from 'generator-jhipster/esm/priorities';
 <%_ } _%>
 
-
 <%_ if (application.dynamic) { _%>
 // eslint-disable-next-line import/prefer-default-export
 export async function createGenerator(env) {
@@ -57,13 +56,15 @@ export default class extends <%= generatorClass %>Generator {
     super(args, opts, { taskPrefix: PRIORITY_PREFIX, ...features });
 
     if (this.options.help) return;
+<%_ if (!customGenerator) { _%>
 
     if (!this.options.jhipsterContext) {
       throw new Error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints <%= application.baseName %>')}`);
     }
-<%_ if (sbs) { _%>
+  <%_ if (sbs) { _%>
 
     this.sbsBlueprint = true
+  <%_ } _%>
 <%_ } _%>
   }
 
@@ -73,6 +74,9 @@ export default class extends <%= generatorClass %>Generator {
 
   get [<%= priority.constant %>]() {
     return {
+  <%_ if (!sbs) { _%>
+      ...super._<%= priority.name %>(),
+  <%_ } _%>
       async <%= priority.name %>TemplateTask() {
   <%_ if (priority.name == 'writing') { %>
         await this.writeFiles({
@@ -85,9 +89,6 @@ export default class extends <%= generatorClass %>Generator {
         });
   <%_ } %>
       },
-  <%_ if (!sbs) { _%>
-      ...super._<%= priority.name %>(),
-  <%_ } _%>
     };
   }
 <& } -&>

package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs

@@ -20,16 +20,25 @@ import expect from 'expect';
 
 import { helpers, lookups } from '#test-utils';
 
+const SUB_GENERATOR = '<%= subGenerator %>';
+<%_ if (customGenerator) { _%>
+const SUB_GENERATOR_NAMESPACE = `jhipster-<%= application.baseName %>:${SUB_GENERATOR}`;
+<%_ } else { _%>
+const BLUEPRINT_NAMESPACE = `jhipster:${SUB_GENERATOR}`;
+<%_ } _%>
+
 describe('SubGenerator <%= subGenerator %> of <%= application.baseName %> JHipster blueprint', () => {
   describe('run', () => {
     let result;
     before(async function() {
       result = await helpers
-        .create('jhipster:<%= subGenerator %>')
+        .create(<%= customGenerator ? 'SUB_GENERATOR_NAMESPACE' : 'BLUEPRINT_NAMESPACE' %>)
         .withOptions({
           reproducible: true,
           defaults: true,
+<%_ if (!customGenerator) { _%>
           blueprint: '<%= application.baseName %>',
+<%_ } _%>
         })
         .withLookups(lookups)
         .run();

package/generators/generator-base-blueprint.js

@@ -383,6 +383,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
   _isPriorityMissing(priorityName, destPriority = 'related') {
     const ownPrototype = Object.getPrototypeOf(this);
     const parentPrototype = Object.getPrototypeOf(ownPrototype);
+    priorityName = `${this.features.taskPrefix || ''}${priorityName}`;
     if (
       parentPrototype !== JHipsterBaseBlueprintGenerator.prototype &&
       !Object.getOwnPropertyDescriptor(ownPrototype, priorityName) &&
@@ -482,7 +483,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
    * Compose external blueprint module
    * @param {string} blueprint - name of the blueprint
    * @param {string} subGen - sub generator
-   * @param {any} options - options to pass to blueprint generator
+   * @param {any} [extraOptions] - options to pass to blueprint generator
    * @return {Generator|undefined}
    */
   async _composeBlueprint(blueprint, subGen, extraOptions = {}) {
@@ -534,7 +535,11 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       this.warning(`Could not retrieve packagePath of blueprint '${blueprintPkgName}'`);
       return undefined;
     }
-    return JSON.parse(fs.readFileSync(path.join(blueprintPackagePath, 'package.json')));
+    const packageJsonFile = path.join(blueprintPackagePath, 'package.json');
+    if (!fs.existsSync(packageJsonFile)) {
+      return undefined;
+    }
+    return JSON.parse(fs.readFileSync(packageJsonFile));
   }
 
   /**
@@ -561,13 +566,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     if (blueprint === 'generator-jhipster') {
       this.error(`You cannot use ${chalk.yellow(blueprint)} as the blueprint.`);
     }
-    if (!this._findBlueprintPackageJson(blueprint)) {
-      this.error(
-        `The ${chalk.yellow(blueprint)} blueprint provided is not installed. Please install it using command ${chalk.yellow(
-          `npm i -g ${blueprint}`
-        )}.`
-      );
-    }
+    this._findBlueprintPackageJson(blueprint);
   }
 
   /**
@@ -583,19 +582,19 @@ 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(
-          `The installed ${chalk.yellow(
-            blueprintPkgName
-          )} blueprint targets JHipster v${blueprintJhipsterVersion} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`
-        );
+      if (!semver.valid(blueprintJhipsterVersion) && !semver.validRange(blueprintJhipsterVersion)) {
+        this.info(`Blueprint ${blueprintPkgName} contains generator-jhipster dependency with non comparable version`);
+        return;
       }
-      return;
+      if (semver.satisfies(mainGeneratorJhipsterVersion, blueprintJhipsterVersion)) {
+        return;
+      }
+      throw new Error(
+        `The installed ${chalk.yellow(
+          blueprintPkgName
+        )} blueprint targets JHipster v${blueprintJhipsterVersion} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`
+      );
     }
     const blueprintPeerJhipsterVersion =
       blueprintPackageJson.peerDependencies && blueprintPackageJson.peerDependencies['generator-jhipster'];

package/generators/generator-base-private.js

@@ -34,6 +34,8 @@ 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 { fieldIsEnum } = require('../utils/field');
+const { databaseData } = require('./sql-constants');
 
 const { ANGULAR, REACT, VUE } = SUPPORTED_CLIENT_FRAMEWORKS;
 const dbTypes = require('../jdl/jhipster/field-types');
@@ -104,6 +106,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @param {any} _this - reference to generator
    * @param {string} resourceDir - resource directory
    * @param {string} lang - language code
+   * @param {string} testResourceDir - test resource directory
    */
   installI18nServerFilesByLanguage(_this, resourceDir, lang, testResourceDir) {
     const generator = _this || this;
@@ -196,6 +199,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * Update Languages In MailServiceIT
    *
    * @param languages
+   * @param packageFolder
    */
   updateLanguagesInLanguageMailServiceIT(languages, packageFolder) {
     const fullPath = `${SERVER_TEST_SRC_DIR}${packageFolder}/service/MailServiceIT.java`;
@@ -431,7 +435,9 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     if (this.options.reproducible) {
       return projectNameReproducibleConfigForTests.baseName;
     }
-    return /^[a-zA-Z0-9_]+$/.test(path.basename(process.cwd())) ? path.basename(process.cwd()) : 'jhipster';
+    return /^[a-zA-Z0-9_-]+$/.test(path.basename(process.cwd()))
+      ? path.basename(process.cwd()).replace('generator-jhipster-', '')
+      : 'jhipster';
   }
 
   /**
@@ -545,10 +551,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @returns {boolean} true if input is number; false otherwise
    */
   isNumber(input) {
-    if (isNaN(this.filterNumber(input))) {
-      return false;
-    }
-    return true;
+    return !isNaN(this.filterNumber(input));
   }
 
   /**
@@ -556,10 +559,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @returns {boolean} true if input is a signed number; false otherwise
    */
   isSignedNumber(input) {
-    if (isNaN(this.filterNumber(input, true))) {
-      return false;
-    }
-    return true;
+    return !isNaN(this.filterNumber(input, true));
   }
 
   /**
@@ -567,10 +567,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @returns {boolean} true if input is a signed decimal number; false otherwise
    */
   isSignedDecimalNumber(input) {
-    if (isNaN(this.filterNumber(input, true, true))) {
-      return false;
-    }
-    return true;
+    return !isNaN(this.filterNumber(input, true, true));
   }
 
   /**
@@ -850,6 +847,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * Generate Entity Client Field Default Values
    *
    * @param {Array|Object} fields - array of fields
+   * @param [clientFramework]
    * @returns {Array} defaultVariablesValues
    */
   generateEntityClientFieldDefaultValues(fields, clientFramework = ANGULAR) {
@@ -871,7 +869,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
   /**
    * Find key type for Typescript
    *
-   * @param {string} primaryKey - primary key definition
+   * @param {string | object} primaryKey - primary key definition
    * @returns {string} primary key type in Typescript
    */
   getTypescriptKeyType(primaryKey) {
@@ -884,6 +882,28 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     return 'string';
   }
 
+  /**
+   * Find type for Typescript
+   *
+   * @param {string} fieldType - field type
+   * @returns {string} field type in Typescript
+   */
+  getTypescriptType(fieldType) {
+    if ([TYPE_INTEGER, TYPE_LONG, TYPE_FLOAT, TYPE_DOUBLE, TYPE_BIG_DECIMAL].includes(fieldType)) {
+      return 'number';
+    }
+    if ([TYPE_LOCAL_DATE, TYPE_ZONED_DATE_TIME, TYPE_INSTANT].includes(fieldType)) {
+      return 'dayjs.Dayjs';
+    }
+    if ([TYPE_BOOLEAN].includes(fieldType)) {
+      return 'boolean';
+    }
+    if (fieldIsEnum(fieldType)) {
+      return fieldType;
+    }
+    return 'string';
+  }
+
   /**
    * Generate Entity Client Field Declarations
    *
@@ -891,6 +911,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @param {Array|Object} fields - array of fields
    * @param {Array|Object} relationships - array of relationships
    * @param {string} dto - dto
+   * @param [customDateType]
    * @param {boolean} embedded - either the actual entity is embedded or not
    * @returns variablesWithTypes: Array
    */
@@ -985,13 +1006,13 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     const typeImports = new Map();
     const uniqueEnums = {};
     fields.forEach(field => {
-      const fileName = _.kebabCase(field.fieldType);
-      if (field.fieldIsEnum && (!uniqueEnums[field.fieldType] || (uniqueEnums[field.fieldType] && field.fieldValues.length !== 0))) {
-        const importType = `${field.fieldType}`;
+      const { enumFileName, fieldType } = field;
+      if (field.fieldIsEnum && (!uniqueEnums[fieldType] || (uniqueEnums[fieldType] && field.fieldValues.length !== 0))) {
+        const importType = `${fieldType}`;
         const basePath = clientFramework === VUE ? '@' : 'app';
         const modelPath = clientFramework === ANGULAR ? 'entities' : 'shared/model';
-        const importPath = `${basePath}/${modelPath}/enumerations/${fileName}.model`;
-        uniqueEnums[field.fieldType] = field.fieldType;
+        const importPath = `${basePath}/${modelPath}/enumerations/${enumFileName}.model`;
+        uniqueEnums[fieldType] = field.fieldType;
         typeImports.set(importType, importPath);
       }
     });
@@ -1044,6 +1065,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
   /**
    * Generate language objects in array of "'en': { name: 'English' }" format
    * @param {string[]} languages
+   * @param clientFramework
    * @returns generated language options
    */
   generateLanguageOptions(languages, clientFramework) {
@@ -1149,10 +1171,48 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     );
   }
 
+  /**
+   * Generate a test entity, according to the references
+   *
+   * @param references
+   * @param additionalFields
+   * @return {String} test sample
+   */
+  generateTypescriptTestEntity(references, additionalFields = {}) {
+    const entries = references
+      .map(reference => {
+        if (reference.field) {
+          const field = reference.field;
+          const { fieldIsEnum, fieldType, fieldTypeTimed, fieldTypeLocalDate, fieldWithContentType, fieldName, contentTypeFieldName } =
+            field;
+
+          const fakeData = field.generateFakeData('ts');
+          if (fieldWithContentType) {
+            return [
+              [fieldName, fakeData],
+              [contentTypeFieldName, "'unknown'"],
+            ];
+          }
+          if (fieldIsEnum) {
+            return [[fieldName, `${fieldType}[${fakeData}]`]];
+          }
+          if (fieldTypeTimed || fieldTypeLocalDate) {
+            return [[fieldName, `dayjs(${fakeData})`]];
+          }
+          return [[fieldName, fakeData]];
+        }
+        return [[reference.name, this.generateTestEntityId(reference.type, 'random', false)]];
+      })
+      .flat();
+    return `{
+  ${[...entries, ...Object.entries(additionalFields)].map(([key, value]) => `${key}: ${value}`).join(',\n  ')}
+}`;
+  }
+
   /**
    * Generate a test entity, according to the type
    *
-   * @param {any} primaryKey - primary key definition.
+   * @param references
    * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
    */
   generateTestEntity(references, index = 'random') {
@@ -1205,62 +1265,54 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     if (!protocol) {
       throw new Error('protocol is required');
     }
-    if (!options.databaseName) {
+    const { databaseName } = options;
+    if (!databaseName) {
       throw new Error("option 'databaseName' is required");
     }
     if ([MYSQL, MARIADB, POSTGRESQL, ORACLE, MSSQL].includes(databaseType) && !options.hostname) {
       throw new Error(`option 'hostname' is required for ${databaseType} databaseType`);
+    } else if (![MYSQL, MARIADB, POSTGRESQL, ORACLE, MSSQL, H2_DISK, H2_MEMORY].includes(databaseType)) {
+      throw new Error(`${databaseType} databaseType is not supported`);
     }
-    let dbcUrl;
-    let extraOptions;
-    if (databaseType === MYSQL) {
-      dbcUrl = `${protocol}:mysql://${options.hostname}:3306/${options.databaseName}`;
-      extraOptions =
-        '?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true';
-    } else if (databaseType === MARIADB) {
-      dbcUrl = `${protocol}:mariadb://${options.hostname}:3306/${options.databaseName}`;
-      extraOptions = '?useLegacyDatetimeCode=false&serverTimezone=UTC';
-    } else if (databaseType === POSTGRESQL) {
-      dbcUrl = `${protocol}:postgresql://${options.hostname}:5432/${options.databaseName}`;
-    } else if (databaseType === ORACLE) {
-      dbcUrl = `${protocol}:oracle:thin:@${options.hostname}:1521:${options.databaseName}`;
-    } else if (databaseType === MSSQL) {
-      if (protocol === 'r2dbc') {
-        dbcUrl = `${protocol}:mssql://${options.hostname}:1433/${options.databaseName}`;
-      } else {
-        dbcUrl = `${protocol}:sqlserver://${options.hostname}:1433;database=${options.databaseName}`;
-      }
-    } else if (databaseType === H2_DISK) {
-      if (!options.localDirectory) {
-        throw new Error(`'localDirectory' option should be provided for ${databaseType} databaseType`);
-      }
-      if (protocol === 'r2dbc') {
-        dbcUrl = `${protocol}:h2:file://${options.localDirectory}/${options.databaseName}`;
-      } else {
-        dbcUrl = `${protocol}:h2:file:${options.localDirectory}/${options.databaseName}`;
-      }
-      extraOptions = ';DB_CLOSE_DELAY=-1';
-    } else if (databaseType === H2_MEMORY) {
-      if (protocol === 'r2dbc') {
-        dbcUrl = `${protocol}:h2:mem:///${options.databaseName}`;
-      } else {
-        dbcUrl = `${protocol}:h2:mem:${options.databaseName}`;
-      }
-      extraOptions = ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE';
+    let databaseDataForType = databaseData[databaseType];
+    if (databaseDataForType[protocol]) {
+      databaseDataForType = {
+        ...databaseDataForType,
+        ...databaseDataForType[protocol],
+      };
+    }
+    const { protocolSuffix = '', extraOptions = '', useDirectory = false } = databaseDataForType;
+    let { port = '' } = databaseDataForType;
+    if (useDirectory && !options.localDirectory) {
+      throw new Error(`'localDirectory' option should be provided for ${databaseType} databaseType`);
+    }
+    const databaseHasHost = options.hostname;
+    if (options.itests && H2_MEMORY === databaseType) {
+      port = ':12344';
+    }
+    let url = `${protocol}:${protocolSuffix}`;
+    if (options.localDirectory) {
+      url += `${options.localDirectory}/`;
     } else {
-      throw new Error(`${databaseType} databaseType is not supported`);
+      url += databaseHasHost ? options.hostname : databaseName;
+      url += port;
     }
-
-    if (!options.skipExtraOptions && extraOptions) {
-      dbcUrl += extraOptions;
+    if (databaseHasHost || options.localDirectory) {
+      url += databaseName;
     }
-    return dbcUrl;
+    return `${url}${options.skipExtraOptions ? '' : extraOptions}`;
+  }
+
+  getDBCExtraOption(databaseType) {
+    const databaseDataForType = databaseData[databaseType];
+    const { extraOptions = '' } = databaseDataForType;
+    return extraOptions;
   }
 
   /**
    * Returns the primary key value based on the primary key type, DB and default value
    *
-   * @param {string} primaryKeyType - the primary key type
+   * @param {string} primaryKey - the primary key type
    * @param {string} databaseType - the database type
    * @param {string} defaultValue - default value
    * @returns {string} java primary key value
@@ -1550,7 +1602,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * Create a angular form path getter method of reference.
    *
    * @param {object} reference
-   * @param {string[]} valueDefinition
+   * @param {string[]} prefix
    * @return {string}
    */
   buildAngularFormPath(reference, prefix = []) {