Merge pull request #23402 from mshima/skip_ci-cleanup-jdl

Cleanup jdl
jhipster · Sep 4, 2023 · def79dd · def79dd
2 parents d6f5be3 + 5b48545
commit def79dd
Show file tree

Hide file tree

Showing 13 changed files with 180 additions and 1,711 deletions.
diff --git a/generators/jdl/__snapshots__/generator.spec.mts.snap b/generators/jdl/__snapshots__/generator.spec.mts.snap
@@ -168,8 +168,6 @@ Options:
   --skip-sample-repository                 Disable fetching sample files when the file is not a URL
   --inline <value>                         Pass JDL content inline. Argument can be skipped when passing this
   --skip-user-management                   Skip the user management module during app generation
-  --unidirectional-relationships           Generate unidirectional relationships
-  --force-no-filtering                     Don't filter jdl entities
   --skip-cache                             Do not remember prompt answers (default: false)
   --skip-install                           Do not automatically install dependencies (default: false)
   --force-install                          Fail on install dependencies error (default: false)

diff --git a/generators/jdl/command.mts b/generators/jdl/command.mts
@@ -44,16 +44,6 @@ const command: JHipsterCommandDefinition = {
       type: Boolean,
       scope: 'generator',
     },
-    unidirectionalRelationships: {
-      description: 'Generate unidirectional relationships',
-      type: Boolean,
-      scope: 'generator',
-    },
-    forceNoFiltering: {
-      description: "Don't filter jdl entities",
-      type: Boolean,
-      scope: 'generator',
-    },
   },
   import: [GENERATOR_APP, GENERATOR_WORKSPACES],
 };

