few constant use instead of plainstring

Tcharl · Aug 28, 2024 · 2e5d5f1 · 2e5d5f1
1 parent 0d764fc
commit 2e5d5f1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/generators/bootstrap-application-base/generator.ts b/generators/bootstrap-application-base/generator.ts
@@ -33,6 +33,7 @@ import {
   prepareRelationship,
   stringifyApplicationData,
 } from '../base-application/support/index.js';
+import { applicationTypes, authenticationTypes, databaseTypes } from '../../jdl/jhipster/index.js';
 import { JAVA_DOCKER_DIR } from '../generator-constants.js';
 import { GENERATOR_BOOTSTRAP, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.js';
 import { packageJson } from '../../lib/index.js';
@@ -41,6 +42,9 @@ import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../ap
 import { createAuthorityEntity, createUserEntity, createUserManagementEntity } from './utils.js';
 import { exportJDLTransform, importJDLTransform } from './support/index.js';
 
+const { OAUTH2 } = authenticationTypes;
+const { GATEWAY } = applicationTypes;
+const { NO: NO_DATABASE, CASSANDRA } = databaseTypes;
 const isWin32 = os.platform() === 'win32';
 
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
@@ -178,21 +182,21 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
       syncUserWithIdp({ application, applicationDefaults }) {
         if (!application.backendTypeSpringBoot) return;
 
-        if (application.syncUserWithIdp === undefined && application.authenticationType === 'oauth2') {
+        if (application.syncUserWithIdp === undefined && application.authenticationType === OAUTH2) {
           applicationDefaults({
             __override__: false,
             syncUserWithIdp: data =>
-              data.databaseType !== 'no' && (data.applicationType === 'gateway' || data.anyEntityHasRelationshipWithUser),
+              data.databaseType !== NO_DATABASE && (data.applicationType === GATEWAY || data.anyEntityHasRelationshipWithUser),
           });
-        } else if (application.syncUserWithIdp && application.authenticationType !== 'oauth2') {
+        } else if (application.syncUserWithIdp && application.authenticationType !== OAUTH2) {
           throw new Error('syncUserWithIdp is only supported with oauth2 authenticationType');
         }
       },
       userManagement({ applicationDefaults }) {
         applicationDefaults({
           generateBuiltInUserEntity: ({ generateUserManagement, syncUserWithIdp }) => generateUserManagement || syncUserWithIdp,
           generateBuiltInAuthorityEntity: ({ generateBuiltInUserEntity, databaseType }) =>
-            generateBuiltInUserEntity && databaseType !== 'cassandra',
+            generateBuiltInUserEntity && databaseType !== CASSANDRA,
         });
       },
     });

diff --git a/generators/bootstrap-application/generator.ts b/generators/bootstrap-application/generator.ts
@@ -19,7 +19,7 @@
 import assert from 'assert';
 
 import BaseApplicationGenerator from '../base-application/index.js';
-import { validations } from '../../jdl/jhipster/index.js';
+import { authenticationTypes, databaseTypes, validations } from '../../jdl/jhipster/index.js';
 import {
   derivedPrimaryKeyProperties,
   preparePostEntitiesCommonDerivedProperties,
@@ -31,6 +31,8 @@ import { preparePostEntityServerDerivedProperties } from '../server/support/inde
 import { loadStoredAppOptions } from '../app/support/index.js';
 import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL } from '../generator-constants.js';
 
+const { OAUTH2 } = authenticationTypes;
+const { NO: NO_DATABASE } = databaseTypes;
 const {
   Validations: { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTERN },
   SUPPORTED_VALIDATION_RULES,
@@ -61,7 +63,7 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
   get preparing() {
     return this.asPreparingTaskGroup({
       preparing({ application, applicationDefaults }) {
-        if (application.authenticationType === 'oauth2' || application.databaseType === 'no') {
+        if (application.authenticationType === OAUTH2 || application.databaseType === NO_DATABASE) {
           (application as any).skipUserManagement = true;
         }