Remove MongoDB driver 4 compatibility.

Closes: #4886

Author: christophstrobl

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

@@ -18,11 +18,9 @@
 import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
-
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.data.mongodb.util.MongoCompatibilityAdapter;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
@@ -90,9 +88,6 @@ private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexO
 			if (indexOptions.containsKey("bits")) {
 				ops = ops.bits((Integer) indexOptions.get("bits"));
 			}
-			if (indexOptions.containsKey("bucketSize")) {
-				MongoCompatibilityAdapter.indexOptionsAdapter(ops).setBucketSize(((Number) indexOptions.get("bucketSize")).doubleValue());
-			}
 			if (indexOptions.containsKey("default_language")) {
 				ops = ops.defaultLanguage(indexOptions.get("default_language").toString());
 			}

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

@@ -25,9 +25,7 @@
 
 import org.bson.UuidRepresentation;
 import org.bson.codecs.configuration.CodecRegistry;
-
 import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.data.mongodb.util.MongoCompatibilityAdapter;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -57,8 +55,6 @@ public class MongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoCli
 
 	private CodecRegistry codecRegistry = DEFAULT_MONGO_SETTINGS.getCodecRegistry();
 
-	@Nullable private Object streamFactoryFactory = MongoCompatibilityAdapter
-			.clientSettingsAdapter(DEFAULT_MONGO_SETTINGS).getStreamFactoryFactory();
 	@Nullable private TransportSettings transportSettings;
 
 	private ReadPreference readPreference = DEFAULT_MONGO_SETTINGS.getReadPreference();
@@ -371,16 +367,6 @@ public void setReadPreference(ReadPreference readPreference) {
 		this.readPreference = readPreference;
 	}
 
-	/**
-	 * @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;
-	}
-
 	public void setTransportSettings(@Nullable TransportSettings transportSettings) {
 		this.transportSettings = transportSettings;
 	}
@@ -492,10 +478,6 @@ protected MongoClientSettings createInstance() {
 			builder.transportSettings(transportSettings);
 		}
 
-		if (streamFactoryFactory != null) {
-			MongoCompatibilityAdapter.clientSettingsBuilderAdapter(builder).setStreamFactoryFactory(streamFactoryFactory);
-		}
-
 		if (retryReads != null) {
 			builder = builder.retryReads(retryReads);
 		}

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

@@ -107,7 +107,6 @@
 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.MongoCompatibilityAdapter;
 import org.springframework.data.projection.EntityProjection;
 import org.springframework.data.util.CloseableIterator;
 import org.springframework.data.util.Optionals;
@@ -728,7 +727,7 @@ public boolean collectionExists(String collectionName) {
 
 		return execute(db -> {
 
-			for (String name : MongoCompatibilityAdapter.mongoDatabaseAdapter().forDb(db).listCollectionNames()) {
+			for (String name : db.listCollectionNames()) {
 				if (name.equals(collectionName)) {
 					return true;
 				}
@@ -1977,11 +1976,6 @@ public <T> List<T> mapReduce(Query query, Class<?> domainType, String inputColle
 				mapReduce = mapReduce.jsMode(mapReduceOptions.getJavaScriptMode());
 			}
 
-			if (mapReduceOptions.getOutputSharded().isPresent()) {
-				MongoCompatibilityAdapter.mapReduceIterableAdapter(mapReduce)
-						.sharded(mapReduceOptions.getOutputSharded().get());
-			}
-
 			if (StringUtils.hasText(mapReduceOptions.getOutputCollection()) && !mapReduceOptions.usesInlineOutput()) {
 
 				mapReduce = mapReduce.collectionName(mapReduceOptions.getOutputCollection())
@@ -2364,7 +2358,7 @@ protected String replaceWithResourceIfNecessary(String function) {
 	public Set<String> getCollectionNames() {
 		return execute(db -> {
 			Set<String> result = new LinkedHashSet<>();
-			for (String name : MongoCompatibilityAdapter.mongoDatabaseAdapter().forDb(db).listCollectionNames()) {
+			for (String name : db.listCollectionNames()) {
 				result.add(name);
 			}
 			return result;

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

@@ -118,7 +118,6 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
-import org.springframework.data.mongodb.util.MongoCompatibilityAdapter;
 import org.springframework.data.projection.EntityProjection;
 import org.springframework.data.util.Optionals;
 import org.springframework.lang.Nullable;
@@ -739,7 +738,7 @@ public <T> Mono<Boolean> collectionExists(Class<T> entityClass) {
 
 	@Override
 	public Mono<Boolean> collectionExists(String collectionName) {
-		return createMono(db -> Flux.from(MongoCompatibilityAdapter.reactiveMongoDatabaseAdapter().forDb(db).listCollectionNames()) //
+		return createMono(db -> Flux.from(db.listCollectionNames()) //
 				.filter(s -> s.equals(collectionName)) //
 				.map(s -> true) //
 				.single(false));
@@ -787,7 +786,7 @@ public ReactiveBulkOperations bulkOps(BulkMode mode, @Nullable Class<?> entityTy
 
 	@Override
 	public Flux<String> getCollectionNames() {
-		return createFlux(db -> MongoCompatibilityAdapter.reactiveMongoDatabaseAdapter().forDb(db).listCollectionNames());
+		return createFlux(db -> db.listCollectionNames());
 	}
 
 	public Mono<MongoDatabase> getMongoDatabase() {
@@ -2171,10 +2170,6 @@ public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inpu
 				publisher = publisher.jsMode(options.getJavaScriptMode());
 			}
 
-			if (options.getOutputSharded().isPresent()) {
-				MongoCompatibilityAdapter.mapReducePublisherAdapter(publisher).sharded(options.getOutputSharded().get());
-			}
-
 			if (StringUtils.hasText(options.getOutputCollection()) && !options.usesInlineOutput()) {
 				publisher = publisher.collectionName(options.getOutputCollection()).action(options.getMapReduceAction());
 

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

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.core.encryption;
 
-import static org.springframework.data.mongodb.util.MongoCompatibilityAdapter.rangeOptionsAdapter;
-
 import java.util.Map;
 import java.util.function.Supplier;
 
@@ -124,7 +122,7 @@ protected RangeOptions rangeOptions(Map<String, Object> attributes) {
 			Assert.isInstanceOf(Integer.class, trimFactor, () -> String
 					.format("Expected to find a %s but it turned out to be %s.", Integer.class, trimFactor.getClass()));
 
-			rangeOptionsAdapter(encryptionRangeOptions).trimFactor((Integer) trimFactor);
+			encryptionRangeOptions.trimFactor((Integer) trimFactor);
 		}
 
 		if (attributes.containsKey("sparsity")) {

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

@@ -114,16 +114,6 @@
 	 */
 	GeoSpatialIndexType type() default GeoSpatialIndexType.GEO_2D;
 