diff --git a/generators/jdl/generator.mts b/generators/jdl/generator.mts
@@ -58,7 +58,6 @@ export default class JdlGenerator extends BaseGenerator {
   ignoreApplication?: boolean;
   ignoreDeployments?: boolean;
   skipSampleRepository?: boolean;
-  forceNoFiltering?: boolean;
   force?: boolean;
   reproducible?: boolean;
   createEnvBuilder = EnvironmentBuilder.createDefaultBuilder;
@@ -142,8 +141,6 @@ export default class JdlGenerator extends BaseGenerator {
           databaseType: this.options.db ?? this.existingProject ? this.jhipsterConfigWithDefaults.prodDatabaseType : undefined,
           applicationType: this.options.applicationType,
           skipUserManagement: this.options.skipUserManagement,
-          forceNoFiltering: true,
-          skipFileGeneration: true,
         };
 
         const importer = createImporterFromContent(this.jdlContents.join('\n'), configuration);

diff --git a/generators/liquibase/incremental-liquibase.spec.mts b/generators/liquibase/incremental-liquibase.spec.mts
@@ -207,7 +207,6 @@ describe('generator - app - --incremental-changelog', function () {
     before(async () => {
       const initialState = createImporterFromContent(jdlApplicationWithRelationshipToUser, {
         ...options,
-        skipFileGeneration: true,
         creationTimestampConfig: options.creationTimestamp,
       }).import();
       const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];
@@ -218,7 +217,6 @@ describe('generator - app - --incremental-changelog', function () {
         .withOptions({ ...options, applicationWithEntities })
         .run();
       const state = createImporterFromContent(jdlApplicationWithRelationshipToUser, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -278,7 +276,6 @@ entity Customer {
 `,
         {
           ...options,
-          skipFileGeneration: true,
           creationTimestampConfig: options.creationTimestamp,
         },
       ).import();
@@ -299,7 +296,6 @@ entity Customer {
 }
 `,
         {
-          skipFileGeneration: true,
           ...options,
         },
       ).import();
@@ -363,7 +359,6 @@ entity Customer {
 `,
         {
           ...options,
-          skipFileGeneration: true,
           creationTimestampConfig: options.creationTimestamp,
         },
       ).import();
@@ -384,7 +379,6 @@ entity Customer {
 }
 `,
         {
-          skipFileGeneration: true,
           ...options,
         },
       ).import();
@@ -450,7 +444,6 @@ entity Customer {
 `,
         {
           ...options,
-          skipFileGeneration: true,
           creationTimestampConfig: options.creationTimestamp,
         },
       ).import();
@@ -470,7 +463,6 @@ entity Customer {
 }
 `,
         {
-          skipFileGeneration: true,
           ...options,
         },
       ).import();
@@ -535,7 +527,6 @@ entity Customer {
 `,
         {
           ...options,
-          skipFileGeneration: true,
           creationTimestampConfig: options.creationTimestamp,
         },
       ).import();
@@ -555,7 +546,6 @@ entity Customer {
 }
 `,
         {
-          skipFileGeneration: true,
           ...options,
         },
       ).import();
@@ -612,7 +602,6 @@ entity Customer {
       const baseName = 'JhipsterApp';
       const initialState = createImporterFromContent(jdlApplicationWithEntities, {
         ...options,
-        skipFileGeneration: true,
         creationTimestampConfig: options.creationTimestamp,
       }).import();
       const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];
@@ -624,7 +613,6 @@ entity Customer {
         .run();
 
       const state = createImporterFromContent(jdlApplicationWithEntitiesAndRelationship, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -679,7 +667,6 @@ entity Customer {
       const baseName = 'JhipsterApp';
       const initialState = createImporterFromContent(jdlApplicationWithEntities, {
         ...options,
-        skipFileGeneration: true,
         creationTimestampConfig: options.creationTimestamp,
       }).import();
       const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];
@@ -691,7 +678,6 @@ entity Customer {
         .run();
 
       const state = createImporterFromContent(jdlApplicationWithEntitiesAndRelationshipsWithOnHandlers, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -756,7 +742,6 @@ entity Customer {
       const baseName = 'JhipsterApp';
       const initialState = createImporterFromContent(jdlApplicationWithEntities, {
         ...options,
-        skipFileGeneration: true,
         creationTimestampConfig: options.creationTimestamp,
       }).import();
       const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];
@@ -768,7 +753,6 @@ entity Customer {
         .run();
 
       const state = createImporterFromContent(jdlApplicationWithEntitiesAndRelationshipsWithOnHandlers, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -781,7 +765,6 @@ entity Customer {
         .run();
 
       const thirdState = createImporterFromContent(jdlApplicationWithEntitiesAndRelationshipsWithChangedOnHandlers, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -881,7 +864,6 @@ entity Customer {
       const baseName = 'JhipsterApp';
       const initialState = createImporterFromContent(jdlApplicationWithEntities, {
         ...options,
-        skipFileGeneration: true,
         creationTimestampConfig: options.creationTimestamp,
       }).import();
       const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];
@@ -893,7 +875,6 @@ entity Customer {
         .run();
 
       const state = createImporterFromContent(jdlApplicationWithEntitiesAndRelationshipsWithOnHandlers, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -906,7 +887,6 @@ entity Customer {
         .run();
 
       const thirdState = createImporterFromContent(jdlApplicationWithEntitiesAndRelationshipsWithChangedOnHandlersAndChangedNaming, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -1016,7 +996,6 @@ entity Customer {
       const baseName = 'JhipsterApp';
       const initialState = createImporterFromContent(jdlApplicationWithEntitiesAndRelationshipsWithOnHandlers, {
         ...options,
-        skipFileGeneration: true,
         creationTimestampConfig: options.creationTimestamp,
       }).import();
       const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];
@@ -1079,7 +1058,6 @@ entity Customer {
       const baseName = 'JhipsterApp';
       const initialState = createImporterFromContent(jdlApplicationWithEntitiesAndRelationship, {
         ...options,
-        skipFileGeneration: true,
         creationTimestampConfig: options.creationTimestamp,
       }).import();
       const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];
@@ -1091,7 +1069,6 @@ entity Customer {
         .run();
 
       const state = createImporterFromContent(jdlApplicationWithEntities, {
-        skipFileGeneration: true,
         ...options,
       }).import();
       runResult = await runResult
@@ -1160,7 +1137,6 @@ entity Customer {
           const baseName = 'JhipsterApp';
           const initialState = createImporterFromContent(eachEntityConfig.entity, {
             ...options,
-            skipFileGeneration: true,
             creationTimestampConfig: options.creationTimestamp,
           }).import();
           const applicationWithEntities = initialState.exportedApplicationsWithEntities[baseName];

diff --git a/generators/server/options/database-migration.spec.ts b/generators/server/options/database-migration.spec.ts
@@ -9,9 +9,7 @@ describe(`generators - server - jdl - ${optionName}`, () => {
       let state: ImportState;
 
       before(() => {
-        const importer = createImporterFromContent(`application { config { ${optionName} ${optionValue} } }`, {
-          skipFileGeneration: true,
-        });
+        const importer = createImporterFromContent(`application { config { ${optionName} ${optionValue} } }`);
         state = importer.import();
       });
 
@@ -22,7 +20,7 @@ describe(`generators - server - jdl - ${optionName}`, () => {
   });
   describe('with invalid value', () => {
     it('should set expected value', () => {
-      const importer = createImporterFromContent(`application { config { ${optionName} foo } }`, { skipFileGeneration: true });
+      const importer = createImporterFromContent(`application { config { ${optionName} foo } }`);
       expect(() => importer.import()).toThrow(`Unknown value 'foo' for option '${optionName}'.`);
     });
   });

diff --git a/generators/server/options/message-broker.spec.ts b/generators/server/options/message-broker.spec.ts
@@ -9,9 +9,7 @@ describe('generators - server - jdl - messageBroker', () => {
       let state: ImportState;
 
       before(() => {
-        const importer = createImporterFromContent(`application { config { ${MESSAGE_BROKER} ${optionValue} } }`, {
-          skipFileGeneration: true,
-        });
+        const importer = createImporterFromContent(`application { config { ${MESSAGE_BROKER} ${optionValue} } }`);
         state = importer.import();
       });
 
@@ -22,7 +20,7 @@ describe('generators - server - jdl - messageBroker', () => {
   });
   describe('with invalid value', () => {
     it('should set expected value', () => {
-      const importer = createImporterFromContent(`application { config { ${MESSAGE_BROKER} foo } }`, { skipFileGeneration: true });
+      const importer = createImporterFromContent(`application { config { ${MESSAGE_BROKER} foo } }`);
       expect(() => importer.import()).toThrow(/Unknown value 'foo' for option 'messageBroker'./);
     });
   });