spring-boot: migrate mongodb to Spring Boot 4 (#31905)

mshima · web-flow · commit 24422673c15d · 2026-01-10T12:56:54.000Z
diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.ts.snap
@@ -670,7 +670,7 @@ jhipster:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
-      - SPRING_DATA_MONGODB_URI=mongodb://msmongodb-mongodb:27017/msmongodb
+      - SPRING_MONGODB_URI=mongodb://msmongodb-mongodb:27017/msmongodb
     healthcheck:
       test:
         - CMD
@@ -1466,7 +1466,7 @@ jhipster:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
-      - SPRING_DATA_MONGODB_URI=mongodb://msmongodb-mongodb:27017/msmongodb
+      - SPRING_MONGODB_URI=mongodb://msmongodb-mongodb:27017/msmongodb
     healthcheck:
       test:
         - CMD
diff --git a/generators/docker-compose/generator.ts b/generators/docker-compose/generator.ts
@@ -213,7 +213,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator<Base
                 'SPRING_DATASOURCE_URL',
                 'SPRING_LIQUIBASE_URL',
                 'SPRING_NEO4J_URI',
-                'SPRING_DATA_MONGODB_URI',
+                'SPRING_MONGODB_URI',
                 'JHIPSTER_CACHE_REDIS_SERVER',
                 'SPRING_ELASTICSEARCH_URIS',
               ].forEach(varName => {
diff --git a/generators/docker/__snapshots__/generator.spec.ts.snap b/generators/docker/__snapshots__/generator.spec.ts.snap
@@ -14,7 +14,7 @@ services:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://admin:$\${jhipster.registry.password}@jhipster-registry:8761/eureka
       - SPRING_CLOUD_CONFIG_URI=http://admin:$\${jhipster.registry.password}@jhipster-registry:8761/config
-      - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/jhipster
+      - SPRING_MONGODB_URI=mongodb://mongodb:27017/jhipster
     ports:
       - 127.0.0.1:8080:8080
     healthcheck:
@@ -1060,7 +1060,7 @@ services:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
-      - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/jhipster?waitQueueMultiple=1000
+      - SPRING_MONGODB_URI=mongodb://mongodb:27017/jhipster
       - SPRING_ELASTICSEARCH_URIS=http://elasticsearch:9200
       - SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=kafka:9092
     ports:
diff --git a/generators/docker/templates/docker/app.yml.ejs b/generators/docker/templates/docker/app.yml.ejs
@@ -44,7 +44,7 @@ _%>
       - SPRING_LIQUIBASE_URL=<%- this.getJDBCUrl(prodDatabaseType, { hostname: prodDatabaseType, databaseName: databaseName }) %>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
-      - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
+      - SPRING_MONGODB_URI=mongodb://mongodb:27017/<%= baseName %>
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
       - SPRING_NEO4J_URI=bolt://neo4j:7687
diff --git a/generators/kubernetes/__snapshots__/kubernetes.spec.ts.snap b/generators/kubernetes/__snapshots__/kubernetes.spec.ts.snap
@@ -11806,7 +11806,7 @@ spec:
           value: consul-headless.default.svc.cluster.local
         - name: SPRING_CLOUD_CONSUL_PORT
           value: "8500"
-        - name: SPRING_DATA_MONGODB_URI
+        - name: SPRING_MONGODB_URI
           value: "mongodb://msmongodb-mongodb-0.msmongodb-mongodb.default:27017/msmongodb"
         - name: MANAGEMENT_TRACING_BAGGAGE_REMOTE_FIELDS
           value: "x-request-id,x-ot-span-context"
@@ -18448,7 +18448,7 @@ spec:
           value: consul-headless.default.svc.cluster.local
         - name: SPRING_CLOUD_CONSUL_PORT
           value: "8500"
-        - name: SPRING_DATA_MONGODB_URI
+        - name: SPRING_MONGODB_URI
           value: "mongodb://msmongodb-mongodb-0.msmongodb-mongodb.default:27017/msmongodb"
         - name: MANAGEMENT_TRACING_BAGGAGE_REMOTE_FIELDS
           value: "x-request-id,x-ot-span-context"
diff --git a/generators/kubernetes/generators/helm/__snapshots__/kubernetes.helm.spec.ts.snap b/generators/kubernetes/generators/helm/__snapshots__/kubernetes.helm.spec.ts.snap
@@ -4753,7 +4753,7 @@ spec:
           value: consul-headless.default.svc.cluster.local
         - name: SPRING_CLOUD_CONSUL_PORT
           value: "8500"
-        - name: SPRING_DATA_MONGODB_URI
+        - name: SPRING_MONGODB_URI
           value: "mongodb://msmongodb-mongodb-0.msmongodb-mongodb.default:27017/msmongodb"
         - name: MANAGEMENT_TRACING_BAGGAGE_REMOTE_FIELDS
           value: "x-request-id,x-ot-span-context"
diff --git a/generators/kubernetes/generators/knative/__snapshots__/knative.spec.ts.snap b/generators/kubernetes/generators/knative/__snapshots__/knative.spec.ts.snap
@@ -5132,7 +5132,7 @@ spec:
               value: msmongodb
             - name: SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME
               value: msmongodb
-            - name: SPRING_DATA_MONGODB_URI
+            - name: SPRING_MONGODB_URI
               value: "mongodb://msmongodb-mongodb-0.msmongodb-mongodb.default:27017/msmongodb"
             - name: MANAGEMENT_TRACING_BAGGAGE_REMOTE_FIELDS
               value: "x-request-id,x-ot-span-context"
@@ -15250,7 +15250,7 @@ spec:
               value: msmongodb
             - name: SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME
               value: msmongodb
-            - name: SPRING_DATA_MONGODB_URI
+            - name: SPRING_MONGODB_URI
               value: "mongodb://msmongodb-mongodb-0.msmongodb-mongodb.default:27017/msmongodb"
             - name: MANAGEMENT_TRACING_BAGGAGE_REMOTE_FIELDS
               value: "x-request-id,x-ot-span-context"
diff --git a/generators/kubernetes/generators/knative/templates/service.yml.ejs b/generators/kubernetes/generators/knative/templates/service.yml.ejs
@@ -106,8 +106,8 @@ spec:
                   key: postgresql-password
 <%_ } _%>
 <%_ if (app.databaseTypeMongodb) { _%>
-            - name: SPRING_DATA_MONGODB_URI
-              value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>/<%= app.baseName %><% if (app.reactive) { %>?waitQueueMultiple=1000<% } %>"
+            - name: SPRING_MONGODB_URI
+              value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>/<%= app.baseName %>"
 <%_ } _%>
 <%_ if (app.databaseTypeCouchbase) { _%>
             - name: SPRING_COUCHBASE_CONNECTION_STRING
diff --git a/generators/kubernetes/templates/deployment.yml.ejs b/generators/kubernetes/templates/deployment.yml.ejs
@@ -166,8 +166,8 @@ spec:
   <%_ } _%>
 <%_ } _%>
 <%_ if (app.databaseTypeMongodb) { _%>
-        - name: SPRING_DATA_MONGODB_URI
-          value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>/<%= app.baseName %><% if (app.reactive) { %>?waitQueueMultiple=1000<% } %>"
+        - name: SPRING_MONGODB_URI
+          value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>/<%= app.baseName %>"
 <%_ } _%>
 <%_ if (app.databaseTypeNeo4j) { _%>
         - name: SPRING_NEO4J_URI
diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts
@@ -313,6 +313,7 @@ export default class SpringBootGenerator extends SpringBootApplicationGenerator
                     (_match, p1) => `import org.springframework.boot.${suffixReplacements[p1] ?? p1}`,
                   )
                   .replaceAll('import org.jspecify.annotations.Nullable;', 'import org.springframework.lang.Nullable;')
