Refactor adapter.

Move into util package. Remove circular dependencies, add nullability annotations, fix Javadoc.

Original pull request: #4624
See: #4578

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCompatibilityAdapter.java

@@ -114,6 +114,7 @@ public DefaultIndexOperations(MongoOperations mongoOperations, String collection
 		this.type = type;
 	}
 
+	@Override
 	public String ensureIndex(final IndexDefinition indexDefinition) {
 
 		return execute(collection -> {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java

@@ -88,7 +88,8 @@ private DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations,
 		this.type = type;
 	}
 
-	public Mono<String> ensureIndex(final IndexDefinition indexDefinition) {
+	@Override
+	public Mono<String> ensureIndex(IndexDefinition indexDefinition) {
 
 		return mongoOperations.execute(collectionName, collection -> {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java

@@ -18,11 +18,11 @@
 import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
+
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.mongodb.MongoCompatibilityAdapter;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.data.mongodb.util.MongoClientVersion;
+import org.springframework.data.mongodb.util.MongoCompatibilityAdapter;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexConverters.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.lang.reflect.Method;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -24,17 +23,13 @@
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.bson.UuidRepresentation;
 import org.bson.codecs.configuration.CodecRegistry;
+
 import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.data.mongodb.MongoCompatibilityAdapter;
-import org.springframework.data.mongodb.util.MongoClientVersion;
+import org.springframework.data.mongodb.util.MongoCompatibilityAdapter;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.AutoEncryptionSettings;
@@ -62,7 +57,8 @@ public class MongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoCli
 
 	private CodecRegistry codecRegistry = DEFAULT_MONGO_SETTINGS.getCodecRegistry();
 
-	@Nullable private Object streamFactoryFactory;
+	@Nullable private Object streamFactoryFactory = MongoCompatibilityAdapter
+			.clientSettingsAdapter(DEFAULT_MONGO_SETTINGS).getStreamFactoryFactory();
 	@Nullable private TransportSettings transportSettings;
 
 	private ReadPreference readPreference = DEFAULT_MONGO_SETTINGS.getReadPreference();
@@ -125,21 +121,17 @@ public class MongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoCli
 	private @Nullable AutoEncryptionSettings autoEncryptionSettings;
 	private @Nullable ServerApi serverApi;
 
-	{
-		streamFactoryFactory = MongoCompatibilityAdapter.clientSettingsAdapter(DEFAULT_MONGO_SETTINGS).getStreamFactoryFactory();
-	}
-
 	/**
 	 * @param socketConnectTimeoutMS in msec
-	 * @see com.mongodb.connection.SocketSettings.Builder#connectTimeout(int, TimeUnit)
+	 * @see com.mongodb.connection.SocketSettings.Builder#connectTimeout(long, TimeUnit)
 	 */
 	public void setSocketConnectTimeoutMS(int socketConnectTimeoutMS) {
 		this.socketConnectTimeoutMS = socketConnectTimeoutMS;
 	}
 
 	/**
 	 * @param socketReadTimeoutMS in msec
-	 * @see com.mongodb.connection.SocketSettings.Builder#readTimeout(int, TimeUnit)
+	 * @see com.mongodb.connection.SocketSettings.Builder#readTimeout(long, TimeUnit)
 	 */
 	public void setSocketReadTimeoutMS(int socketReadTimeoutMS) {
 		this.socketReadTimeoutMS = socketReadTimeoutMS;
@@ -380,8 +372,11 @@ public void setReadPreference(ReadPreference readPreference) {
 	}
 
 	/**
-	 * @param streamFactoryFactory // * @see MongoClientSettings.Builder#streamFactoryFactory(StreamFactoryFactory)
+	 * @param streamFactoryFactory
+	 * @deprecated since 4.3, will be removed in the MongoDB 5.0 driver in favor of
+	 *             {@code com.mongodb.connection.TransportSettings}.
 	 */
+	@Deprecated(since = "4.3")
 	public void setStreamFactoryFactory(Object streamFactoryFactory) {
 		this.streamFactoryFactory = streamFactoryFactory;
 	}
@@ -449,7 +444,6 @@ protected MongoClientSettings createInstance() {
 						settings.hosts(clusterHosts);
 					}
 					settings.localThreshold(clusterLocalThresholdMS, TimeUnit.MILLISECONDS);
-					// settings.maxWaitQueueSize(clusterMaxWaitQueueSize);
 					settings.requiredClusterType(custerRequiredClusterType);
 
 					if (StringUtils.hasText(clusterSrvHost)) {
@@ -518,59 +512,4 @@ protected MongoClientSettings createInstance() {
 
 		return builder.build();
 	}
-
-	static class MongoStreamFactoryFactorySettingsConfigurer {
-
-		private static final Log logger = LogFactory.getLog(MongoClientSettingsFactoryBean.class);
-
-		private static final String STREAM_FACTORY_NAME = "com.mongodb.connection.StreamFactoryFactory";
-		private static final boolean STREAM_FACTORY_PRESENT = ClassUtils.isPresent(STREAM_FACTORY_NAME,
-				MongoStreamFactoryFactorySettingsConfigurer.class.getClassLoader());
-		private final MongoClientSettings.Builder settingsBuilder;
-
-		static boolean isStreamFactoryPresent() {
-			return STREAM_FACTORY_PRESENT;
-		}
-
-		static Object getDefaultStreamFactoryFactory() {
-
-			if (MongoClientVersion.is5PlusClient()) {
-				return null;
-			}
-
-			Method getStreamFactoryFactory = ReflectionUtils.findMethod(MongoClientSettings.class, "getStreamFactoryFactory");
-			return getStreamFactoryFactory != null
-					? ReflectionUtils.invokeMethod(getStreamFactoryFactory, DEFAULT_MONGO_SETTINGS)
-					: null;
-		}
-
-		public MongoStreamFactoryFactorySettingsConfigurer(Builder settingsBuilder) {
-			this.settingsBuilder = settingsBuilder;
-		}
-
-		void setStreamFactory(Object streamFactory) {
-
-			if (MongoClientVersion.is5PlusClient()) {
-				logger.warn("StreamFactoryFactory is no longer available. Use TransportSettings instead.");
-			}
-
-			if (isStreamFactoryPresent()) { //
-				try {
-					Class<?> streamFactoryType = ClassUtils.forName(STREAM_FACTORY_NAME,
-							streamFactory.getClass().getClassLoader());
-					if (!ClassUtils.isAssignable(streamFactoryType, streamFactory.getClass())) {
-						throw new IllegalArgumentException("Expected %s but found %s".formatted(streamFactoryType, streamFactory));
-					}
-
-					Method setter = ReflectionUtils.findMethod(settingsBuilder.getClass(), "streamFactoryFactory",
-							streamFactoryType);
-					if (setter != null) {
-						ReflectionUtils.invokeMethod(setter, settingsBuilder, streamFactoryType.cast(streamFactory));
-					}
-				} catch (ClassNotFoundException e) {
-					throw new IllegalArgumentException("Cannot set StreamFactoryFactory for %s".formatted(settingsBuilder), e);
-				}
-			}
-		}
-	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java

@@ -30,6 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
 import org.bson.conversions.Bson;
+
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -53,7 +54,6 @@
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.MongoCompatibilityAdapter;
 import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.MongoDatabaseUtils;
 import org.springframework.data.mongodb.SessionSynchronization;
@@ -104,7 +104,7 @@
 import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
 import org.springframework.data.mongodb.core.timeseries.Granularity;
 import org.springframework.data.mongodb.core.validation.Validator;
-import org.springframework.data.mongodb.util.MongoClientVersion;
+import org.springframework.data.mongodb.util.MongoCompatibilityAdapter;
 import org.springframework.data.projection.EntityProjection;
 import org.springframework.data.util.CloseableIterator;
 import org.springframework.data.util.Optionals;