spring-boot: migrate elasticsearch to Spring Boot 4 (#31849)

Author: mshima

generators/base-workspaces/internal/docker-dependencies.ts

@@ -19,7 +19,8 @@
 import { mutateData } from '../../../lib/utils/object.ts';
 import type BaseCoreGenerator from '../../base-core/generator.ts';
 import { getDockerfileContainers } from '../../docker/utils.ts';
-import springBootDependencies from '../../spring-boot/resources/spring-boot-dependencies.ts';
+import springBoot4Dependencies from '../../spring-boot/resources/spring-boot-dependencies-4.ts';
+import springBoot3Dependencies from '../../spring-boot/resources/spring-boot-dependencies.ts';
 
 const ELASTICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
 
@@ -29,15 +30,23 @@ export function loadDockerDependenciesTask<const G extends BaseCoreGenerator>(
 ) {
   context.dockerContainers ??= {};
   const dockerfile = this.readTemplate(this.fetchFromInstalledJHipster('server/resources/Dockerfile')) as string;
-  const elasticsearchClientVersion = springBootDependencies.properties['elasticsearch-client.version'];
+  mutateData(context.dockerContainers, this.prepareDependencies(getDockerfileContainers(dockerfile), 'docker'));
+}
+
+export function loadDockerElasticsearchVersion<const G extends BaseCoreGenerator>(
+  this: G,
+  { springBoot4, dockerContainers }: { springBoot4?: boolean; dockerContainers: Record<string, string> },
+) {
+  const elasticsearchClientVersion = (springBoot4 ? springBoot4Dependencies : springBoot3Dependencies).properties[
+    'elasticsearch-client.version'
+  ];
   mutateData(
-    context.dockerContainers,
+    dockerContainers,
     this.prepareDependencies(
       {
         elasticsearchTag: elasticsearchClientVersion,
         elasticsearchImage: ELASTICSEARCH_IMAGE,
         elasticsearch: `${ELASTICSEARCH_IMAGE}:${elasticsearchClientVersion}`,
-        ...getDockerfileContainers(dockerfile),
       },
       'docker',
     ),

generators/ci-cd/__snapshots__/generator.spec.ts.snap

@@ -148,6 +148,7 @@ exports[`generator - ci-cd cli with multiples values should match context snapsh
   ],
   "dtoSuffix": "DTO",
   "dynamic": undefined,
+  "emptyOrReactive": "",
   "enableGradleDevelocity": undefined,
   "enableHibernateCache": true,
   "enableI18nRTL": false,

generators/docker-compose/generator.ts

@@ -39,7 +39,7 @@ import {
   askForMonitoring,
   askForServiceDiscoveryWorkspace,
 } from '../base-workspaces/internal/docker-prompts.ts';
-import { loadDockerDependenciesTask } from '../base-workspaces/internal/index.ts';
+import { loadDockerDependenciesTask, loadDockerElasticsearchVersion } from '../base-workspaces/internal/index.ts';
 import { askForDirectoryPath } from '../base-workspaces/prompts.ts';
 
 import cleanupOldFilesTask from './cleanup.ts';
@@ -134,10 +134,14 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator<Base
 
   get loadingWorkspaces() {
     return this.asLoadingWorkspacesTaskGroup({
-      loadBaseDeployment({ deployment }) {
+      loadBaseDeployment({ deployment, applications }) {
         deployment.jwtSecretKey = this.jhipsterConfig.jwtSecretKey;
 
         loadDockerDependenciesTask.call(this, { context: deployment });
+        loadDockerElasticsearchVersion.call(this, {
+          springBoot4: applications.some(app => app.springBoot4),
+          dockerContainers: deployment.dockerContainers!,
+        });
       },
     });
   }

generators/heroku/__snapshots__/heroku.spec.ts.snap

@@ -1446,7 +1446,7 @@ exports[`generator - Heroku monolith application with elasticsearch should match
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
                         </configuration>

generators/java-simple-application/__snapshots__/application.spec.ts.snap

@@ -4,6 +4,7 @@ exports[`application mutation test expects mutateApplication to match snapshot 1
 {
   "addOpenapiGeneratorPlugin": true,
   "domains": [],
+  "emptyOrReactive": "",
   "entityPackages": [],
   "graalvmReachabilityMetadata": Any<String>,
   "imperativeOrReactive": "imperative",

generators/java-simple-application/application.ts

@@ -70,6 +70,7 @@ export type JavaSimpleApplicationAddedApplicationProperties = {
   addOpenapiGeneratorPlugin: boolean;
   graalvmReachabilityMetadata: string;
 
+  emptyOrReactive: string;
   imperativeOrReactive: string;
   optionalOrMono: string;
   optionalOrMonoOfNullable: string;
@@ -126,6 +127,7 @@ export const mutateApplication = {
 
   addOpenapiGeneratorPlugin: true,
 
+  emptyOrReactive: ({ reactive }) => (reactive ? 'Reactive' : ''),
   imperativeOrReactive: ({ reactive }) => (reactive ? 'reactive' : 'imperative'),
   optionalOrMono: ({ reactive }) => (reactive ? 'Mono' : 'Optional'),
   optionalOrMonoOfNullable: ({ reactive }) => (reactive ? 'Mono.justOrEmpty' : 'Optional.ofNullable'),

generators/java/generators/bootstrap/__snapshots__/generator.spec.ts.snap

@@ -119,6 +119,7 @@ exports[`generator - java:bootstrap bootstrapping default config should prepare
   "domains": Any<Array>,
   "dtoSuffix": "DTO",
   "dynamic": undefined,
+  "emptyOrReactive": "",
   "enableGradleDevelocity": undefined,
   "enableHibernateCache": true,
   "enableI18nRTL": false,

generators/kubernetes/generators/bootstrap/generator.ts

@@ -24,7 +24,7 @@ import { defaults } from 'lodash-es';
 
 import { convertSecretToBase64, createBase64Secret } from '../../../../lib/utils/secret.ts';
 import BaseWorkspacesGenerator from '../../../base-workspaces/index.ts';
-import { loadDockerDependenciesTask } from '../../../base-workspaces/internal/docker-dependencies.ts';
+import { loadDockerDependenciesTask, loadDockerElasticsearchVersion } from '../../../base-workspaces/internal/docker-dependencies.ts';
 import { checkDocker } from '../../../docker/support/index.ts';
 import { BaseKubernetesGenerator } from '../../generator.ts';
 import { helmConstants, kubernetesConstants } from '../../support/constants.ts';
@@ -98,8 +98,12 @@ export default class KubernetesBootstrapGenerator extends BaseKubernetesGenerato
       loadConstants({ deployment }) {
         defaults(deployment, kubernetesConstants, helmConstants);
       },
-      async loadDockerDependenciesTask({ deployment }) {
+      async loadDockerDependenciesTask({ deployment, applications }) {
         loadDockerDependenciesTask.call(this, { context: deployment });
+        loadDockerElasticsearchVersion.call(this, {
+          springBoot4: applications.some(app => app.springBoot4),
+          dockerContainers: deployment.dockerContainers!,
+        });
       },
       appsConfigs({ deployment, applications }) {
         deployment.appConfigs = applications;

generators/server/generators/bootstrap/__snapshots__/generator.spec.ts.snap

@@ -119,6 +119,7 @@ exports[`generator - server:bootstrap bootstrapping default config should prepar
   "domains": Any<Array>,
   "dtoSuffix": "DTO",
   "dynamic": undefined,
+  "emptyOrReactive": "",
   "enableGradleDevelocity": undefined,
   "enableHibernateCache": true,
   "enableI18nRTL": false,

generators/server/generators/bootstrap/generator.ts

@@ -23,7 +23,7 @@ import { mutateData } from '../../../../lib/utils/index.ts';
 import BaseApplicationGenerator from '../../../base-application/index.ts';
 import { loadRequiredConfigIntoEntity } from '../../../base-application/support/index.ts';
 import type { Application as BaseApplicationApplication, Entity as BaseApplicationEntity } from '../../../base-application/types.d.ts';
-import { loadDockerDependenciesTask } from '../../../base-workspaces/internal/docker-dependencies.ts';
+import { loadDockerDependenciesTask, loadDockerElasticsearchVersion } from '../../../base-workspaces/internal/docker-dependencies.ts';
 import type { Application as SpringDataRelationalApplication } from '../../../spring-data/generators/relational/types.d.ts';
 import serverCommand from '../../command.ts';
 import {
@@ -121,6 +121,22 @@ export default class ServerBootstrapGenerator extends BaseApplicationGenerator<S
     return this.preparing;
   }
 
+  get postPreparing() {
+    return this.asPostPreparingTaskGroup({
+      async loadDockerDependencies({ application }) {
+        // springBoot4 is prepared in preparing phase of spring-boot generator
+        loadDockerElasticsearchVersion.call(this, {
+          springBoot4: application.springBoot4,
+          dockerContainers: application.dockerContainers!,
+        });
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.POST_PREPARING]() {
+    return this.postPreparing;
+  }
+
   get loadingEntities() {
     return this.asLoadingEntitiesTaskGroup({
       loadingEntities({ entitiesToLoad }) {