+                  .replaceAll(/import org\.testcontainers\.(mongodb)\./g, 'import org.testcontainers.containers.')
                   .replaceAll(
                     'import org.hibernate.validator.internal.constraintvalidators.bv.EmailValidator;',
                     'import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;',
diff --git a/generators/spring-boot/generators/bootstrap/generator.ts b/generators/spring-boot/generators/bootstrap/generator.ts
@@ -38,7 +38,6 @@ export default class BootstrapGenerator extends SpringBootApplicationGenerator {
               !(data.databaseTypeSql && data.reactive) &&
               !(data.databaseTypeCassandra && data.reactive) &&
               !data.databaseTypeCouchbase &&
-              !data.databaseTypeMongodb &&
               !data.cacheProviderInfinispan,
             ),
           springDataDescription: ({ databaseType, reactive }) => {
diff --git a/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs
@@ -162,10 +162,10 @@ spring:
       enabled: true
   <%_ } _%>
 <%_ } _%>
-<%_ if (databaseTypeMongodb) { _%>
+<%_ if (databaseTypeMongodb && !springBoot4) { _%>
   data:
     mongodb:
-      uri: mongodb://localhost:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
+      uri: mongodb://localhost:27017/<%= baseName %>
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   cassandra:
@@ -203,6 +203,10 @@ spring:
 <%_ } _%>
   messages:
     cache-duration: PT1S # 1 second, see the ISO 8601 standard
+<%_ if (databaseTypeMongodb && springBoot4) { _%>
+  mongodb:
+    uri: mongodb://localhost:27017/<%= baseName %>
+<%_ } _%>
 <%_ if (databaseTypeSql && reactive) { _%>
   r2dbc:
     url: <%- devR2dbcUrl %>
diff --git a/generators/spring-boot/templates/src/main/resources/config/application-prod.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-prod.yml.ejs
@@ -133,10 +133,10 @@ spring:
         useServerPrepStmts: true
   <%_ } _%>
 <%_ } _%>
