From f318185ad065dc52b6e6ee120fa961696c9295fc Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 18 Mar 2016 09:59:06 +0100 Subject: [PATCH] DATAMONGO-1400 - Adapt to rename of Tuple to Pair in Spring Data Commons. Related tickets: DATACMNS-818. --- .../data/mongodb/core/BulkOperations.java | 10 +++++----- .../mongodb/core/DefaultBulkOperations.java | 20 +++++++++---------- ...DefaultBulkOperationsIntegrationTests.java | 12 +++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperations.java index 344210d3b..d4762e738 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2016 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. @@ -19,7 +19,7 @@ import java.util.List; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; -import org.springframework.data.util.Tuple; +import org.springframework.data.util.Pair; import com.mongodb.BulkWriteResult; @@ -78,7 +78,7 @@ public interface BulkOperations { * @param updates Update operations to perform. * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}. */ - BulkOperations updateOne(List> updates); + BulkOperations updateOne(List> updates); /** * Add a single update to the bulk operation. For the update request, all matching documents are updated. @@ -96,7 +96,7 @@ public interface BulkOperations { * @return The bulk operation. * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}. */ - BulkOperations updateMulti(List> updates); + BulkOperations updateMulti(List> updates); /** * Add a single upsert to the bulk operation. An upsert is an update if the set of matching documents is not empty, @@ -117,7 +117,7 @@ public interface BulkOperations { * @return The bulk operation. * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}. */ - BulkOperations upsert(List> updates); + BulkOperations upsert(List> updates); /** * Add a single remove operation to the bulk operation. diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java index 39a93b9ee..40f3bf77c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2016 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. @@ -22,7 +22,7 @@ import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; -import org.springframework.data.util.Tuple; +import org.springframework.data.util.Pair; import org.springframework.util.Assert; import com.mongodb.BulkWriteException; @@ -148,7 +148,7 @@ class DefaultBulkOperations implements BulkOperations { Assert.notNull(query, "Query must not be null!"); Assert.notNull(update, "Update must not be null!"); - return updateOne(Arrays.asList(Tuple.of(query, update))); + return updateOne(Arrays.asList(Pair.of(query, update))); } /* @@ -156,11 +156,11 @@ class DefaultBulkOperations implements BulkOperations { * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(java.util.List) */ @Override - public BulkOperations updateOne(List> updates) { + public BulkOperations updateOne(List> updates) { Assert.notNull(updates, "Updates must not be null!"); - for (Tuple update : updates) { + for (Pair update : updates) { update(update.getFirst(), update.getSecond(), false, false); } @@ -178,7 +178,7 @@ class DefaultBulkOperations implements BulkOperations { Assert.notNull(query, "Query must not be null!"); Assert.notNull(update, "Update must not be null!"); - return updateMulti(Arrays.asList(Tuple.of(query, update))); + return updateMulti(Arrays.asList(Pair.of(query, update))); } /* @@ -186,11 +186,11 @@ class DefaultBulkOperations implements BulkOperations { * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(java.util.List) */ @Override - public BulkOperations updateMulti(List> updates) { + public BulkOperations updateMulti(List> updates) { Assert.notNull(updates, "Updates must not be null!"); - for (Tuple update : updates) { + for (Pair update : updates) { update(update.getFirst(), update.getSecond(), false, true); } @@ -211,9 +211,9 @@ class DefaultBulkOperations implements BulkOperations { * @see org.springframework.data.mongodb.core.BulkOperations#upsert(java.util.List) */ @Override - public BulkOperations upsert(List> updates) { + public BulkOperations upsert(List> updates) { - for (Tuple update : updates) { + for (Pair update : updates) { upsert(update.getFirst(), update.getSecond()); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java index 4b0f09b8c..0f3f0b204 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2016 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. @@ -31,7 +31,7 @@ import org.springframework.data.mongodb.core.BulkOperations.BulkMode; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; -import org.springframework.data.util.Tuple; +import org.springframework.data.util.Pair; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -258,7 +258,7 @@ public class DefaultBulkOperationsIntegrationTests { public void mixedBulkOrderedWithList() { List inserts = Arrays.asList(newDoc("1", "v1"), newDoc("2", "v2"), newDoc("3", "v2")); - List> updates = Arrays.asList(Tuple.of(where("value", "v2"), set("value", "v3"))); + List> updates = Arrays.asList(Pair.of(where("value", "v2"), set("value", "v3"))); List removes = Arrays.asList(where("_id", "1")); BulkWriteResult result = createBulkOps(BulkMode.ORDERED).insert(inserts).updateMulti(updates).remove(removes) @@ -276,9 +276,9 @@ public class DefaultBulkOperationsIntegrationTests { insertSomeDocuments(); - List> updates = new ArrayList>(); - updates.add(Tuple.of(where("value", "value1"), set("value", "value3"))); - updates.add(Tuple.of(where("value", "value2"), set("value", "value4"))); + List> updates = new ArrayList>(); + updates.add(Pair.of(where("value", "value1"), set("value", "value3"))); + updates.add(Pair.of(where("value", "value2"), set("value", "value4"))); int modifiedCount = multi ? bulkOps.updateMulti(updates).execute().getModifiedCount() : bulkOps.updateOne(updates).execute().getModifiedCount();