From 4034131405454dd548c9c6daa38b0aa0d4a92a10 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Mon, 22 Jan 2024 16:33:08 -0500
Subject: [PATCH 1/2] fix: Allow an explicit MustExist precondition for update

---
 .../java/com/google/cloud/firestore/Precondition.java    | 4 ++--
 .../java/com/google/cloud/firestore/UpdateBuilder.java   | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

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
index 54b55b8188..fb8be8778c 100644
--- 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
index 4336e255ce..a9326a8fc4 100644
--- 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);
   }
 

From 0ef8e0f54f71f4f5927b15efc265dfb4b3671245 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 23 Jan 2024 20:51:47 -0500
Subject: [PATCH 2/2] update dependency
 com.google.cloud:google-cloud-conformance-tests to v0.3.7 (cherry pick
 https://github.com/googleapis/java-firestore/pull/1543)

---
 google-cloud-firestore/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
index 49617e17bc..02e7c5aca4 100644
--- 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>