-<%_ if (databaseTypeMongodb) { _%>
+<%_ if (databaseTypeMongodb && !springBoot4) { _%>
   data:
     mongodb:
-      uri: mongodb://localhost:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
+      uri: mongodb://localhost:27017/<%= baseName %>
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   cassandra:
@@ -170,6 +170,10 @@ spring:
     username:
     password:
 <%_ } _%>
+<%_ if (databaseTypeMongodb && springBoot4) { _%>
+  mongodb:
+    uri: mongodb://localhost:27017/<%= baseName %>
+<%_ } _%>
 <%_ if (databaseTypeSql && reactive) { _%>
   r2dbc:
     url: <%- prodR2dbcUrl %>
diff --git a/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs
@@ -356,6 +356,11 @@ spring:
   <% if (reactive) { %>webflux<% } else { %>mvc<% } %>:
     problemdetails:
       enabled: true
+<%_ if (databaseTypeMongodb && springBoot4) { _%>
+  mongodb:
+    representation:
+      uuid: standard
+<%_ } _%>
 <%_ if (generateInMemoryUserCredentials || authenticationTypeOauth2 || authenticationTypeJwt) { _%>
   security:
   <%_ if (generateInMemoryUserCredentials) { _%>
diff --git a/generators/spring-boot/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs
@@ -84,7 +84,7 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
                             beanFactory.registerSingleton(MongoDbTestContainer.class.getName(), mongoDbBean);
                             // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(MongoDbTestContainer.class.getName(), mongoDbBean);
                         }
-                        testValues = testValues.and("spring.data.mongodb.uri=" + mongoDbBean.getMongoDBContainer().getReplicaSetUrl());
+                        testValues = testValues.and("spring.mongodb.uri=" + mongoDbBean.getMongoDBContainer().getReplicaSetUrl());
                     }
     <%_ } _%>
     <%_ if (searchEngineElasticsearch) { _%>
diff --git a/generators/spring-boot/templates/src/test/resources/config/application.yml.ejs b/generators/spring-boot/templates/src/test/resources/config/application.yml.ejs
@@ -132,6 +132,11 @@ spring:
     allow-bean-definition-overriding: true
   messages:
     basename: i18n/messages
+<%_ if (databaseTypeMongodb && springBoot4) { _%>
+  mongodb:
+    representation:
+      uuid: standard
+<%_ } _%>
 <%_ if (generateInMemoryUserCredentials || authenticationTypeOauth2 || authenticationTypeJwt) { _%>
   security:
   <%_ if (generateInMemoryUserCredentials) { _%>
diff --git a/generators/spring-data/generators/mongodb/generator.ts b/generators/spring-data/generators/mongodb/generator.ts
@@ -66,6 +66,9 @@ export default class MongoDBGenerator extends SpringBootApplicationGenerator {
       addDependencies({ application, source }) {
         const { reactive, javaDependencies } = application;
         source.addSpringBootModule?.(`spring-boot-starter-data-mongodb${reactive ? '-reactive' : ''}`);
+        if (application.springBoot4) {
+          source.addSpringBootModule?.(`spring-boot-starter-data-mongodb${reactive ? '-reactive' : ''}-test`);
+        }
         source.addJavaDependencies?.([
           { groupId: 'io.mongock', artifactId: 'mongock-bom', type: 'pom', version: javaDependencies!['mongock-bom'], scope: 'import' },
           { groupId: 'io.mongock', artifactId: 'mongock-springboot-v3' },
diff --git a/generators/spring-data/generators/mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs b/generators/spring-data/generators/mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.MongoDBContainer;
+import org.testcontainers.mongodb.MongoDBContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 public class MongoDbTestContainer implements InitializingBean, DisposableBean {

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,7 @@ export default class SpringBootGenerator extends SpringBootApplicationGenerator`
`313`	`313`	(_match, p1) => `import org.springframework.boot.${suffixReplacements[p1] ?? p1}`,
`314`	`314`	`)`
`315`	`315`	`.replaceAll('import org.jspecify.annotations.Nullable;', 'import org.springframework.lang.Nullable;')`
	`316`	`+ .replaceAll(/import org\.testcontainers\.(mongodb)\./g, 'import org.testcontainers.containers.')`
`316`	`317`	`.replaceAll(`
`317`	`318`	`'import org.hibernate.validator.internal.constraintvalidators.bv.EmailValidator;',`
`318`	`319`	`'import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;',`