-	/**
-	 * The bucket size for {@link GeoSpatialIndexType#GEO_HAYSTACK} indexes, in coordinate units.
-	 *
-	 * @since 1.4
-	 * @return {@literal 1.0} by default.
-	 * @deprecated since MongoDB server version 4.4
-	 */
-	@Deprecated
-	double bucketSize() default 1.0;
-
 	/**
 	 * The name of the additional field to use for {@link GeoSpatialIndexType#GEO_HAYSTACK} indexes
 	 *

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

@@ -19,7 +19,6 @@
 
 import org.bson.Document;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.data.mongodb.util.MongoClientVersion;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -41,7 +40,6 @@ public class GeospatialIndex implements IndexDefinition {
 	private @Nullable Integer max;
 	private @Nullable Integer bits;
 	private GeoSpatialIndexType type = GeoSpatialIndexType.GEO_2D;
-	private Double bucketSize = MongoClientVersion.isVersion5orNewer() ? null : 1.0;
 	private @Nullable String additionalField;
 	private Optional<IndexFilter> filter = Optional.empty();
 	private Optional<Collation> collation = Optional.empty();
@@ -107,17 +105,6 @@ public GeospatialIndex typed(GeoSpatialIndexType type) {
 		return this;
 	}
 
-	/**
-	 * @param bucketSize
-	 * @return this.
-	 * @deprecated since MongoDB server version 4.4
-	 */
-	@Deprecated
-	public GeospatialIndex withBucketSize(double bucketSize) {
-		this.bucketSize = bucketSize;
-		return this;
-	}
-
 	/**
 	 * @param fieldName
 	 * @return this.
@@ -203,14 +190,9 @@ public Document getIndexOptions() {
 				break;
 
 			case GEO_2DSPHERE:
-
 				break;
 
 			case GEO_HAYSTACK:
-
-				if (bucketSize != null) {
-					document.put("bucketSize", bucketSize);
-				}
 				break;
 		}
 

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

@@ -25,7 +25,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
@@ -55,7 +54,6 @@
 import org.springframework.data.mongodb.util.BsonUtils;
 import org.springframework.data.mongodb.util.DotPath;
 import org.springframework.data.mongodb.util.DurationUtil;
-import org.springframework.data.mongodb.util.MongoClientVersion;
 import org.springframework.data.mongodb.util.spel.ExpressionUtils;
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.data.util.TypeInformation;
@@ -711,23 +709,6 @@ protected IndexDefinitionHolder createGeoSpatialIndexDefinition(String dotPath,
 					.named(pathAwareIndexName(index.name(), dotPath, persistentProperty.getOwner(), persistentProperty));
 		}
 
-		if (MongoClientVersion.isVersion5orNewer()) {
-
-			Optional<Double> defaultBucketSize = MergedAnnotation.of(GeoSpatialIndexed.class).getDefaultValue("bucketSize",
-					Double.class);
-			if (!defaultBucketSize.isPresent() || index.bucketSize() != defaultBucketSize.get()) {
-				indexDefinition.withBucketSize(index.bucketSize());
-			} else {
-				if (LOGGER.isInfoEnabled()) {
-					LOGGER.info(
-							"GeoSpatialIndexed.bucketSize no longer supported by Mongo Client 5 or newer. Ignoring bucketSize for path %s."
-									.formatted(dotPath));
-				}
-			}
-		} else {
-			indexDefinition.withBucketSize(index.bucketSize());
-		}
-
 		indexDefinition.typed(index.type()).withAdditionalField(index.additionalField());
 
 		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);

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

@@ -45,7 +45,6 @@ public class MapReduceOptions {
 	private Boolean verbose = Boolean.TRUE;
 	private @Nullable Integer limit;
 
-	private Optional<Boolean> outputSharded = Optional.empty();
 	private Optional<String> finalizeFunction = Optional.empty();
 	private Optional<Collation> collation = Optional.empty();
 
@@ -152,19 +151,6 @@ public MapReduceOptions actionReplace() {
 		return this;
 	}
 
-	/**
-	 * If true and combined with an output mode that writes to a collection, the output collection will be sharded using
-	 * the _id field. For MongoDB 1.9+
-	 *
-	 * @param outputShared if true, output will be sharded based on _id key.
-	 * @return MapReduceOptions so that methods can be chained in a fluent API style
-	 */
-	public MapReduceOptions outputSharded(boolean outputShared) {
-
-		this.outputSharded = Optional.of(outputShared);
-		return this;
-	}
-
 	/**
 	 * Sets the finalize function
 	 *
@@ -245,10 +231,6 @@ public Optional<String> getOutputDatabase() {
 		return this.outputDatabase;
 	}
 
-	public Optional<Boolean> getOutputSharded() {
-		return this.outputSharded;
-	}
-
 	public Map<String, Object> getScopeVariables() {
 		return this.scopeVariables;
 	}
@@ -336,7 +318,6 @@ protected Document createOutObject() {
 		}
 
 		outputDatabase.ifPresent(val -> out.append("db", val));
-		outputSharded.ifPresent(val -> out.append("sharded", val));
 
 		return out;
 	}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/DefaultMongoHandlerObservationConvention.java

@@ -17,10 +17,7 @@
 
 import io.micrometer.common.KeyValues;
 
-import java.net.InetSocketAddress;
-
 import org.springframework.data.mongodb.observability.MongoObservation.LowCardinalityCommandKeyNames;
-import org.springframework.data.mongodb.util.MongoCompatibilityAdapter;
 import org.springframework.util.ObjectUtils;
 
 import com.mongodb.ConnectionString;
@@ -78,16 +75,6 @@ public KeyValues getLowCardinalityKeyValues(MongoHandlerContext context) {
 				keyValues = keyValues.and(LowCardinalityCommandKeyNames.NET_TRANSPORT.withValue("IP.TCP"),
 						LowCardinalityCommandKeyNames.NET_PEER_NAME.withValue(serverAddress.getHost()),
 						LowCardinalityCommandKeyNames.NET_PEER_PORT.withValue("" + serverAddress.getPort()));
-
-				InetSocketAddress socketAddress = MongoCompatibilityAdapter.serverAddressAdapter(serverAddress)
-						.getSocketAddress();
-
-				if (socketAddress != null) {
-
-					keyValues = keyValues.and(
-							LowCardinalityCommandKeyNames.NET_SOCK_PEER_ADDR.withValue(socketAddress.getHostName()),
-							LowCardinalityCommandKeyNames.NET_SOCK_PEER_PORT.withValue("" + socketAddress.getPort()));
-				}
 			}
 
 			ConnectionId connectionId = connectionDescription.getConnectionId();