From 0b84eff2fda23ffc9111bc1cee7aac968a57f8ef Mon Sep 17 00:00:00 2001 From: dwarakaprasad Date: Sun, 3 Mar 2024 11:26:46 -0500 Subject: [PATCH 1/6] modify spring-data-relational spec to run server generator fixes #25391 --- .../generator/generator.spec.mjs.ejs | 2 +- .../default/.yo-rc.json | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs index 2fce660b257e..b500adff5857 100644 --- a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +++ b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs @@ -20,7 +20,7 @@ import { beforeAll, describe, expect, it } from 'vitest'; import { defaultHelpers as helpers, result } from 'generator-jhipster/testing'; -const SUB_GENERATOR = '<%= subGenerator %>'; +const SUB_GENERATOR = <% if(subGenerator = 'spring-data-relational') { %> 'server' <% } else { %> '<%= subGenerator %>' <% } %>; <%_ if (customGenerator) { _%> const SUB_GENERATOR_NAMESPACE = `jhipster-<%= application.baseName %>:${SUB_GENERATOR}`; <%_ } else { _%> diff --git a/test-integration/generate-blueprint-samples/default/.yo-rc.json b/test-integration/generate-blueprint-samples/default/.yo-rc.json index e999367a2e9d..2e325fffa557 100755 --- a/test-integration/generate-blueprint-samples/default/.yo-rc.json +++ b/test-integration/generate-blueprint-samples/default/.yo-rc.json @@ -128,6 +128,34 @@ ], "sbs": false, "written": true + }, + "spring-data-relational": { + "command": true, + "priorities": [ + "initializing", + "prompting", + "configuring", + "composing", + "loading", + "preparing", + "configuringEachEntity", + "loadingEntities", + "preparingEachEntity", + "preparingEachEntityField", + "preparingEachEntityRelationship", + "postPreparingEachEntity", + "default", + "writing", + "writingEntities", + "postWriting", + "postWritingEntities", + "loadingTranslations", + "install", + "postInstall", + "end" + ], + "sbs": false, + "written": true } }, "jhipsterVersion": "7.5.0", From 79f96ade01513230e45d26047cc3a6a66a9ddf13 Mon Sep 17 00:00:00 2001 From: dwarakaprasad Date: Sun, 3 Mar 2024 11:55:14 -0500 Subject: [PATCH 2/6] modify spring-data-relational spec to run server generator fixes #25391 --- .../templates/generators/generator/generator.spec.mjs.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs index b500adff5857..95253029b92a 100644 --- a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +++ b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs @@ -20,7 +20,7 @@ import { beforeAll, describe, expect, it } from 'vitest'; import { defaultHelpers as helpers, result } from 'generator-jhipster/testing'; -const SUB_GENERATOR = <% if(subGenerator = 'spring-data-relational') { %> 'server' <% } else { %> '<%= subGenerator %>' <% } %>; +const SUB_GENERATOR = <% if(subGenerator === 'spring-data-relational') { %> 'server' <% } else { %> '<%= subGenerator %>' <% } %>; <%_ if (customGenerator) { _%> const SUB_GENERATOR_NAMESPACE = `jhipster-<%= application.baseName %>:${SUB_GENERATOR}`; <%_ } else { _%> From 4bd75d513d3b1b60a3b62dc0e5f9a93040a768ee Mon Sep 17 00:00:00 2001 From: dwarakaprasad Date: Tue, 5 Mar 2024 17:01:37 -0500 Subject: [PATCH 3/6] add spring-boot dependency to spring-data-relational & refactor default priority --- .../templates/generators/generator/generator.spec.mjs.ejs | 2 +- generators/java/generator.ts | 5 +++++ generators/spring-data-relational/generator.ts | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs index 95253029b92a..2fce660b257e 100644 --- a/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +++ b/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs @@ -20,7 +20,7 @@ import { beforeAll, describe, expect, it } from 'vitest'; import { defaultHelpers as helpers, result } from 'generator-jhipster/testing'; -const SUB_GENERATOR = <% if(subGenerator === 'spring-data-relational') { %> 'server' <% } else { %> '<%= subGenerator %>' <% } %>; +const SUB_GENERATOR = '<%= subGenerator %>'; <%_ if (customGenerator) { _%> const SUB_GENERATOR_NAMESPACE = `jhipster-<%= application.baseName %>:${SUB_GENERATOR}`; <%_ } else { _%> diff --git a/generators/java/generator.ts b/generators/java/generator.ts index 321c87327b19..73a65c1f2603 100644 --- a/generators/java/generator.ts +++ b/generators/java/generator.ts @@ -185,6 +185,11 @@ export default class JavaGenerator extends BaseApplicationGenerator (entity as any).entityAbsolutePackage).filter(Boolean)]), + ]; + }, }); } diff --git a/generators/spring-data-relational/generator.ts b/generators/spring-data-relational/generator.ts index 840fa5f2dbec..e86aa753f6fa 100644 --- a/generators/spring-data-relational/generator.ts +++ b/generators/spring-data-relational/generator.ts @@ -18,7 +18,12 @@ */ import BaseApplicationGenerator from '../base-application/index.js'; -import { GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_LIQUIBASE } from '../generator-list.js'; +import { + GENERATOR_SPRING_DATA_RELATIONAL, + GENERATOR_BOOTSTRAP_APPLICATION, + GENERATOR_LIQUIBASE, + GENERATOR_SPRING_BOOT, +} from '../generator-list.js'; import writeTask from './files.js'; import cleanupTask from './cleanup.js'; import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.js'; @@ -46,6 +51,7 @@ export default class SqlGenerator extends BaseApplicationGenerator Date: Tue, 5 Mar 2024 20:28:33 -0500 Subject: [PATCH 4/6] refactor spring-data-relation dependency --- generators/spring-data-relational/command.ts | 2 ++ generators/spring-data-relational/generator.ts | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/generators/spring-data-relational/command.ts b/generators/spring-data-relational/command.ts index 4ae0459bcdad..99806f683422 100644 --- a/generators/spring-data-relational/command.ts +++ b/generators/spring-data-relational/command.ts @@ -17,6 +17,7 @@ * limitations under the License. */ import { JHipsterCommandDefinition } from '../base/api.js'; +import { GENERATOR_SERVER } from '../generator-list.js'; const command: JHipsterCommandDefinition = { options: { @@ -26,6 +27,7 @@ const command: JHipsterCommandDefinition = { scope: 'storage', }, }, + import: [GENERATOR_SERVER], }; export default command; diff --git a/generators/spring-data-relational/generator.ts b/generators/spring-data-relational/generator.ts index e86aa753f6fa..9205db0ccc1e 100644 --- a/generators/spring-data-relational/generator.ts +++ b/generators/spring-data-relational/generator.ts @@ -18,12 +18,7 @@ */ import BaseApplicationGenerator from '../base-application/index.js'; -import { - GENERATOR_SPRING_DATA_RELATIONAL, - GENERATOR_BOOTSTRAP_APPLICATION, - GENERATOR_LIQUIBASE, - GENERATOR_SPRING_BOOT, -} from '../generator-list.js'; +import { GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_LIQUIBASE, GENERATOR_SERVER } from '../generator-list.js'; import writeTask from './files.js'; import cleanupTask from './cleanup.js'; import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.js'; @@ -50,8 +45,7 @@ export default class SqlGenerator extends BaseApplicationGenerator Date: Thu, 7 Mar 2024 11:39:46 -0300 Subject: [PATCH 5/6] Apply suggestions from code review --- generators/spring-data-relational/command.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/generators/spring-data-relational/command.ts b/generators/spring-data-relational/command.ts index 99806f683422..4ae0459bcdad 100644 --- a/generators/spring-data-relational/command.ts +++ b/generators/spring-data-relational/command.ts @@ -17,7 +17,6 @@ * limitations under the License. */ import { JHipsterCommandDefinition } from '../base/api.js'; -import { GENERATOR_SERVER } from '../generator-list.js'; const command: JHipsterCommandDefinition = { options: { @@ -27,7 +26,6 @@ const command: JHipsterCommandDefinition = { scope: 'storage', }, }, - import: [GENERATOR_SERVER], }; export default command; From d747f50354b693fe1e3c32589caee6f5eac228e4 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 7 Mar 2024 11:46:42 -0300 Subject: [PATCH 6/6] drop load domains from server --- generators/server/generator.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/generators/server/generator.js b/generators/server/generator.js index d199b4ada754..4bdfb3573a00 100644 --- a/generators/server/generator.js +++ b/generators/server/generator.js @@ -561,11 +561,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator { ); } }, - loadDomains({ application, entities }) { - application.domains = [ - ...new Set([application.packageName, ...entities.map(entity => entity.entityAbsolutePackage).filter(Boolean)]), - ]; - }, insight({ application }) { statistics.sendSubGenEvent('generator', GENERATOR_SERVER, {