Fixed #1202 (#1203)

MorphiaOrg · Sep 24, 2018 · 389cf53 · 389cf53
1 parent 49f646f
commit 389cf53
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/morphia/src/main/java/org/mongodb/morphia/query/UpdateOperations.java b/morphia/src/main/java/org/mongodb/morphia/query/UpdateOperations.java
@@ -72,6 +72,16 @@ public interface UpdateOperations<T> {
      */
     UpdateOperations<T> addToSet(String field, List<?> values);
 
+    /**
+     * adds the values to an array field if they doesn't already exist in the array
+     *
+     * @param field  the field to update
+     * @param values the values to add
+     * @return this
+     * @mongodb.driver.manual reference/operator/update/addToSet/ $addToSet
+     */
+    UpdateOperations<T> addToSet(String field, Iterable<?> values);
+
     /**
      * Decrements the numeric field by 1
      *

diff --git a/morphia/src/main/java/org/mongodb/morphia/query/UpdateOpsImpl.java b/morphia/src/main/java/org/mongodb/morphia/query/UpdateOpsImpl.java
@@ -14,6 +14,7 @@
 import java.util.Map;
 
 import static java.util.Collections.singletonList;
+import static org.mongodb.morphia.utils.ReflectionUtils.iterToList;
 
 
 /**
@@ -91,6 +92,11 @@ public UpdateOperations<T> addToSet(final String field, final List<?> values) {
         return this;
     }
 
+    @Override
+    public UpdateOperations<T> addToSet(final String field, final Iterable<?> values) {
+        return addToSet(field, iterToList(values));
+    }
+
     @Override
     public UpdateOperations<T> push(final String field, final Object value) {
         return push(field, value instanceof List ? (List<?>) value : singletonList(value), new PushOptions());

diff --git a/morphia/src/test/java/org/mongodb/morphia/TestUpdateOps.java b/morphia/src/test/java/org/mongodb/morphia/TestUpdateOps.java
@@ -245,6 +245,12 @@ public void testAddToSet() throws Exception {
                                             .addToSet("values", asList(4, 5))),
                       1);
         assertThat(getDs().get(cIntArray).values, is(new Integer[]{1, 2, 3, 5, 4, 8, 9}));
+
+        assertUpdated(getDs().update(getDs().find(ContainsIntArray.class),
+                getDs().createUpdateOperations(ContainsIntArray.class)
+                        .addToSet("values", new HashSet<Integer>(asList(10, 11)))),
+                1);
+        assertThat(getDs().get(cIntArray).values, is(new Integer[]{1, 2, 3, 5, 4, 8, 9, 10, 11}));
     }
 
     @Test