Skip to content

Commit 646bff8

Browse files
committed
Create spring-boot-mongodb module
1 parent 00d13bc commit 646bff8

File tree

57 files changed

+151
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+151
-111
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ include "spring-boot-project:spring-boot-ldap"
7878
include "spring-boot-project:spring-boot-liquibase"
7979
include "spring-boot-project:spring-boot-neo4j"
8080
include "spring-boot-project:spring-boot-mail"
81+
include "spring-boot-project:spring-boot-mongodb"
8182
include "spring-boot-project:spring-boot-mustache"
8283
include "spring-boot-project:spring-boot-parent"
8384
include "spring-boot-project:spring-boot-pulsar"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies {
3535
optional(project(":spring-boot-project:spring-boot-ldap"))
3636
optional(project(":spring-boot-project:spring-boot-liquibase"))
3737
optional(project(":spring-boot-project:spring-boot-mail"))
38+
optional(project(":spring-boot-project:spring-boot-mongodb"))
3839
optional(project(":spring-boot-project:spring-boot-neo4j"))
3940
optional(project(":spring-boot-project:spring-boot-quartz"))
4041
optional(project(":spring-boot-project:spring-boot-r2dbc"))

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/mongo/MongoHealthContributorAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2929
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
3130
import org.springframework.context.annotation.Bean;
3231
import org.springframework.data.mongodb.core.MongoTemplate;
3332

@@ -37,8 +36,8 @@
3736
* @author Stephane Nicoll
3837
* @since 2.1.0
3938
*/
40-
@AutoConfiguration(after = { MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
41-
MongoReactiveHealthContributorAutoConfiguration.class })
39+
@AutoConfiguration(after = { MongoDataAutoConfiguration.class, MongoReactiveHealthContributorAutoConfiguration.class },
40+
afterName = "org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration")
4241
@ConditionalOnClass(MongoTemplate.class)
4342
@ConditionalOnBean(MongoTemplate.class)
4443
@ConditionalOnEnabledHealthIndicator("mongo")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3535
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
36-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
37-
import org.springframework.boot.autoconfigure.mongo.MongoClientSettingsBuilderCustomizer;
36+
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
37+
import org.springframework.boot.mongodb.autoconfigure.MongoClientSettingsBuilderCustomizer;
3838
import org.springframework.context.annotation.Bean;
3939

4040
/**

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/data/mongo/MongoHealthContributorAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
2222
import org.springframework.boot.actuate.data.mongo.MongoHealthIndicator;
2323
import org.springframework.boot.autoconfigure.AutoConfigurations;
2424
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
25-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
25+
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
2626
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2727

2828
import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/data/mongo/MongoReactiveHealthContributorAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
2424
import org.springframework.boot.autoconfigure.AutoConfigurations;
2525
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration;
27-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
28-
import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration;
27+
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
28+
import org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration;
2929
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3030

3131
import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
3535
import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
37-
import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration;
3836
import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
3937
import org.springframework.boot.context.annotation.UserConfigurations;
4038
import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
4139
import org.springframework.boot.hazelcast.autoconfigure.HazelcastAutoConfiguration;
4240
import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
41+
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
42+
import org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration;
4343
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
4444
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4545
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
3434

3535
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
3636
import org.springframework.boot.autoconfigure.AutoConfigurations;
37-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
37+
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
3838
import org.springframework.boot.test.context.FilteredClassLoader;
3939
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
4040
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ dependencies {
5454
optional(project(":spring-boot-project:spring-boot-jdbc"))
5555
optional(project(":spring-boot-project:spring-boot-jsonb"))
5656
optional(project(":spring-boot-project:spring-boot-liquibase"))
57+
optional(project(":spring-boot-project:spring-boot-mongodb"))
5758
optional(project(":spring-boot-project:spring-boot-neo4j"))
5859
optional(project(":spring-boot-project:spring-boot-r2dbc"))
5960
optional(project(":spring-boot-project:spring-boot-reactor-netty"))

spring-boot-project/spring-boot-autoconfigure-all/src/dockerTest/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@
2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
2828
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration;
3230
import org.springframework.boot.autoconfigure.web.reactive.WebSessionIdResolverAutoConfiguration;
31+
import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
32+
import org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration;
3333
import org.springframework.boot.test.context.FilteredClassLoader;
3434
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
3535
import org.springframework.boot.test.context.runner.ContextConsumer;

0 commit comments

Comments
 (0)