From becd2dcc98bfb74a284c59308e02d8317a6345ad Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Mon, 27 Jan 2025 14:48:37 +0000
Subject: [PATCH] Remove MongoClient 4.x check / support

---
 .../core/encryption/EncryptionOptions.java      |  4 +---
 .../mongodb/util/MongoCompatibilityAdapter.java | 17 -----------------
 .../core/encryption/RangeEncryptionTests.java   |  8 --------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java
index f2ad46e54..89697fe0f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.core.encryption;
 
-import static org.springframework.data.mongodb.util.MongoCompatibilityAdapter.*;
-
 import java.util.Objects;
 import java.util.Optional;
 
@@ -203,7 +201,7 @@ public class EncryptionOptions {
 				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 (rangeOptions.containsKey("sparsity")) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoCompatibilityAdapter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoCompatibilityAdapter.java
index 3541f9c44..b17b9f196 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoCompatibilityAdapter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoCompatibilityAdapter.java
@@ -128,23 +128,6 @@ public class MongoCompatibilityAdapter {
 		};
 	}
 
-	/**
-	 * Return a compatibility adapter for {@link RangeOptions}.
-	 *
-	 * @param options
-	 * @return
-	 */
-	public static RangeOptionsAdapter rangeOptionsAdapter(RangeOptions options) {
-		return trimFactor -> {
-
-			if (!MongoClientVersion.isVersion5orNewer() || setTrimFactor == null) {
-				throw new UnsupportedOperationException(NOT_SUPPORTED_ON_4.formatted("RangeOptions.trimFactor"));
-			}
-
-			ReflectionUtils.invokeMethod(setTrimFactor, options, trimFactor);
-		};
-	}
-
 	/**
 	 * Return a compatibility adapter for {@code MapReducePublisher}.
 	 *
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java
index b0bbbb418..2c5e3abc6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java
@@ -44,7 +44,6 @@ import com.mongodb.client.model.Indexes;
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.client.vault.ClientEncryptions;
 
-import org.assertj.core.api.Assumptions;
 import org.bson.BsonArray;
 import org.bson.BsonBinary;
 import org.bson.BsonDocument;
@@ -55,7 +54,6 @@ import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.DisposableBean;
@@ -71,7 +69,6 @@ import org.springframework.data.mongodb.core.mapping.ExplicitEncrypted;
 import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
 import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
 import org.springframework.data.mongodb.test.util.MongoClientExtension;
-import org.springframework.data.mongodb.util.MongoClientVersion;
 import org.springframework.data.util.Lazy;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -87,11 +84,6 @@ class RangeEncryptionTests {
 
 	@Autowired MongoTemplate template;
 
-	@BeforeEach
-	void setUp() {
-		Assumptions.assumeThat(MongoClientVersion.isVersion5orNewer()).isTrue();
-	}
-
 	@AfterEach
 	void tearDown() {
 		template.getDb().getCollection("test").deleteMany(new BsonDocument());