spring-boot: integrate spring-data generators (#32050)

Author: mshima

.blueprint/github-build-matrix/support/__snapshots__/git-chages.spec.ts.snap

@@ -888,7 +888,7 @@ exports[`git-changes generators/spring-boot/generators/cucumber/index.ts should
 }
 `;
 
-exports[`git-changes generators/spring-boot/generators/jwt/index.ts should match changes snapshot 1`] = `
+exports[`git-changes generators/spring-boot/generators/data-cassandra/index.ts should match changes snapshot 1`] = `
 {
   "angular": false,
   "angularWorkflow": false,
@@ -905,14 +905,14 @@ exports[`git-changes generators/spring-boot/generators/jwt/index.ts should match
   "react": false,
   "reactWorkflow": false,
   "sonarPr": false,
-  "springBootDefaults": true,
+  "springBootDefaults": false,
   "vue": false,
   "vueWorkflow": false,
   "workspaces": false,
 }
 `;
 
-exports[`git-changes generators/spring-boot/generators/oauth2/index.ts should match changes snapshot 1`] = `
+exports[`git-changes generators/spring-boot/generators/data-couchbase/index.ts should match changes snapshot 1`] = `
 {
   "angular": false,
   "angularWorkflow": false,
@@ -936,7 +936,7 @@ exports[`git-changes generators/spring-boot/generators/oauth2/index.ts should ma
 }
 `;
 
-exports[`git-changes generators/spring-boot/generators/websocket/index.ts should match changes snapshot 1`] = `
+exports[`git-changes generators/spring-boot/generators/data-elasticsearch/index.ts should match changes snapshot 1`] = `
 {
   "angular": false,
   "angularWorkflow": false,
@@ -960,7 +960,55 @@ exports[`git-changes generators/spring-boot/generators/websocket/index.ts should
 }
 `;
 
-exports[`git-changes generators/spring-boot/index.ts should match changes snapshot 1`] = `
+exports[`git-changes generators/spring-boot/generators/data-mongodb/index.ts should match changes snapshot 1`] = `
+{
+  "angular": false,
+  "angularWorkflow": false,
+  "base": false,
+  "ci": false,
+  "client": false,
+  "common": false,
+  "devBlueprint": false,
+  "devserverWorkflow": false,
+  "e2e": false,
+  "generateBlueprint": false,
+  "graalvm": false,
+  "java": true,
+  "react": false,
+  "reactWorkflow": false,
+  "sonarPr": false,
+  "springBootDefaults": false,
+  "vue": false,
+  "vueWorkflow": false,
+  "workspaces": false,
+}
+`;
+
+exports[`git-changes generators/spring-boot/generators/data-neo4j/index.ts should match changes snapshot 1`] = `
+{
+  "angular": false,
+  "angularWorkflow": false,
+  "base": false,
+  "ci": false,
+  "client": false,
+  "common": false,
+  "devBlueprint": false,
+  "devserverWorkflow": false,
+  "e2e": false,
+  "generateBlueprint": false,
+  "graalvm": false,
+  "java": true,
+  "react": false,
+  "reactWorkflow": false,
+  "sonarPr": false,
+  "springBootDefaults": false,
+  "vue": false,
+  "vueWorkflow": false,
+  "workspaces": false,
+}
+`;
+
+exports[`git-changes generators/spring-boot/generators/data-relational/index.ts should match changes snapshot 1`] = `
 {
   "angular": false,
   "angularWorkflow": false,
@@ -984,7 +1032,31 @@ exports[`git-changes generators/spring-boot/index.ts should match changes snapsh
 }
 `;
 
-exports[`git-changes generators/spring-cloud/index.ts should match changes snapshot 1`] = `
+exports[`git-changes generators/spring-boot/generators/jwt/index.ts should match changes snapshot 1`] = `
+{
+  "angular": false,
+  "angularWorkflow": false,
+  "base": false,
+  "ci": false,
+  "client": false,
+  "common": false,
+  "devBlueprint": false,
+  "devserverWorkflow": false,
+  "e2e": false,
+  "generateBlueprint": false,
+  "graalvm": false,
+  "java": true,
+  "react": false,
+  "reactWorkflow": false,
+  "sonarPr": false,
+  "springBootDefaults": true,
+  "vue": false,
+  "vueWorkflow": false,
+  "workspaces": false,
+}
+`;
+
+exports[`git-changes generators/spring-boot/generators/oauth2/index.ts should match changes snapshot 1`] = `
 {
   "angular": false,
   "angularWorkflow": false,
@@ -1008,7 +1080,55 @@ exports[`git-changes generators/spring-cloud/index.ts should match changes snaps
 }
 `;
 
-exports[`git-changes generators/spring-data/index.ts should match changes snapshot 1`] = `
+exports[`git-changes generators/spring-boot/generators/websocket/index.ts should match changes snapshot 1`] = `
+{
+  "angular": false,
+  "angularWorkflow": false,
+  "base": false,
+  "ci": false,
+  "client": false,
+  "common": false,
+  "devBlueprint": false,
+  "devserverWorkflow": false,
+  "e2e": false,
+  "generateBlueprint": false,
+  "graalvm": false,
+  "java": true,
+  "react": false,
+  "reactWorkflow": false,
+  "sonarPr": false,
+  "springBootDefaults": false,
+  "vue": false,
+  "vueWorkflow": false,
+  "workspaces": false,
+}
+`;
+
+exports[`git-changes generators/spring-boot/index.ts should match changes snapshot 1`] = `
+{
+  "angular": false,
+  "angularWorkflow": false,
+  "base": false,
+  "ci": false,
+  "client": false,
+  "common": false,
+  "devBlueprint": false,
+  "devserverWorkflow": false,
+  "e2e": false,
+  "generateBlueprint": false,
+  "graalvm": false,
+  "java": true,
+  "react": false,
+  "reactWorkflow": false,
+  "sonarPr": false,
+  "springBootDefaults": true,
+  "vue": false,
+  "vueWorkflow": false,
+  "workspaces": false,
+}
+`;
+
+exports[`git-changes generators/spring-cloud/index.ts should match changes snapshot 1`] = `
 {
   "angular": false,
   "angularWorkflow": false,

.blueprint/github-build-matrix/support/git-changes.ts

@@ -29,7 +29,7 @@ const patterns = {
   springBootDefaults: [
     'generators/spring-boot/*',
     'generators/spring-boot/{resources,templates,generators/bootstrap,generators/jwt}/**',
-    'generators/spring-data/generators/relational/**',
+    'generators/spring-boot/generators/data-relational/**',
     'generators/{java,java-simple-application,liquibase,server}/**',
   ],
   sonarPr: ['.github/actions/sonar/**'],

generators/base-application/generators/bootstrap/generator.ts

@@ -33,8 +33,8 @@ import { mutateData, removeFieldsWithNullishValues } from '../../../../lib/utils
 import { loadDerivedConfig } from '../../../base-core/internal/config-def.ts';
 import { isWin32 } from '../../../base-core/support/index.ts';
 import serverCommand from '../../../server/command.ts';
+import type { Application as SpringDataRelationalApplication } from '../../../spring-boot/generators/data-relational/types.ts';
 import type { Application as SpringBootApplication } from '../../../spring-boot/types.ts';
-import type { Application as SpringDataRelationalApplication } from '../../../spring-data/generators/relational/types.ts';
 import { mutateApplication } from '../../application.ts';
 import { mutateRelationship, mutateRelationshipWithEntity } from '../../entity.ts';
 import BaseApplicationGenerator from '../../index.ts';

generators/base-application/support/prepare-entity.ts

@@ -31,8 +31,8 @@ import type { Application as ClientApplication } from '../../client/types.ts';
 import type { DatabaseProperty } from '../../liquibase/types.ts';
 import { getDatabaseTypeData, hibernateSnakeCase } from '../../server/support/index.ts';
 import type { Entity as ServerEntity } from '../../server/types.ts';
+import type { Application as SpringDataRelationalApplication } from '../../spring-boot/generators/data-relational/types.ts';
 import type { Application as SpringBootApplication } from '../../spring-boot/types.ts';
-import type { Application as SpringDataRelationalApplication } from '../../spring-data/generators/relational/types.ts';
 import { mutateEntity } from '../entity.ts';
 import type {
   Application as BaseApplicationApplication,

generators/base-core/internal/jhipster7-context.ts

@@ -13,8 +13,8 @@ import {
   getSpecificationBuildForType,
   hibernateSnakeCase,
 } from '../../server/support/index.ts';
-import { getDBCExtraOption } from '../../spring-data/generators/relational/support/database-data.ts';
-import { getJdbcUrl, getR2dbcUrl } from '../../spring-data/generators/relational/support/database-url.ts';
+import { getDBCExtraOption } from '../../spring-boot/generators/data-relational/support/database-data.ts';
+import { getJdbcUrl, getR2dbcUrl } from '../../spring-boot/generators/data-relational/support/database-url.ts';
 import type CoreGenerator from '../generator.ts';
 
 const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes;
@@ -33,24 +33,24 @@ type MigrationProperty = Record<
 
 export const jhipster7deprecatedProperties: MigrationProperty = {
   devDatabaseType: {
-    behaviorOnlyReason: 'v8: devDatabaseType is only used in jhipster:spring-data:relational generator',
+    behaviorOnlyReason: 'v8: devDatabaseType is only used in jhipster:spring-boot:data-relational generator',
     get: ({ data }) => {
       if (data.devDatabaseType !== undefined) return data.devDatabaseType;
       const fallbackValue = data.prodDatabaseType ?? data.databaseType;
 
       console.log(
-        `JHipster v8 behavior change(devDatabaseType is only used in jhipster:spring-data:relational generator): devDatabaseType is not set, using fallback: ${fallbackValue}`,
+        `JHipster v8 behavior change(devDatabaseType is only used in jhipster:spring-boot:data-relational generator): devDatabaseType is not set, using fallback: ${fallbackValue}`,
       );
       return fallbackValue;
     },
   },
   prodDatabaseType: {
-    behaviorOnlyReason: 'v8: prodDatabaseType is only used in jhipster:spring-data:relational generator',
+    behaviorOnlyReason: 'v8: prodDatabaseType is only used in jhipster:spring-boot:data-relational generator',
     get: ({ data }) => {
       if (data.prodDatabaseType !== undefined) return data.prodDatabaseType;
 
       console.log(
-        `JHipster v8 behavior change(prodDatabaseType is only used in jhipster:spring-data:relational generator): devDatabaseType is not set, using fallback: ${data.databaseType}`,
+        `JHipster v8 behavior change(prodDatabaseType is only used in jhipster:spring-boot:data-relational generator): devDatabaseType is not set, using fallback: ${data.databaseType}`,
       );
       return data.databaseType;
     },

generators/docker/generator.spec.ts

@@ -29,7 +29,7 @@ import {
   runResult,
 } from '../../lib/testing/index.ts';
 import { shouldSupportFeatures } from '../../test/support/tests.ts';
-import { matchElasticSearchDocker } from '../spring-data/generators/elasticsearch/__test-support/elastic-search-matcher.ts';
+import { matchElasticSearchDocker } from '../spring-boot/generators/data-elasticsearch/__test-support/elastic-search-matcher.ts';
 
 import { matchConsul, matchEureka } from './__test-support/service-discovery-matcher.ts';
 import Generator from './index.ts';

generators/docker/generator.ts

@@ -22,9 +22,9 @@ import { intersection } from 'lodash-es';
 import { stringHashCode } from '../../lib/utils/index.ts';
 import { createFaker } from '../base-application/support/index.ts';
 import BaseApplicationGenerator from '../base-simple-application/index.ts';
+import type { Application as SpringDataRelationalApplication } from '../spring-boot/generators/data-relational/index.ts';
+import { getJdbcUrl, getR2dbcUrl } from '../spring-boot/generators/data-relational/support/index.ts';
 import type { Application as SpringBootApplication } from '../spring-boot/index.ts';
-import type { Application as SpringDataRelationalApplication } from '../spring-data/generators/relational/index.ts';
-import { getJdbcUrl, getR2dbcUrl } from '../spring-data/generators/relational/support/index.ts';
 
 import { SERVICE_COMPLETED_SUCCESSFULLY, SERVICE_HEALTHY } from './constants.ts';
 import { dockerFiles } from './files.ts';