From 0145b68f6174a59a658416ceadd9a943b5171d08 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 26 Jul 2019 09:42:45 +0200 Subject: [PATCH] DATAMONGO-2325 - Upgrade to MongoDB Driver 3.11.0-rc0. Adapt tests to added overloads. --- pom.xml | 2 +- .../mongodb/core/MongoTemplateUnitTests.java | 20 +++++++++---------- .../SessionBoundMongoTemplateUnitTests.java | 12 ++++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 6e71b5a1e..728c77f16 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ multi spring-data-mongodb 2.2.0.BUILD-SNAPSHOT - 3.11.0-beta4 + 3.11.0-rc0 1.11.0 1.19 diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java index 5e8033fb3..2e53081dc 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java @@ -747,7 +747,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { template.findAndModify(new BasicQuery("{}").collation(Collation.of("fr")), new Update(), AutogenerateableId.class); ArgumentCaptor options = ArgumentCaptor.forClass(FindOneAndUpdateOptions.class); - verify(collection).findOneAndUpdate(any(), any(), options.capture()); + verify(collection).findOneAndUpdate(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr"); } @@ -795,7 +795,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { AutogenerateableId.class); ArgumentCaptor options = ArgumentCaptor.forClass(UpdateOptions.class); - verify(collection).updateOne(any(), any(), options.capture()); + verify(collection).updateOne(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr"); } @@ -807,7 +807,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { AutogenerateableId.class); ArgumentCaptor options = ArgumentCaptor.forClass(UpdateOptions.class); - verify(collection).updateMany(any(), any(), options.capture()); + verify(collection).updateMany(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr"); } @@ -1073,7 +1073,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { EntityWithListOfSimple.class); ArgumentCaptor options = ArgumentCaptor.forClass(UpdateOptions.class); - verify(collection).updateOne(any(), any(), options.capture()); + verify(collection).updateOne(any(), any(Bson.class), options.capture()); Assertions.assertThat((List) options.getValue().getArrayFilters()) .contains(new org.bson.Document("element", new Document("$gte", 100))); @@ -1087,7 +1087,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { EntityWithListOfSimple.class); ArgumentCaptor options = ArgumentCaptor.forClass(FindOneAndUpdateOptions.class); - verify(collection).findOneAndUpdate(any(), any(), options.capture()); + verify(collection).findOneAndUpdate(any(), any(Bson.class), options.capture()); Assertions.assertThat((List) options.getValue().getArrayFilters()) .contains(new org.bson.Document("element", new Document("$gte", 100))); @@ -1143,7 +1143,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { template.findAndModify(new BasicQuery("{}"), new Update(), Sith.class); ArgumentCaptor options = ArgumentCaptor.forClass(FindOneAndUpdateOptions.class); - verify(collection).findOneAndUpdate(any(), any(), options.capture()); + verify(collection).findOneAndUpdate(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation()) .isEqualTo(com.mongodb.client.model.Collation.builder().locale("de_AT").build()); @@ -1313,7 +1313,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { template.updateFirst(new BasicQuery("{}"), Update.update("foo", "bar"), Sith.class); ArgumentCaptor options = ArgumentCaptor.forClass(UpdateOptions.class); - verify(collection).updateOne(any(), any(), options.capture()); + verify(collection).updateOne(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation()) .isEqualTo(com.mongodb.client.model.Collation.builder().locale("de_AT").build()); @@ -1325,7 +1325,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { template.updateFirst(new BasicQuery("{}").collation(Collation.of("fr")), Update.update("foo", "bar"), Sith.class); ArgumentCaptor options = ArgumentCaptor.forClass(UpdateOptions.class); - verify(collection).updateOne(any(), any(), options.capture()); + verify(collection).updateOne(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation()) .isEqualTo(com.mongodb.client.model.Collation.builder().locale("fr").build()); @@ -1337,7 +1337,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { template.updateMulti(new BasicQuery("{}"), Update.update("foo", "bar"), Sith.class); ArgumentCaptor options = ArgumentCaptor.forClass(UpdateOptions.class); - verify(collection).updateMany(any(), any(), options.capture()); + verify(collection).updateMany(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation()) .isEqualTo(com.mongodb.client.model.Collation.builder().locale("de_AT").build()); @@ -1349,7 +1349,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { template.updateMulti(new BasicQuery("{}").collation(Collation.of("fr")), Update.update("foo", "bar"), Sith.class); ArgumentCaptor options = ArgumentCaptor.forClass(UpdateOptions.class); - verify(collection).updateMany(any(), any(), options.capture()); + verify(collection).updateMany(any(), any(Bson.class), options.capture()); assertThat(options.getValue().getCollation()) .isEqualTo(com.mongodb.client.model.Collation.builder().locale("fr").build()); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java index ac0c3b974..c79c2b5bc 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java @@ -24,12 +24,14 @@ import java.util.Collections; import org.bson.Document; import org.bson.codecs.BsonValueCodec; import org.bson.codecs.configuration.CodecRegistry; +import org.bson.conversions.Bson; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.geo.Metrics; import org.springframework.data.geo.Point; import org.springframework.data.mongodb.MongoDbFactory; @@ -46,6 +48,7 @@ import org.springframework.data.mongodb.core.query.Update; import com.mongodb.MongoClient; import com.mongodb.client.AggregateIterable; +import com.mongodb.client.ClientSession; import com.mongodb.client.DistinctIterable; import com.mongodb.client.FindIterable; import com.mongodb.client.MapReduceIterable; @@ -57,7 +60,6 @@ import com.mongodb.client.model.CountOptions; import com.mongodb.client.model.DeleteOptions; import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.UpdateOptions; -import com.mongodb.client.ClientSession; /** * Unit test for {@link SessionBoundMongoTemplate} making sure a proxied {@link MongoCollection} and @@ -249,7 +251,7 @@ public class SessionBoundMongoTemplateUnitTests { template.findAndModify(new Query(), new Update().set("foo", "bar"), Person.class); - verify(collection).findOneAndUpdate(eq(clientSession), any(), any(), any(FindOneAndUpdateOptions.class)); + verify(collection).findOneAndUpdate(eq(clientSession), any(), any(Bson.class), any(FindOneAndUpdateOptions.class)); } @Test // DATAMONGO-1880 @@ -302,7 +304,7 @@ public class SessionBoundMongoTemplateUnitTests { template.updateFirst(new Query(), Update.update("foo", "bar"), Person.class); - verify(collection).updateOne(eq(clientSession), any(), any(), any(UpdateOptions.class)); + verify(collection).updateOne(eq(clientSession), any(), any(Bson.class), any(UpdateOptions.class)); } @Test // DATAMONGO-1880 @@ -310,7 +312,7 @@ public class SessionBoundMongoTemplateUnitTests { template.updateMulti(new Query(), Update.update("foo", "bar"), Person.class); - verify(collection).updateMany(eq(clientSession), any(), any(), any(UpdateOptions.class)); + verify(collection).updateMany(eq(clientSession), any(), any(Bson.class), any(UpdateOptions.class)); } @Test // DATAMONGO-1880 @@ -318,7 +320,7 @@ public class SessionBoundMongoTemplateUnitTests { template.upsert(new Query(), Update.update("foo", "bar"), Person.class); - verify(collection).updateOne(eq(clientSession), any(), any(), any(UpdateOptions.class)); + verify(collection).updateOne(eq(clientSession), any(), any(Bson.class), any(UpdateOptions.class)); } @Test // DATAMONGO-1880