fix: Allow an explicit MustExist precondition for update (#1542)

dconeybe · web-flow · commit 46e09aad7f66 · 2024-01-23T21:18:18.000-05:00
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
@@ -158,7 +158,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-conformance-tests</artifactId>
-      <version>0.3.6</version>
+      <version>0.3.7</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java
@@ -62,8 +62,8 @@ boolean isEmpty() {
     return exists == null && updateTime == null;
   }
 
-  boolean hasExists() {
-    return exists != null;
+  Boolean getExists() {
+    return exists;
   }
 
   com.google.firestore.v1.Precondition toPb() {
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
@@ -387,7 +387,8 @@ public T update(
       @Nonnull Map<String, Object> fields,
       Precondition precondition) {
     Preconditions.checkArgument(
-        !precondition.hasExists(), "Precondition 'exists' cannot be specified for update() calls.");
+        !Boolean.FALSE.equals(precondition.getExists()),
+        "Precondition 'exists' cannot have the value 'false' for update() calls.");
     return performUpdate(
         documentReference, convertToFieldPaths(fields, /* splitOnDots= */ true), precondition);
   }
@@ -455,7 +456,8 @@ public T update(
       @Nullable Object value,
       Object... moreFieldsAndValues) {
     Preconditions.checkArgument(
-        !precondition.hasExists(), "Precondition 'exists' cannot be specified for update() calls.");
+        !Boolean.FALSE.equals(precondition.getExists()),
+        "Precondition 'exists' cannot have the value 'false' for update() calls.");
     return performUpdate(
         documentReference,
         precondition,
@@ -483,7 +485,8 @@ public T update(
       @Nullable Object value,
       Object... moreFieldsAndValues) {
     Preconditions.checkArgument(
-        !precondition.hasExists(), "Precondition 'exists' cannot be specified for update() calls.");
+        !Boolean.FALSE.equals(precondition.getExists()),
+        "Precondition 'exists' cannot have the value 'false' for update() calls.");
     return performUpdate(documentReference, precondition, fieldPath, value, moreFieldsAndValues);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ boolean isEmpty() {`
`62`	`62`	`return exists == null && updateTime == null;`
`63`	`63`	`}`
`64`	`64`
`65`		`- boolean hasExists() {`
`66`		`- return exists != null;`
	`65`	`+ Boolean getExists() {`
	`66`	`+ return exists;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`com.google.firestore.v1.Precondition toPb() {`