---

schmidt-sebastian · web-flow · commit 2f76a5371b2f · 2018-02-27T07:50:25.000-08:00
yaml --- r: 8753 b: refs/heads/master c: 112b25c h: refs/heads/master i: 8751: 80cf204
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3ea00d190a232274e2f6538b48b2df411642ec16
+refs/heads/master: 112b25c6d0c0f77e2e5961a9d2fe3fa042d010dc
 refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
 refs/heads/gh-pages: 6daca92127d91b7c2c99490080ecf8a13fa94cde
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/trunk/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
@@ -245,6 +245,7 @@ private T performSet(
         DocumentTransform.fromFieldPathMap(documentReference, documentData);
 
     if (options.isMerge()) {
+      Preconditions.checkArgument(!fields.isEmpty(), "Data to merge cannot be empty.");
       if (options.getFieldMask() != null) {
         List<FieldPath> fieldMask = new ArrayList<>(options.getFieldMask());
         fieldMask.removeAll(documentTransform.getFields());
@@ -256,12 +257,11 @@ private T performSet(
 
     Mutation mutation = addMutation();
 
-    boolean hasDocumentData = !documentSnapshot.isEmpty() || !documentMask.isEmpty();
-
-    if (!options.isMerge()) {
-      mutation.document = documentSnapshot.toPb();
-    } else if (hasDocumentData || documentTransform.isEmpty()) {
+    if (!options.isMerge() || !documentSnapshot.isEmpty() || !documentMask.isEmpty()) {
       mutation.document = documentSnapshot.toPb();
+    }
+
+    if (!documentMask.isEmpty()) {
       mutation.document.setUpdateMask(documentMask.toPb());
     }
 
diff --git a/trunk/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/trunk/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
@@ -85,8 +85,7 @@ public class ConformanceTest {
   private interface ConformanceTestCase extends Test, Describable {}
 
   /** Excluded tests by test description. */
-  private final Set<String> excludedTests =
-      Collections.singleton("set: MergeAll cannot be specified with empty data."); // b/73495873
+  private final Set<String> excludedTests = Collections.emptySet();
 
   /** If non-empty, only runs tests included in this set. */
   private final Set<String> includedTests = Collections.emptySet();
diff --git a/trunk/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java b/trunk/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java
@@ -411,20 +411,6 @@ public void setDocumentWithMerge() throws Exception {
     }
   }
 
-  @Test
-  public void setDocumentWithEmptyMerge() throws Exception {
-    doReturn(SINGLE_WRITE_COMMIT_RESPONSE)
-        .when(firestoreMock)
-        .sendRequest(
-            commitCapture.capture(), Matchers.<UnaryCallable<CommitRequest, CommitResponse>>any());
-
-    documentReference.set(map(), SetOptions.merge()).get();
-
-    assertCommitEquals(
-        commit(set(Collections.<String, Value>emptyMap(), Collections.<String>emptyList())),
-        commitCapture.getValue());
-  }
-
   @Test
   public void setDocumentWithNestedMerge() throws Exception {
     doReturn(SINGLE_WRITE_COMMIT_RESPONSE)
