cleanup jdl and reduce dependency on jhipster

jdl/__snapshots__/jdl-importer.spec.ts.snap

@@ -670,24 +670,6 @@ exports[`jdl - JDLImporter import when parsing deployment config should export t
       "serviceDiscoveryType": "consul",
     },
   },
-  {
-    "generator-jhipster": {
-      "appsFolders": [
-        "tata",
-        "titi",
-      ],
-      "clusteredDbApps": [],
-      "deploymentType": "openshift",
-      "directoryPath": "../",
-      "dockerPushCommand": "docker push",
-      "dockerRepositoryName": "test",
-      "monitoring": "no",
-      "openshiftNamespace": "default",
-      "registryReplicas": 2,
-      "serviceDiscoveryType": "consul",
-      "storageType": "ephemeral",
-    },
-  },
 ]
 `;
 

jdl/__test-files__/deployments.jdl

@@ -9,8 +9,3 @@ deployment {
   dockerRepositoryName "test"
   kubernetesStorageClassName "KubernetesStorageClassName"
 }
-deployment {
-  deploymentType openshift,
-  appsFolders [tata, titi],
-  dockerRepositoryName "test"
-}

jdl/built-in-options/index.ts

@@ -17,17 +17,5 @@ export {
   /** @deprecated */
   deploymentOptions,
   /** @deprecated */
-  searchEngineTypes,
-  /** @deprecated */
   entityOptions,
-  /** @deprecated */
-  jhipsterOptionTypes,
-  /** @deprecated */
-  jhipsterOptionValues,
-  /** @deprecated */
-  jhipsterQuotedOptionNames,
-  /** @deprecated */
-  clientFrameworkTypes,
-  /** @deprecated */
-  serviceDiscoveryTypes,
 } from '../jhipster/index.js';

jdl/models/jdl-application-definition.spec.ts → jdl/built-in-options/jdl-application-definition.spec.ts

@@ -19,7 +19,7 @@
 
 import { describe, it } from 'esmocha';
 import { expect } from 'chai';
-import { applicationOptions } from '../built-in-options/index.js';
+import { applicationOptions } from '../jhipster/index.js';
 import JDLApplicationDefinition from './jdl-application-definition.js';
 
 const { OptionNames } = applicationOptions;

jdl/models/jdl-application-definition.ts → jdl/built-in-options/jdl-application-definition.ts

@@ -1,4 +1,4 @@
-import { jhipsterOptionTypes, jhipsterOptionValues, jhipsterQuotedOptionNames } from '../built-in-options/index.js';
+import { jhipsterOptionTypes, jhipsterOptionValues, jhipsterQuotedOptionNames } from '../jhipster/index.js';
 
 export type JDLApplicationOptionValue = string | number | boolean | undefined | never[] | Record<string, string>;
 export type JDLApplicationOptionTypeValue = 'string' | 'integer' | 'boolean' | 'list' | 'quotedList';

jdl/converters/jdl-to-json/jdl-to-json-option-converter.ts

@@ -18,18 +18,14 @@
  */
 
 import logger from '../../utils/objects/logger.js';
-import { binaryOptions, entityOptions, searchEngineTypes, unaryOptions } from '../../built-in-options/index.js';
+import { binaryOptions, unaryOptions } from '../../built-in-options/index.js';
 import JDLObject from '../../models/jdl-object.js';
 import JDLApplication from '../../models/jdl-application.js';
 import AbstractJDLOption from '../../models/abstract-jdl-option.js';
 import JDLBinaryOption from '../../models/jdl-binary-option.js';
 
 const { FILTER, NO_FLUENT_METHOD, READ_ONLY, EMBEDDED, SKIP_CLIENT, SKIP_SERVER } = unaryOptions;
 
-const { ServiceTypes } = entityOptions;
-const { NO: NO_SEARCH_ENGINE } = searchEngineTypes;
-
-const NO_SERVICE = ServiceTypes.NO;
 const {
   Options: { ANGULAR_SUFFIX, MICROSERVICE, SEARCH, DTO },
 } = binaryOptions;
@@ -82,7 +78,7 @@ function setOptionsToEachEntityName(jdlOption: AbstractJDLOption): void {
   });
   jdlOption.entityNames.forEach(entityName => {
     const serviceOptionValue = convertedOptionContent.get(entityName).service;
-    if ((!serviceOptionValue || serviceOptionValue === NO_SERVICE) && [DTO, FILTER].includes(jdlOption.name)) {
+    if ((!serviceOptionValue || serviceOptionValue === 'no') && [DTO, FILTER].includes(jdlOption.name)) {
       logger.info(
         `The ${jdlOption.name} option is set for ${entityName}, the '${serviceClassOptionValue}' value for the ` +
           "'service' is gonna be set for this entity if no other value has been set.",
@@ -120,7 +116,7 @@ function getJSONOptionKeyAndValue(jdlOption: AbstractJDLOption): { key: string;
 
 function preventEntitiesFromBeingSearched(entityNames: Set<string>) {
   entityNames.forEach(entityName => {
-    setOptionToEntityName({ optionName: 'searchEngine', optionValue: NO_SEARCH_ENGINE }, entityName);
+    setOptionToEntityName({ optionName: 'searchEngine', optionValue: 'no' }, entityName);
   });
 }
 

jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.spec.ts

@@ -34,7 +34,7 @@ describe('jdl - DeploymentConverter', () => {
       before(() => {
         convertedDeployments = convertDeployments([
           {
-            deploymentType: 'openshift',
+            deploymentType: 'docker-compose',
             appsFolders: ['tata', 'titi'],
             dockerRepositoryName: 'test',
           },
@@ -50,20 +50,17 @@ describe('jdl - DeploymentConverter', () => {
       "titi",
     },
     "clusteredDbApps": Set {},
-    "deploymentType": "openshift",
+    "deploymentType": "docker-compose",
     "directoryPath": "../",
-    "dockerPushCommand": "docker push",
     "dockerRepositoryName": "test",
-    "gatewayType": undefined,
+    "gatewayType": "SpringCloudGateway",
     "ingressDomain": undefined,
     "ingressType": undefined,
     "istio": undefined,
     "kubernetesServiceType": undefined,
     "monitoring": "no",
-    "openshiftNamespace": "default",
-    "registryReplicas": 2,
     "serviceDiscoveryType": "consul",
-    "storageType": "ephemeral",
+    "storageType": undefined,
   },
 ]
 `);

jdl/converters/parsed-jdl-to-jdl-object/option-converter.spec.ts

@@ -18,15 +18,9 @@
  */
 
 import { before, describe, expect, it } from 'esmocha';
-import { binaryOptions, entityOptions, searchEngineTypes, unaryOptions } from '../../built-in-options/index.js';
+import { binaryOptions, unaryOptions } from '../../built-in-options/index.js';
 import { convertOptions } from './option-converter.js';
 
-const { MapperTypes, PaginationTypes } = entityOptions;
-const { COUCHBASE } = searchEngineTypes;
-
-const { MAPSTRUCT } = MapperTypes;
-const { PAGINATION } = PaginationTypes;
-
 describe('jdl - OptionConverter', () => {
   describe('convertOptions', () => {
     describe('when not passing options', () => {
@@ -91,12 +85,12 @@ describe('jdl - OptionConverter', () => {
         before(() => {
           convertedOptions = convertOptions({}, [
             {
-              optionValues: [MAPSTRUCT, COUCHBASE],
+              optionValues: ['mapstruct', 'elasticsearch'],
               list: ['*'],
               excluded: ['B'],
             },
             {
-              optionValues: [PAGINATION],
+              optionValues: ['pagination'],
               list: ['A', 'C'],
               excluded: [],
             },
@@ -123,7 +117,7 @@ describe('jdl - OptionConverter', () => {
       "B",
     },
     "name": "search",
-    "value": "couchbase",
+    "value": "elasticsearch",
   },
   JDLBinaryOption {
     "entityNames": Set {
@@ -144,7 +138,7 @@ describe('jdl - OptionConverter', () => {
         before(() => {
           convertedOptions = convertOptions({}, [
             {
-              optionValues: [MAPSTRUCT],
+              optionValues: ['mapstruct'],
               list: ['*'],
               excluded: ['B'],
             },

jdl/exporters/jdl-exporter.spec.ts

@@ -25,10 +25,9 @@ import { JDLEntity } from '../models/index.js';
 import exportToJDL from '../exporters/jdl-exporter.js';
 import JDLApplication from '../models/jdl-application.js';
 import { JDLJSONApplicationConfiguration } from '../parsing/jdl-parsing-types.js';
-import { applicationOptions, clientFrameworkTypes } from '../built-in-options/index.js';
+import { applicationOptions } from '../built-in-options/index.js';
 import { basicHelpers as helpers } from '../../testing/index.js';
 
-const NO_CLIENT_FRAMEWORK = clientFrameworkTypes.NO;
 const {
   OptionNames: { CLIENT_FRAMEWORK },
 } = applicationOptions;
@@ -104,7 +103,7 @@ describe('jdl - JDLExporter', () => {
             beforeEach(() => {
               jdlObject = new JDLObject();
               const jdlApplication: JDLJSONApplicationConfiguration = {
-                config: { [CLIENT_FRAMEWORK]: NO_CLIENT_FRAMEWORK },
+                config: { [CLIENT_FRAMEWORK]: 'no' },
               };
               jdlObject.addApplication(new JDLApplication(jdlApplication));
             });

jdl/jdl-importer.spec.ts

@@ -357,7 +357,7 @@ relationship OneToOne {
     });
     describe('when parsing deployment config', () => {
       const contents: any[] = [];
-      const DEPLOYMENT_NAMES = ['docker-compose', 'kubernetes', 'openshift'];
+      const DEPLOYMENT_NAMES = ['docker-compose', 'kubernetes'];
 
       before(() => {
         const importer = createImporterFromFiles([path.join(__dirname, '__test-files__', 'deployments.jdl')]);

jdl/jhipster/application-options.ts

@@ -22,7 +22,7 @@ import {
   JDLApplicationOptionType,
   JDLApplicationOptionTypeValue,
   JDLApplicationOptionValue,
-} from '../models/jdl-application-definition.js';
+} from '../built-in-options/jdl-application-definition.js';
 import applicationTypes from './application-types.js';
 import authenticationTypes from './authentication-types.js';
 import databaseTypes from './database-types.js';

jdl/jhipster/deployment-options.spec.ts

@@ -78,22 +78,6 @@ describe('jdl - DeploymentOptions', () => {
           });
         });
       });
-      describe('when passing openshift as arg', () => {
-        it('should return openshift deployment config', () => {
-          expect(Options.defaults('openshift')).to.eql({
-            appsFolders: [],
-            clusteredDbApps: [],
-            directoryPath: '../',
-            dockerPushCommand: 'docker push',
-            dockerRepositoryName: '',
-            monitoring: 'no',
-            serviceDiscoveryType: 'consul',
-            openshiftNamespace: 'default',
-            storageType: 'ephemeral',
-            registryReplicas: 2,
-          });
-        });
-      });
     });
   });
 });

jdl/jhipster/deployment-options.ts

@@ -17,15 +17,12 @@
  * limitations under the License.
  */
 import kubernetesPlatformTypes from './kubernetes-platform-types.js';
-import openshiftPlatformTypes from './openshift-platform-types.js';
 import monitoringTypes from './monitoring-types.js';
 import serviceDiscoveryTypes from './service-discovery-types.js';
 
 const { LOAD_BALANCER, NODE_PORT, INGRESS } = kubernetesPlatformTypes.ServiceTypes;
 const { NGINX, GKE } = kubernetesPlatformTypes.IngressTypes;
 
-const { EPHEMERAL, PERSISTENT } = openshiftPlatformTypes.StorageTypes;
-
 const { EUREKA, CONSUL } = serviceDiscoveryTypes;
 const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 
@@ -35,13 +32,11 @@ const { PROMETHEUS } = monitoringTypes;
 export const DeploymentTypes = {
   DOCKERCOMPOSE: 'docker-compose',
   KUBERNETES: 'kubernetes',
-  OPENSHIFT: 'openshift',
   exists: (deploymentType?: any) => !!deploymentType && !!DeploymentTypes[deploymentType.toUpperCase().replace('-', '')],
 };
 
 export const DOCKERCOMPOSE = DeploymentTypes.DOCKERCOMPOSE;
 export const KUBERNETES = DeploymentTypes.KUBERNETES;
-export const OPENSHIFT = DeploymentTypes.OPENSHIFT;
 
 const kubernetesRelatedOptions = {
   kubernetesNamespace: 'default',
@@ -66,17 +61,6 @@ const kubernetesRelatedOptions = {
   },
 };
 
-const openshiftRelatedOptions = {
-  openshiftNamespace: 'default',
-  registryReplicas: {
-    two: 2,
-  },
-  storageType: {
-    ephemeral: EPHEMERAL,
-    persistent: PERSISTENT,
-  },
-};
-
 const dockerComposeRelatedOptions = {
   gatewayType: {
     springCloudGateway: 'SpringCloudGateway',
@@ -103,13 +87,11 @@ const Options: any = {
   deploymentType: {
     dockerCompose: DeploymentTypes.DOCKERCOMPOSE,
     kubernetes: DeploymentTypes.KUBERNETES,
-    openshift: DeploymentTypes.OPENSHIFT,
   },
   dockerPushCommand: 'docker push',
   dockerRepositoryName: '',
   ...dockerComposeRelatedOptions,
   ...kubernetesRelatedOptions,
-  ...openshiftRelatedOptions,
 };
 
 Options.defaults = (deploymentType = Options.deploymentType.dockerCompose) => {
@@ -150,7 +132,6 @@ Options.defaults = (deploymentType = Options.deploymentType.dockerCompose) => {
     monitoring: Options.monitoring.no,
     dockerRepositoryName: Options.dockerRepositoryName,
     dockerPushCommand: Options.dockerPushCommand,
-    openshiftNamespace: Options.openshiftNamespace,
     storageType: Options.storageType.ephemeral,
     registryReplicas: Options.registryReplicas.two,
   };

jdl/jhipster/index.ts

@@ -15,7 +15,6 @@ export { default as kubernetesPlatformTypes } from './kubernetes-platform-types.
 export { default as messageBrokerTypes } from './message-broker-types.js';
 export { default as monitoringTypes } from './monitoring-types.js';
 export { default as openapiOptions } from './openapi-options.js';
-export { default as openshiftPlatformTypes } from './openshift-platform-types.js';
 export { default as reservedKeywords } from './reserved-keywords.js';
 export { default as searchEngineTypes } from './search-engine-types.js';
 export { default as serviceDiscoveryTypes } from './service-discovery-types.js';

jdl/models/jdl-application-configuration-factory.ts

@@ -18,12 +18,12 @@
  */
 
 import logger from '../utils/objects/logger.js';
+import JDLApplicationDefinition, { JDLApplicationOptionTypeValue } from '../built-in-options/jdl-application-definition.js';
 import JDLApplicationConfiguration from './jdl-application-configuration.js';
 import StringJDLApplicationConfigurationOption from './string-jdl-application-configuration-option.js';
 import IntegerJDLApplicationConfigurationOption from './integer-jdl-application-configuration-option.js';
 import BooleanJDLApplicationConfigurationOption from './boolean-jdl-application-configuration-option.js';
 import ListJDLApplicationConfigurationOption from './list-jdl-application-configuration-option.js';
-import JDLApplicationDefinition, { JDLApplicationOptionTypeValue } from './jdl-application-definition.js';
 import JDLApplicationConfigurationOption from './jdl-application-configuration-option.js';
 
 const applicationDefinition = new JDLApplicationDefinition();

jdl/models/jdl-deployment.ts

@@ -17,14 +17,13 @@
  * limitations under the License.
  */
 import { isEqual } from 'lodash-es';
-import { applicationOptions, deploymentOptions, serviceDiscoveryTypes } from '../built-in-options/index.js';
+import { applicationOptions, deploymentOptions } from '../built-in-options/index.js';
 import { merge } from '../utils/object-utils.js';
 import { join } from '../utils/set-utils.js';
 import { ParsedJDLDeployment } from '../converters/parsed-jdl-to-jdl-object/types.js';
 
 const { Options } = deploymentOptions;
 const arrayTypes = ['appsFolders', 'clusteredDbApps'];
-const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 
 export default class JDLDeployment {
   deploymentType!: string;
@@ -48,7 +47,7 @@ export default class JDLDeployment {
       if (Array.isArray(option) && arrayTypes.includes(key)) {
         this[key] = new Set(option);
       } else if (key === applicationOptions.OptionNames.SERVICE_DISCOVERY_TYPE && option === Options.serviceDiscoveryType.no) {
-        this[key] = NO_SERVICE_DISCOVERY;
+        this[key] = 'no';
       } else {
         this[key] = option;
       }