Polish "Upgrade to MongoDB Java Driver 4.0 beta1"

See gh-19960

Author: snicoll

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

@@ -83,8 +83,8 @@ dependencies {
 	optional("org.influxdb:influxdb-java")
 	optional("org.jolokia:jolokia-core")
 	optional("org.liquibase:liquibase-core")
-	optional("org.mongodb:mongodb-driver-sync")
 	optional("org.mongodb:mongodb-driver-reactivestreams")
+	optional("org.mongodb:mongodb-driver-sync")
 	optional("org.springframework:spring-jdbc")
 	optional("org.springframework:spring-jms")
 	optional("org.springframework:spring-messaging")

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

@@ -43,8 +43,8 @@ dependencies {
 	optional("org.hibernate.validator:hibernate-validator")
 	optional("org.influxdb:influxdb-java")
 	optional("org.liquibase:liquibase-core")
-	optional("org.mongodb:mongodb-driver-sync")
 	optional("org.mongodb:mongodb-driver-reactivestreams")
+	optional("org.mongodb:mongodb-driver-sync")
 	optional("org.springframework:spring-jdbc")
 	optional("org.springframework:spring-messaging")
 	optional("org.springframework:spring-webflux")

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

@@ -95,8 +95,8 @@ dependencies {
 	optional("org.jooq:jooq")
 	optional("org.liquibase:liquibase-core")
 	optional("org.messaginghub:pooled-jms")
-	optional("org.mongodb:mongodb-driver-sync")
 	optional("org.mongodb:mongodb-driver-reactivestreams")
+	optional("org.mongodb:mongodb-driver-sync")
 	optional("org.quartz-scheduler:quartz")
 	optional("org.springframework:spring-jdbc")
 	optional("org.springframework.integration:spring-integration-core")

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoClientDependsOnBeanFactoryPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.data.mongo;
 
+import com.mongodb.client.MongoClient;
+
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -46,9 +48,10 @@
  * @since 1.1.0
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass({ com.mongodb.client.MongoClient.class, MongoTemplate.class })
+@ConditionalOnClass({ MongoClient.class, MongoTemplate.class })
 @EnableConfigurationProperties(MongoProperties.class)
-@Import({ MongoDataConfiguration.class, MongoDbFactoryConfiguration.class, MongoDbFactoryDependentConfiguration.class })
+@Import({ MongoDataConfiguration.class, MongoDatabaseFactoryConfiguration.class,
+		MongoDatabaseFactoryDependentConfiguration.class })
 @AutoConfigureAfter(MongoAutoConfiguration.class)
 public class MongoDataAutoConfiguration {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDbFactoryConfiguration.java renamed to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDatabaseFactoryConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,14 +18,10 @@
 
 import com.mongodb.client.MongoClient;
 
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.data.mongo.MongoDbFactoryConfiguration.AnyMongoClientAvailable;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
 import org.springframework.boot.autoconfigure.mongo.MongoProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoDatabaseFactorySupport;
@@ -35,43 +31,16 @@
  * Configuration for a {@link MongoDatabaseFactory}.
  *
  * @author Andy Wilkinson
+ * @author Stephane Nicoll
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnMissingBean(MongoDatabaseFactory.class)
-@Conditional(AnyMongoClientAvailable.class)
-class MongoDbFactoryConfiguration {
+@ConditionalOnSingleCandidate(MongoClient.class)
+class MongoDatabaseFactoryConfiguration {
 
 	@Bean
-	MongoDatabaseFactorySupport<?> mongoDbFactory(ObjectProvider<MongoClient> mongoClient, MongoProperties properties) {
-
-		com.mongodb.client.MongoClient fallbackClient = mongoClient.getIfAvailable();
-		if (fallbackClient != null) {
-			return new SimpleMongoClientDatabaseFactory(fallbackClient, properties.getMongoClientDatabase());
-		}
-		throw new IllegalStateException("Expected to find at least one MongoDB client.");
-	}
-
-	/**
-	 * Check if either a {@link MongoClient com.mongodb.MongoClient} or
-	 * {@link com.mongodb.client.MongoClient com.mongodb.client.MongoClient} bean is
-	 * available.
-	 */
-	static class AnyMongoClientAvailable extends AnyNestedCondition {
-
-		AnyMongoClientAvailable() {
-			super(ConfigurationPhase.REGISTER_BEAN);
-		}
-
-		@ConditionalOnBean(MongoClient.class)
-		static class PreferredClientAvailable {
-
-		}
-
-		@ConditionalOnBean(com.mongodb.client.MongoClient.class)
-		static class FallbackClientAvailable {
-
-		}
-
+	MongoDatabaseFactorySupport<?> mongoDatabaseFactory(MongoClient mongoClient, MongoProperties properties) {
+		return new SimpleMongoClientDatabaseFactory(mongoClient, properties.getMongoClientDatabase());
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDbFactoryDependentConfiguration.java renamed to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDatabaseFactoryDependentConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,18 +48,18 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(MongoDatabaseFactory.class)
-class MongoDbFactoryDependentConfiguration {
+class MongoDatabaseFactoryDependentConfiguration {
 
 	private final MongoProperties properties;
 
-	MongoDbFactoryDependentConfiguration(MongoProperties properties) {
+	MongoDatabaseFactoryDependentConfiguration(MongoProperties properties) {
 		this.properties = properties;
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(MongoOperations.class)
-	MongoTemplate mongoTemplate(MongoDatabaseFactory mongoDbFactory, MongoConverter converter) {
-		return new MongoTemplate(mongoDbFactory, converter);
+	MongoTemplate mongoTemplate(MongoDatabaseFactory factory, MongoConverter converter) {
+		return new MongoTemplate(factory, converter);
 	}
 
 	@Bean
@@ -74,55 +74,55 @@ MappingMongoConverter mappingMongoConverter(MongoDatabaseFactory factory, MongoM
 
 	@Bean
 	@ConditionalOnMissingBean(GridFsOperations.class)
-	GridFsTemplate gridFsTemplate(MongoDatabaseFactory mongoDbFactory, MongoTemplate mongoTemplate) {
-		return new GridFsTemplate(new GridFsMongoDbFactory(mongoDbFactory, this.properties),
+	GridFsTemplate gridFsTemplate(MongoDatabaseFactory factory, MongoTemplate mongoTemplate) {
+		return new GridFsTemplate(new GridFsMongoDatabaseFactory(factory, this.properties),
 				mongoTemplate.getConverter());
 	}
 
 	/**
 	 * {@link MongoDatabaseFactory} decorator to respect
 	 * {@link MongoProperties#getGridFsDatabase()} if set.
 	 */
-	static class GridFsMongoDbFactory implements MongoDatabaseFactory {
+	static class GridFsMongoDatabaseFactory implements MongoDatabaseFactory {
 
-		private final MongoDatabaseFactory mongoDbFactory;
+		private final MongoDatabaseFactory mongoDatabaseFactory;
 
 		private final MongoProperties properties;
 
-		GridFsMongoDbFactory(MongoDatabaseFactory mongoDbFactory, MongoProperties properties) {
-			Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null");
+		GridFsMongoDatabaseFactory(MongoDatabaseFactory mongoDatabaseFactory, MongoProperties properties) {
+			Assert.notNull(mongoDatabaseFactory, "MongoDatabaseFactory must not be null");
 			Assert.notNull(properties, "Properties must not be null");
-			this.mongoDbFactory = mongoDbFactory;
+			this.mongoDatabaseFactory = mongoDatabaseFactory;
 			this.properties = properties;
 		}
 
 		@Override
 		public MongoDatabase getMongoDatabase() throws DataAccessException {
 			String gridFsDatabase = this.properties.getGridFsDatabase();
 			if (StringUtils.hasText(gridFsDatabase)) {
-				return this.mongoDbFactory.getMongoDatabase(gridFsDatabase);
+				return this.mongoDatabaseFactory.getMongoDatabase(gridFsDatabase);
 			}
-			return this.mongoDbFactory.getMongoDatabase();
+			return this.mongoDatabaseFactory.getMongoDatabase();
 		}
 
 		@Override
 		public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
-			return this.mongoDbFactory.getMongoDatabase(dbName);
+			return this.mongoDatabaseFactory.getMongoDatabase(dbName);
 		}
 
 		@Override
 		public PersistenceExceptionTranslator getExceptionTranslator() {
-			return this.mongoDbFactory.getExceptionTranslator();
+			return this.mongoDatabaseFactory.getExceptionTranslator();
 		}
 
 		@Override
 		public ClientSession getSession(ClientSessionOptions options) {
-			return this.mongoDbFactory.getSession(options);
+			return this.mongoDatabaseFactory.getSession(options);
 		}
 
 		@Override
 		public MongoDatabaseFactory withSession(ClientSession session) {
-			return this.mongoDbFactory.withSession(session);
+			return this.mongoDatabaseFactory.withSession(session);
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java

@@ -97,9 +97,9 @@ public DefaultDataBufferFactory dataBufferFactory() {
 
 	@Bean
 	@ConditionalOnMissingBean(ReactiveGridFsOperations.class)
-	public ReactiveGridFsTemplate reactiveGridFsTemplate(ReactiveMongoDatabaseFactory reactiveMongoDbFactory,
+	public ReactiveGridFsTemplate reactiveGridFsTemplate(ReactiveMongoDatabaseFactory reactiveMongoDatabaseFactory,
 			MappingMongoConverter mappingMongoConverter, DataBufferFactory dataBufferFactory) {
-		return new ReactiveGridFsTemplate(dataBufferFactory, reactiveMongoDbFactory, mappingMongoConverter, null);
+		return new ReactiveGridFsTemplate(dataBufferFactory, reactiveMongoDatabaseFactory, mappingMongoConverter, null);
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.mongo;
 
-import java.util.stream.Collectors;
-
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.MongoClient;
 
@@ -43,17 +41,14 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(MongoClient.class)
 @EnableConfigurationProperties(MongoProperties.class)
-@ConditionalOnMissingBean(type = "org.springframework.data.mongodb.MongoDbFactory")
+@ConditionalOnMissingBean(type = "org.springframework.data.mongodb.MongoDatabaseFactory")
 public class MongoAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(type = { "com.mongodb.client.MongoClient" })
-	public MongoClient mongo(MongoProperties properties, Environment environment,
-			ObjectProvider<MongoClientSettingsBuilderCustomizer> builderCustomizers,
-			ObjectProvider<MongoClientSettings> settings) {
-		return new MongoClientFactory(properties, environment,
-				builderCustomizers.orderedStream().collect(Collectors.toList()))
-						.createMongoClient(settings.getIfAvailable());
+	@ConditionalOnMissingBean(MongoClient.class)
+	public MongoClient mongo(MongoProperties properties, ObjectProvider<MongoClientSettings> settings,
+			Environment environment) {
+		return new MongoClientFactory(properties, environment).createMongoClient(settings.getIfAvailable());
 	}
 
 }