Allowing Query/CollectionReference and DocumentSnapshot/QueryDocumentSnapshot equality

schmidt-sebastian · schmidt-sebastian · commit 627a3bfa30bb · 2018-02-27T19:12:52.000-08:00
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java
@@ -423,7 +423,7 @@ public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
-    if (obj == null || getClass() != obj.getClass()) {
+    if (obj == null || !(obj instanceof DocumentSnapshot)) {
       return false;
     }
     DocumentSnapshot that = (DocumentSnapshot) obj;
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
@@ -1077,7 +1077,7 @@ public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
-    if (obj == null || getClass() != obj.getClass()) {
+    if (obj == null || !(obj instanceof Query)) {
       return false;
     }
     Query query = (Query) obj;

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ public boolean equals(Object obj) {`
`423`	`423`	`if (this == obj) {`
`424`	`424`	`return true;`
`425`	`425`	`}`
`426`		`- if (obj == null \|\| getClass() != obj.getClass()) {`
	`426`	`+ if (obj == null \|\| !(obj instanceof DocumentSnapshot)) {`
`427`	`427`	`return false;`
`428`	`428`	`}`
`429`	`429`	`DocumentSnapshot that = (DocumentSnapshot) obj;`
Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ public boolean equals(Object obj) {`
`1077`	`1077`	`if (this == obj) {`
`1078`	`1078`	`return true;`
`1079`	`1079`	`}`
`1080`		`- if (obj == null \|\| getClass() != obj.getClass()) {`
	`1080`	`+ if (obj == null \|\| !(obj instanceof Query)) {`
`1081`	`1081`	`return false;`
`1082`	`1082`	`}`
`1083`	`1083`	`Query query = (Query) obj;`