Cleanup imports and isEqual (#685)

* Fix headers

* Fix isEqual verbosity

* Fix isEqual for nullable properties

* Fix nullability on FSTTestDocSnapshot

8 files changed, 18 insertions, 33 deletions

diff --git a/Firestore/Source/API/FIRCollectionReference.mm b/Firestore/Source/API/FIRCollectionReference.mm
index 70a14c2..a8de29b 100644
--- a/Firestore/Source/API/FIRCollectionReference.mm
+++ b/Firestore/Source/API/FIRCollectionReference.mm
@@ -77,10 +77,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isEqualToReference:(nullable FIRCollectionReference *)reference {
   if (self == reference) return YES;
   if (reference == nil) return NO;
-  if (self.firestore != reference.firestore && ![self.firestore isEqual:reference.firestore])
-    return NO;
-  if (self.query != reference.query && ![self.query isEqual:reference.query]) return NO;
-  return YES;
+  return [self.firestore isEqual:reference.firestore] && [self.query isEqual:reference.query];
 }
 
 - (NSUInteger)hash {
diff --git a/Firestore/Source/API/FIRDocumentChange+Internal.h b/Firestore/Source/API/FIRDocumentChange+Internal.h
index 7e2e5c6..7c9723c 100644
--- a/Firestore/Source/API/FIRDocumentChange+Internal.h
+++ b/Firestore/Source/API/FIRDocumentChange+Internal.h
@@ -16,6 +16,7 @@
 
 #import "FIRDocumentChange.h"
 
+@class FIRFirestore;
 @class FSTViewSnapshot;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/API/FIRDocumentReference.m b/Firestore/Source/API/FIRDocumentReference.m
index 87e6631..05253f7 100644
--- a/Firestore/Source/API/FIRDocumentReference.m
+++ b/Firestore/Source/API/FIRDocumentReference.m
@@ -124,10 +124,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isEqualToReference:(nullable FIRDocumentReference *)reference {
   if (self == reference) return YES;
   if (reference == nil) return NO;
-  if (self.firestore != reference.firestore && ![self.firestore isEqual:reference.firestore])
-    return NO;
-  if (self.key != reference.key && ![self.key isEqualToKey:reference.key]) return NO;
-  return YES;
+  return [self.firestore isEqual:reference.firestore] && [self.key isEqualToKey:reference.key];
 }
 
 - (NSUInteger)hash {
diff --git a/Firestore/Source/API/FIRDocumentSnapshot.m b/Firestore/Source/API/FIRDocumentSnapshot.m
index 80b60e6..10709e8 100644
--- a/Firestore/Source/API/FIRDocumentSnapshot.m
+++ b/Firestore/Source/API/FIRDocumentSnapshot.m
@@ -90,15 +90,12 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isEqualToSnapshot:(nullable FIRDocumentSnapshot *)snapshot {
   if (self == snapshot) return YES;
   if (snapshot == nil) return NO;
-  if (self.firestore != snapshot.firestore && ![self.firestore isEqual:snapshot.firestore])
-    return NO;
-  if (self.internalKey != snapshot.internalKey && ![self.internalKey isEqual:snapshot.internalKey])
-    return NO;
-  if (self.internalDocument != snapshot.internalDocument &&
-      ![self.internalDocument isEqual:snapshot.internalDocument])
-    return NO;
-  if (self.fromCache != snapshot.fromCache) return NO;
-  return YES;
+
+  return [self.firestore isEqual:snapshot.firestore] &&
+         [self.internalKey isEqual:snapshot.internalKey] &&
+         (self.internalDocument == snapshot.internalDocument ||
+          [self.internalDocument isEqual:snapshot.internalDocument]) &&
+         self.fromCache == snapshot.fromCache;
 }
 
 - (NSUInteger)hash {
diff --git a/Firestore/Source/API/FIRQuery.m b/Firestore/Source/API/FIRQuery.m
index 2feca39..1bbf91e 100644
--- a/Firestore/Source/API/FIRQuery.m
+++ b/Firestore/Source/API/FIRQuery.m
@@ -115,9 +115,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isEqualToQuery:(nullable FIRQuery *)query {
   if (self == query) return YES;
   if (query == nil) return NO;
-  if (self.firestore != query.firestore && ![self.firestore isEqual:query.firestore]) return NO;
-  if (self.query != query.query && ![self.query isEqual:query.query]) return NO;
-  return YES;
+
+  return [self.firestore isEqual:query.firestore] && [self.query isEqual:query.query];
 }
 
 - (NSUInteger)hash {
diff --git a/Firestore/Source/API/FIRQuerySnapshot.m b/Firestore/Source/API/FIRQuerySnapshot.m
index 177e461..abee84c 100644
--- a/Firestore/Source/API/FIRQuerySnapshot.m
+++ b/Firestore/Source/API/FIRQuerySnapshot.m
@@ -88,14 +88,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isEqualToSnapshot:(nullable FIRQuerySnapshot *)snapshot {
   if (self == snapshot) return YES;
   if (snapshot == nil) return NO;
-  if (self.firestore != snapshot.firestore && ![self.firestore isEqual:snapshot.firestore])
-    return NO;
-  if (self.originalQuery != snapshot.originalQuery &&
-      ![self.originalQuery isEqual:snapshot.originalQuery])
-    return NO;
-  if (self.snapshot != snapshot.snapshot && ![self.snapshot isEqual:snapshot.snapshot]) return NO;
-  if (self.metadata != snapshot.metadata && ![self.metadata isEqual:snapshot.metadata]) return NO;
-  return YES;
+
+  return [self.firestore isEqual:snapshot.firestore] &&
+         [self.originalQuery isEqual:snapshot.originalQuery] &&
+         [self.snapshot isEqual:snapshot.snapshot] && [self.metadata isEqual:snapshot.metadata];
 }
 
 - (NSUInteger)hash {
diff --git a/Firestore/Source/API/FIRSetOptions.m b/Firestore/Source/API/FIRSetOptions.m
index 743bcc7..b41086c 100644
--- a/Firestore/Source/API/FIRSetOptions.m
+++ b/Firestore/Source/API/FIRSetOptions.m
@@ -39,8 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
   }
 
   FIRSetOptions *otherOptions = (FIRSetOptions *)other;
-
-  return otherOptions.merge != self.merge;
+  return otherOptions.merge == self.merge;
 }
 
 - (NSUInteger)hash {
diff --git a/Firestore/Source/API/FIRSnapshotMetadata.m b/Firestore/Source/API/FIRSnapshotMetadata.m
index d957a8d..27747ce 100644
--- a/Firestore/Source/API/FIRSnapshotMetadata.m
+++ b/Firestore/Source/API/FIRSnapshotMetadata.m
@@ -55,9 +55,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isEqualToMetadata:(nullable FIRSnapshotMetadata *)metadata {
   if (self == metadata) return YES;
   if (metadata == nil) return NO;
-  if (self.pendingWrites != metadata.pendingWrites) return NO;
-  if (self.fromCache != metadata.fromCache) return NO;
-  return YES;
+
+  return self.pendingWrites == metadata.pendingWrites && self.fromCache == metadata.fromCache;
 }
 
 - (NSUInteger)hash {