generator-jhipster 7.1.0 → 7.4.0

package/generators/utils.js

@@ -63,6 +63,8 @@ module.exports = {
   vueAddPageProtractorConf,
   languageSnakeCase,
   languageToJavaLanguage,
+  addSectionsCondition,
+  mergeSections,
 };
 
 const databaseTypes = require('../jdl/jhipster/database-types');
@@ -77,9 +79,13 @@ const SQL = databaseTypes.SQL;
 function rewriteFile(args, generator) {
   let fullPath;
   if (args.path) {
-    fullPath = path.join(args.path, args.file);
+    fullPath = generator.destinationPath(path.join(args.path, args.file));
+  } else {
+    fullPath = generator.destinationPath(args.file);
+  }
+  if (!generator.env.sharedFs.existsInMemory(fullPath) && generator.env.sharedFs.existsInMemory(`${fullPath}.jhi`)) {
+    fullPath = `${fullPath}.jhi`;
   }
-  fullPath = generator.destinationPath(args.file);
 
   args.haystack = generator.fs.read(fullPath);
   const body = rewrite(args);
@@ -93,7 +99,10 @@ function rewriteFile(args, generator) {
  * @param {object} generator reference to the generator
  */
 function replaceContent(args, generator) {
-  const fullPath = generator.destinationPath(args.file);
+  let fullPath = generator.destinationPath(args.file);
+  if (!generator.env.sharedFs.existsInMemory(fullPath) && generator.env.sharedFs.existsInMemory(`${fullPath}.jhi`)) {
+    fullPath = `${fullPath}.jhi`;
+  }
 
   const re = args.regex ? new RegExp(args.pattern, 'g') : args.pattern;
 
@@ -480,10 +489,10 @@ function deepFind(obj, path, placeholder) {
  * Convert passed block of string to javadoc formatted string.
  *
  * @param {string} text text to convert to javadoc format
- * @param {number} indentSize indent size
+ * @param {number} indentSize indent size (default 0)
  * @returns javadoc formatted string
  */
-function getJavadoc(text, indentSize) {
+function getJavadoc(text, indentSize = 0) {
   if (!text) {
     text = '';
   }
@@ -513,10 +522,11 @@ function getEnumInfo(field, clientRootFolder) {
   const customValuesState = getCustomValuesState(enums);
   return {
     enumName: fieldType,
+    javadoc: field.fieldTypeJavadoc && getJavadoc(field.fieldTypeJavadoc),
     enumInstance: field.enumInstance,
     enums,
     ...customValuesState,
-    enumValues: getEnums(enums, customValuesState),
+    enumValues: getEnums(enums, customValuesState, field.fieldValuesJavadocs),
     clientRootFolder: clientRootFolder ? `${clientRootFolder}-` : '',
   };
 }
@@ -585,19 +595,28 @@ function getCustomValuesState(enumValues) {
   };
 }
 
-function getEnums(enums, customValuesState) {
+function getEnums(enums, customValuesState, comments) {
   if (customValuesState.withoutCustomValues) {
-    return enums.map(enumValue => ({ name: enumValue, value: enumValue }));
+    return enums.map(enumValue => ({
+      name: enumValue,
+      value: enumValue,
+      comment: comments && comments[enumValue] && getJavadoc(comments[enumValue], 4),
+    }));
   }
   return enums.map(enumValue => {
     if (!doesTheEnumValueHaveACustomValue(enumValue)) {
-      return { name: enumValue.trim(), value: enumValue.trim() };
+      return {
+        name: enumValue.trim(),
+        value: enumValue.trim(),
+        comment: comments && comments[enumValue] && getJavadoc(comments[enumValue], 4),
+      };
     }
     // eslint-disable-next-line no-unused-vars
     const matched = /\s*(.+?)\s*\((.+?)\)/.exec(enumValue);
     return {
       name: matched[1],
       value: matched[2],
+      comment: comments && comments[matched[1]] && getJavadoc(comments[matched[1]], 4),
     };
   });
 }
@@ -657,7 +676,10 @@ function getRandomHex(len = 50) {
  */
 function getBase64Secret(value = '', len = 50) {
   if (this && this.options && this.options.reproducibleTests) {
-    return `SECRET-${value}-${len}`;
+    if (value) {
+      return `SECRET-${value}-${len}`;
+    }
+    return `SECRET--${len}`;
   }
   return Buffer.from(value || getRandomHex(len)).toString('base64');
 }
@@ -772,7 +794,7 @@ function vueReplaceTranslation(generator, files) {
     const regexp = ['v-text', 'v-bind:placeholder', 'v-html', 'v-bind:title', 'v-bind:label', 'v-bind:value', 'v-bind:html']
       .map(s => `${s}="\\$t\\(.*?\\)"`)
       .join(')|(');
-    this.replaceContent(
+    replaceContent(
       {
         file: filePath,
         pattern: new RegExp(` ?(${regexp})`, 'g'),
@@ -875,3 +897,48 @@ function languageToJavaLanguage(language) {
   // Target file : change xx_yyyy_zz to xx_yyyy_ZZ to match java locales
   return langProp.replace(/_[a-z]+$/g, lang => lang.toUpperCase());
 }
+
+/**
+ * @private
+ * Utility function add condition to every block in addition to the already existing condition.
+ */
+function addSectionsCondition(files, commonCondition) {
+  return Object.fromEntries(
+    Object.entries(files).map(([sectionName, sectionValue]) => {
+      sectionValue = sectionValue.map(block => {
+        const { condition } = block;
+        let newCondition = commonCondition;
+        if (typeof condition === 'function') {
+          newCondition = (...args) => {
+            return commonCondition(...args) && condition(...args);
+          };
+        } else if (condition !== undefined) {
+          newCondition = (...args) => commonCondition(...args) && condition;
+        }
+        block = {
+          ...block,
+          condition: newCondition,
+        };
+        return block;
+      });
+      return [sectionName, sectionValue];
+    })
+  );
+}
+
+/**
+ * @private
+ * Utility function to merge sections (jhipster files structure)
+ * Merging { foo: [blocks1], bar: [block2]} and { foo: [blocks3], bar: [block4]}
+ * Results in { foo: [blocks1, block3], bar: [block2, block4]}
+ */
+function mergeSections(...allFiles) {
+  const generated = {};
+  for (const files of allFiles) {
+    for (const [sectionName, sectionValue] of Object.entries(files)) {
+      generated[sectionName] = generated[sectionName] || [];
+      generated[sectionName].push(...sectionValue);
+    }
+  }
+  return generated;
+}

package/generators/workspaces/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/workspaces/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe('blueprint support', () => testBlueprintSupport(generator));
+});

package/generators/workspaces/index.js

@@ -27,8 +27,8 @@ const {
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.option('workspaces', {
       desc: 'Generate workspaces for multiples applications',
@@ -42,13 +42,17 @@ module.exports = class extends BaseBlueprintGenerator {
 
     if (this.options.help) return;
 
-    this.useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('workspaces');
-
     // Generate workspaces file only when option passed or regenerating
     this.generateWorkspaces = this.options.workspaces !== false || !!this.packageJson.get('workspaces');
 
     // When generating workspaces, save to .yo-rc.json. Use a dummy config otherwise.
     this.workspacesConfig = this.generateWorkspaces ? this.jhipsterConfig : {};
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('workspaces');
+    }
 
     this.loadRuntimeOptions();
   }
@@ -89,7 +93,6 @@ module.exports = class extends BaseBlueprintGenerator {
               }
             }
           }
-          // eslint-disable-next-line no-await-in-loop
           dirent = await dir.read();
         }
         dir.closeSync();
@@ -107,7 +110,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    return this.useBlueprints ? undefined : this._configuring();
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
   }
 
   _loading() {
@@ -123,7 +127,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    return this.useBlueprints ? undefined : this._loading();
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
   }
 
   _writing() {
@@ -147,7 +152,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    return this.useBlueprints ? undefined : this._writing();
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
   }
 
   _postWriting() {
@@ -171,7 +177,7 @@ module.exports = class extends BaseBlueprintGenerator {
             'ci:e2e:package': 'npm run ci:docker:build --workspaces --if-present && npm run java:docker --workspaces --if-present',
             'ci:e2e:run': 'npm run e2e:headless --workspaces --if-present',
             ...this._getOtherScripts(),
-            ...this._createConcurrentyScript('watch', 'backend:build-cache'),
+            ...this._createConcurrentlyScript('watch', 'backend:build-cache', 'java:docker', 'java:docker:arm64'),
             ...this._createWorkspacesScript('ci:backend:test', 'ci:frontend:test', 'webapp:test'),
           },
         });
@@ -180,7 +186,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    return this.useBlueprints ? undefined : this._postWriting();
+    if (this.delegateToBlueprint) return {};
+    return this._postWriting();
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -200,7 +207,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get install() {
-    return this.useBlueprints ? undefined : this._install();
+    if (this.delegateToBlueprint) return {};
+    return this._install();
   }
 
   _detectNodePackageManager() {
@@ -230,7 +238,7 @@ module.exports = class extends BaseBlueprintGenerator {
     return {};
   }
 
-  _createConcurrentyScript(...scripts) {
+  _createConcurrentlyScript(...scripts) {
     const scriptsList = scripts
       .map(script => {
         const packageScripts = this.packages.map(packageName => [

package/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js

@@ -62,6 +62,14 @@ function getConvertedFieldsForEntity(jdlEntity, jdlObject) {
     }
     if (jdlObject.hasEnum(jdlField.type)) {
       fieldData.fieldValues = jdlObject.getEnum(fieldData.fieldType).getValuesAsString();
+      const fieldTypeComment = jdlObject.getEnum(fieldData.fieldType).comment;
+      if (fieldTypeComment) {
+        fieldData.fieldTypeJavadoc = fieldTypeComment;
+      }
+      const fieldValuesJavadocs = jdlObject.getEnum(fieldData.fieldType).getValueJavadocs();
+      if (fieldValuesJavadocs && Object.keys(fieldValuesJavadocs).length > 0) {
+        fieldData.fieldValuesJavadocs = fieldValuesJavadocs;
+      }
     }
     if (fieldData.fieldType && isBlobType(fieldData.fieldType)) {
       const blobFieldData = getBlobFieldData(fieldData.fieldType);

package/jdl/converters/json-to-jdl-entity-converter.js

@@ -144,6 +144,7 @@ function addEnumsToJDL(entity) {
         new JDLEnum({
           name: field.fieldType,
           values: getEnumValuesFromString(field.fieldValues),
+          comment: field.fieldTypeJavadoc,
         })
       );
     }

package/jdl/jhipster/application-options.js

@@ -32,6 +32,8 @@ const {
   H2_DISK,
   H2_MEMORY,
 } = require('./database-types');
+const { KAFKA } = require('./message-broker-types');
+const messageBrokerTypes = require('./message-broker-types');
 const databaseTypes = require('./database-types');
 
 const NO_DATABASE = databaseTypes.NO;
@@ -47,6 +49,7 @@ const { ANGULAR_X, ANGULAR, REACT, VUE, SVELTE } = require('./client-framework-t
 const { ELASTICSEARCH } = require('./search-engine-types');
 const searchEngines = require('./search-engine-types');
 
+const NO_MESSAGE_BROKER = messageBrokerTypes.NO;
 const NO_SEARCH_ENGINE = searchEngines.FALSE;
 const COUCHBASE_SEARCH_ENGINE = searchEngines.COUCHBASE;
 
@@ -117,9 +120,12 @@ const optionNames = {
   TEST_FRAMEWORKS: 'testFrameworks',
   WEBSOCKET: 'websocket',
   WITH_ENTITIES: 'withEntities',
+  ENABLE_GRADLE_ENTERPRISE: 'enableGradleEnterprise',
+  GRADLE_ENTERPRISE_HOST: 'gradleEnterpriseHost',
 };
 
 const optionValues = {
+  // TODO refactor it mixes default values (e.g. BaseName=Jhipster) and element list (e.g. application types)
   [optionNames.APPLICATION_TYPE]: {
     [MONOLITH]: MONOLITH,
     [MICROSERVICE]: MICROSERVICE,
@@ -185,8 +191,8 @@ const optionValues = {
   [optionNames.JWT_SECRET_KEY]: '',
   [optionNames.LANGUAGES]: [],
   [optionNames.MESSAGE_BROKER]: {
-    kafka: 'kafka',
-    false: false,
+    kafka: KAFKA,
+    false: NO_MESSAGE_BROKER,
   },
   [optionNames.NPM]: true,
   [optionNames.OTHER_MODULES]: [],
@@ -232,6 +238,8 @@ const optionValues = {
   },
   [optionNames.WITH_ENTITIES]: false,
   [optionNames.WITH_ADMIN_UI]: true,
+  [optionNames.ENABLE_GRADLE_ENTERPRISE]: false,
+  [optionNames.GRADLE_ENTERPRISE_HOST]: '',
 };
 
 const optionTypes = {
@@ -284,9 +292,16 @@ const optionTypes = {
   [optionNames.WEBSOCKET]: { type: ApplicationOptionTypes.STRING },
   [optionNames.WITH_ENTITIES]: { type: ApplicationOptionTypes.BOOLEAN },
   [optionNames.WITH_ADMIN_UI]: { type: ApplicationOptionTypes.BOOLEAN },
+  [optionNames.ENABLE_GRADLE_ENTERPRISE]: { type: ApplicationOptionTypes.BOOLEAN },
+  [optionNames.GRADLE_ENTERPRISE_HOST]: { type: ApplicationOptionTypes.STRING },
 };
 
-const QuotedOptionNames = [optionNames.JHIPSTER_VERSION, optionNames.REMEMBER_ME_KEY, optionNames.JWT_SECRET_KEY];
+const QuotedOptionNames = [
+  optionNames.JHIPSTER_VERSION,
+  optionNames.REMEMBER_ME_KEY,
+  optionNames.JWT_SECRET_KEY,
+  optionNames.GRADLE_ENTERPRISE_HOST,
+];
 
 module.exports = {
   OptionTypes: ApplicationOptionTypes,

package/jdl/jhipster/default-application-options.js

@@ -73,6 +73,8 @@ const {
   TEST_FRAMEWORKS,
   USE_NPM,
   WEBSOCKET,
+  ENABLE_GRADLE_ENTERPRISE,
+  GRADLE_ENTERPRISE_HOST,
 } = OptionNames;
 
 module.exports = {
@@ -167,10 +169,16 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
     [SKIP_USER_MANAGEMENT]: true,
     ...customOptions,
   };
-  delete options[CLIENT_FRAMEWORK];
+  let skipClient = options[SKIP_CLIENT];
+  if (skipClient === undefined) {
+    skipClient = options[CLIENT_FRAMEWORK] === undefined;
+  }
+  if (skipClient) {
+    delete options[CLIENT_FRAMEWORK];
+    delete options[SKIP_SERVER];
+  }
   delete options[CLIENT_THEME];
   delete options[CLIENT_THEME_VARIANT];
-  delete options[SKIP_SERVER];
   delete options[WITH_ADMIN_UI];
   if (typeof options[SKIP_USER_MANAGEMENT] !== 'boolean') {
     options[SKIP_USER_MANAGEMENT] = true;
@@ -184,7 +192,7 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
   return {
     ...options,
     [APPLICATION_TYPE]: MICROSERVICE,
-    [SKIP_CLIENT]: true,
+    [SKIP_CLIENT]: skipClient,
   };
 }
 
@@ -203,14 +211,12 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
     [MESSAGE_BROKER]: OptionValues[MESSAGE_BROKER].false,
     [PROD_DATABASE_TYPE]: POSTGRESQL,
     [SEARCH_ENGINE]: OptionValues[SEARCH_ENGINE].false,
-    [SKIP_CLIENT]: OptionValues[SKIP_CLIENT],
     [TEST_FRAMEWORKS]: [],
     [WEBSOCKET]: OptionValues[WEBSOCKET].false,
+    [ENABLE_GRADLE_ENTERPRISE]: OptionValues[ENABLE_GRADLE_ENTERPRISE],
+    [GRADLE_ENTERPRISE_HOST]: OptionValues[GRADLE_ENTERPRISE_HOST],
     ...customOptions,
   };
-  if (typeof options[SKIP_SERVER] !== 'boolean') {
-    options[SKIP_SERVER] = OptionValues[SKIP_SERVER];
-  }
   if (!options[PACKAGE_NAME] && !options[PACKAGE_FOLDER]) {
     options[PACKAGE_FOLDER] = OptionValues[PACKAGE_FOLDER];
     options[PACKAGE_NAME] = OptionValues[PACKAGE_NAME];

package/jdl/jhipster/deployment-options.js

@@ -16,6 +16,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const { IngressTypes, ServiceTypes } = require('./kubernetes-platform-types');
+const { StorageTypes } = require('./openshift-platform-types');
+const { EUREKA, CONSUL } = require('./service-discovery-types');
+const { PROMETHEUS } = require('./monitoring-types');
+const monitoringTypes = require('./monitoring-types');
+const serviceDiscoveryTypes = require('./service-discovery-types');
+
+const { EPHEMERAL, PERSISTENT } = StorageTypes;
+const { LOAD_BALANCER, NODE_PORT, INGRESS } = ServiceTypes;
+const { NGINX, GKE } = IngressTypes;
+const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
+const NO_MONITORING = monitoringTypes.NO;
+
 const DeploymentTypes = {
   DOCKERCOMPOSE: 'docker-compose',
   KUBERNETES: 'kubernetes',
@@ -26,9 +39,9 @@ const DeploymentTypes = {
 const kubernetesRelatedOptions = {
   kubernetesNamespace: 'default',
   kubernetesServiceType: {
-    loadBalancer: 'LoadBalancer',
-    nodePort: 'NodePort',
-    ingress: 'Ingress',
+    loadBalancer: LOAD_BALANCER,
+    nodePort: NODE_PORT,
+    ingress: INGRESS,
   },
   kubernetesStorageClassName: '',
   kubernetesUseDynamicStorage: {
@@ -37,8 +50,8 @@ const kubernetesRelatedOptions = {
   },
   ingressDomain: '',
   ingressType: {
-    nginx: 'nginx',
-    gke: 'gke',
+    nginx: NGINX,
+    gke: GKE,
   },
   istio: {
     false: false,
@@ -52,8 +65,8 @@ const openshiftRelatedOptions = {
     two: 2,
   },
   storageType: {
-    ephemeral: 'ephemeral',
-    persistent: 'persistent',
+    ephemeral: EPHEMERAL,
+    persistent: PERSISTENT,
   },
 };
 
@@ -68,13 +81,13 @@ const baseOptions = {
   clusteredDbApps: [],
   directoryPath: '../',
   monitoring: {
-    no: 'no',
-    prometheus: 'prometheus',
+    no: NO_MONITORING,
+    prometheus: PROMETHEUS,
   },
   serviceDiscoveryType: {
-    eureka: 'eureka',
-    consul: 'consul',
-    no: 'no',
+    eureka: EUREKA,
+    consul: CONSUL,
+    no: NO_SERVICE_DISCOVERY,
   },
 };
 

package/jdl/jhipster/kubernetes-platform-types.js

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2013-2021 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.
+ */
+
+const ServiceTypes = {
+  LOAD_BALANCER: 'LoadBalancer',
+  INGRESS: 'Ingress',
+  NODE_PORT: 'NodePort',
+};
+
+const IngressTypes = {
+  NGINX: 'nginx',
+  GKE: 'gke',
+};
+
+const GeneratorTypes = {
+  K8S: 'k8s',
+  HELM: 'helm',
+};
+
+module.exports = {
+  GeneratorTypes,
+  IngressTypes,
+  ServiceTypes,
+};

package/jdl/jhipster/message-broker-types.js

@@ -19,6 +19,7 @@
 
 const MessageBrokerTypes = {
   KAFKA: 'kafka',
+  NO: false,
 };
 
 module.exports = MessageBrokerTypes;

package/jdl/jhipster/openapi-options.js

@@ -0,0 +1,21 @@
+const OpenAPIOptionsNames = {
+  REGEN: 'regen',
+  API_CLIENTS: 'new',
+};
+
+const OpenAPIOptionsValues = {
+  REGEN: {
+    YES: true,
+    NO: false,
+  },
+};
+
+const OpenAPIDefaultValues = {
+  REGEN: OpenAPIOptionsValues.REGEN.NO,
+};
+
+module.exports = {
+  OpenAPIOptionsNames,
+  OpenAPIOptionsValues,
+  OpenAPIDefaultValues,
+};

package/jdl/jhipster/openshift-platform-types.js

@@ -0,0 +1,27 @@
+/**
+ * Copyright 2013-2021 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.
+ */
+
+const StorageTypes = {
+  EPHEMERAL: 'ephemeral',
+  PERSISTENT: 'persistent',
+};
+
+module.exports = {
+  StorageTypes,
+};

package/jdl/models/jdl-enum-value.js

@@ -1,10 +1,11 @@
 class JDLEnumValue {
-  constructor(name, value) {
+  constructor(name, value, comment) {
     if (!name) {
       throw new Error('The enum value name has to be passed to create an enum.');
     }
     this.name = name;
     this.value = value;
+    this.comment = comment;
   }
 
   toString() {