resolve comments

Author: milaGGL

firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetData.java

@@ -21,6 +21,7 @@
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.remote.WatchStream;
 import com.google.protobuf.ByteString;
+import java.util.Objects;
 
 /** An immutable set of metadata that the store will need to keep track of for each target. */
 public final class TargetData {
@@ -93,7 +94,7 @@ public TargetData withSequenceNumber(long sequenceNumber) {
         snapshotVersion,
         lastLimboFreeSnapshotVersion,
         resumeToken,
-        expectedCount);
+        /* expectedCount= */ null);
   }
 
   /** Creates a new target data instance with an updated resume token and snapshot version. */
@@ -110,7 +111,7 @@ public TargetData withResumeToken(ByteString resumeToken, SnapshotVersion snapsh
   }
 
   /** Creates a new target data instance with an updated expected count. */
-  public TargetData withExpectedCount(Integer expectedCount) {
+  public TargetData withExpectedCount(@Nullable Integer expectedCount) {
     return new TargetData(
         target,
         targetId,
@@ -188,7 +189,7 @@ public boolean equals(Object o) {
         && snapshotVersion.equals(targetData.snapshotVersion)
         && lastLimboFreeSnapshotVersion.equals(targetData.lastLimboFreeSnapshotVersion)
         && resumeToken.equals(targetData.resumeToken)
-        && expectedCount == targetData.expectedCount;
+        && Objects.equals(expectedCount, targetData.expectedCount);
   }
 
   @Override
@@ -200,7 +201,7 @@ public int hashCode() {
     result = 31 * result + snapshotVersion.hashCode();
     result = 31 * result + lastLimboFreeSnapshotVersion.hashCode();
     result = 31 * result + resumeToken.hashCode();
-    result = 31 * result + (expectedCount != null ? expectedCount.hashCode() : 0);
+    result = 31 * result + Objects.hashCode(expectedCount);
     return result;
   }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java

@@ -499,7 +499,9 @@ public Target encodeTarget(TargetData targetData) {
       builder.setResumeToken(targetData.getResumeToken());
     }
 
-    if (targetData.getExpectedCount() != null) {
+    if (targetData.getExpectedCount() != null
+        && (!targetData.getResumeToken().isEmpty()
+            || targetData.getSnapshotVersion().compareTo(SnapshotVersion.NONE) > 0)) {
       builder.setExpectedCount(Int32Value.newBuilder().setValue(targetData.getExpectedCount()));
     }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteStore.java

@@ -372,11 +372,10 @@ private void sendWatchRequest(TargetData targetData) {
     if (!targetData.getResumeToken().isEmpty()
         || targetData.getSnapshotVersion().compareTo(SnapshotVersion.NONE) > 0) {
       int expectedCount = this.getRemoteKeysForTarget(targetData.getTargetId()).size();
-      TargetData newTargetData = targetData.withExpectedCount(expectedCount);
-      watchStream.watchQuery(newTargetData);
-    } else {
-      watchStream.watchQuery(targetData);
+      targetData = targetData.withExpectedCount(expectedCount);
     }
+
+    watchStream.watchQuery(targetData);
   }
 
   /**