Skip to content

Commit 5833d2c

Browse files
committed
Fix Embedded Mongo classpath check
This commit changes the classpath check condition to verify that the core module of the MongoDB driver is present. Previously, we were only checking for the presence of the sync driver, making embedded support unavailable with the reactive variant. Closes gh-19960
1 parent b2c0d1d commit 5833d2c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.Map;
2424
import java.util.stream.Stream;
2525

26-
import com.mongodb.client.MongoClient;
26+
import com.mongodb.MongoClientSettings;
2727
import de.flapdoodle.embed.mongo.Command;
2828
import de.flapdoodle.embed.mongo.MongodExecutable;
2929
import de.flapdoodle.embed.mongo.MongodStarter;
@@ -86,7 +86,7 @@
8686
@Configuration(proxyBeanMethods = false)
8787
@EnableConfigurationProperties({ MongoProperties.class, EmbeddedMongoProperties.class })
8888
@AutoConfigureBefore(MongoAutoConfiguration.class)
89-
@ConditionalOnClass({ MongoClient.class, MongodStarter.class })
89+
@ConditionalOnClass({ MongoClientSettings.class, MongodStarter.class })
9090
@Import({ EmbeddedMongoClientDependsOnBeanFactoryPostProcessor.class,
9191
EmbeddedReactiveStreamsMongoClientDependsOnBeanFactoryPostProcessor.class })
9292
public class EmbeddedMongoAutoConfiguration {
@@ -217,10 +217,10 @@ private ArtifactStoreBuilder getArtifactStore(Logger logger,
217217
}
218218

219219
/**
220-
* Post processor to ensure that {@link MongoClient} beans depend on any
221-
* {@link MongodExecutable} beans.
220+
* Post processor to ensure that {@link com.mongodb.client.MongoClient} beans depend
221+
* on any {@link MongodExecutable} beans.
222222
*/
223-
@ConditionalOnClass({ MongoClient.class, MongoClientFactoryBean.class })
223+
@ConditionalOnClass({ com.mongodb.client.MongoClient.class, MongoClientFactoryBean.class })
224224
static class EmbeddedMongoClientDependsOnBeanFactoryPostProcessor
225225
extends MongoClientDependsOnBeanFactoryPostProcessor {
226226

0 commit comments

Comments
 (0)