Equals uses getClass instead if instanceof.

Author: mderka

gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java

@@ -161,7 +161,7 @@ public Builder toBuilder() {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj instanceof ChangeRequest) {
+    if (obj.getClass().equals(ChangeRequest.class)) {
       ChangeRequest other = (ChangeRequest) obj;
       return Objects.equals(options, other.options)
           && Objects.equals(zone, other.zone)

gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequestInfo.java

@@ -336,7 +336,8 @@ static ChangeRequestInfo fromPb(Change pb) {
 
   @Override
   public boolean equals(Object other) {
-    return other instanceof ChangeRequestInfo && toPb().equals(((ChangeRequestInfo) other).toPb());
+    return other != null && other.getClass().equals(ChangeRequestInfo.class)
+        && other instanceof ChangeRequestInfo && toPb().equals(((ChangeRequestInfo) other).toPb());
   }
 
   @Override

gcloud-java-dns/src/test/java/com/google/gcloud/dns/ChangeRequestTest.java

@@ -68,8 +68,10 @@ public void tearDown() throws Exception {
 
   @Test
   public void testConstructor() {
+    expect(dns.options()).andReturn(OPTIONS);
     replay(dns);
-    assertEquals(CHANGE_REQUEST_INFO, changeRequestPartial);
+    assertEquals(new ChangeRequest(dns, ZONE_NAME,
+        new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_INFO)), changeRequestPartial);
     assertNotNull(changeRequest.dns());
     assertEquals(ZONE_NAME, changeRequest.zone());
     assertSame(dns, changeRequestPartial.dns());

gcloud-java-dns/src/test/java/com/google/gcloud/dns/DnsImplTest.java

@@ -221,7 +221,8 @@ public void testGetChangeRequest() {
     dns = options.service(); // creates DnsImpl
     ChangeRequest changeRequest = dns.getChangeRequest(ZONE_INFO.name(),
         CHANGE_REQUEST_COMPLETE.id());
-    assertEquals(CHANGE_REQUEST_COMPLETE, changeRequest);
+    assertEquals(new ChangeRequest(dns, ZONE_INFO.name(),
+        new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_COMPLETE)), changeRequest);
   }
 
   @Test
@@ -235,7 +236,8 @@ public void testGetChangeRequestWithOptions() {
     ChangeRequest changeRequest = dns.getChangeRequest(ZONE_INFO.name(),
         CHANGE_REQUEST_COMPLETE.id(), CHANGE_GET_FIELDS);
     String selector = (String) capturedOptions.getValue().get(CHANGE_GET_FIELDS.rpcOption());
-    assertEquals(CHANGE_REQUEST_COMPLETE, changeRequest);
+    assertEquals(new ChangeRequest(dns, ZONE_INFO.name(),
+        new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_COMPLETE)), changeRequest);
     assertTrue(selector.contains(Dns.ChangeRequestField.STATUS.selector()));
     assertTrue(selector.contains(Dns.ChangeRequestField.ID.selector()));
   }
@@ -248,7 +250,8 @@ public void testApplyChangeRequest() {
     dns = options.service(); // creates DnsImpl
     ChangeRequest changeRequest = dns.applyChangeRequest(ZONE_INFO.name(),
         CHANGE_REQUEST_PARTIAL);
-    assertEquals(CHANGE_REQUEST_COMPLETE, changeRequest);
+    assertEquals(new ChangeRequest(dns, ZONE_INFO.name(),
+        new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_COMPLETE)), changeRequest);
   }
 
   @Test
@@ -262,7 +265,8 @@ public void testApplyChangeRequestWithOptions() {
     ChangeRequest changeRequest = dns.applyChangeRequest(ZONE_INFO.name(),
         CHANGE_REQUEST_PARTIAL, CHANGE_GET_FIELDS);
     String selector = (String) capturedOptions.getValue().get(CHANGE_GET_FIELDS.rpcOption());
-    assertEquals(CHANGE_REQUEST_COMPLETE, changeRequest);
+    assertEquals(new ChangeRequest(dns, ZONE_INFO.name(),
+        new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_COMPLETE)), changeRequest);
     assertTrue(selector.contains(Dns.ChangeRequestField.STATUS.selector()));
     assertTrue(selector.contains(Dns.ChangeRequestField.ID.selector()));
   }
@@ -275,8 +279,12 @@ public void testListChangeRequests() {
     EasyMock.replay(dnsRpcMock);
     dns = options.service(); // creates DnsImpl
     Page<ChangeRequest> changeRequestPage = dns.listChangeRequests(ZONE_INFO.name());
-    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(CHANGE_REQUEST_COMPLETE));
-    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(CHANGE_REQUEST_PARTIAL));
+    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(
+        new ChangeRequest(dns, ZONE_INFO.name(),
+            new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_COMPLETE))));
+    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(
+        new ChangeRequest(dns, ZONE_INFO.name(),
+            new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_PARTIAL))));
     assertEquals(2, Lists.newArrayList(changeRequestPage.values()).size());
   }
 
@@ -288,8 +296,12 @@ public void testListChangeRequestsWithOptions() {
     EasyMock.replay(dnsRpcMock);
     dns = options.service(); // creates DnsImpl
     Page<ChangeRequest> changeRequestPage = dns.listChangeRequests(ZONE_NAME, CHANGE_LIST_OPTIONS);
-    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(CHANGE_REQUEST_COMPLETE));
-    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(CHANGE_REQUEST_PARTIAL));
+    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(
+        new ChangeRequest(dns, ZONE_INFO.name(),
+            new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_COMPLETE))));
+    assertTrue(Lists.newArrayList(changeRequestPage.values()).contains(
+        new ChangeRequest(dns, ZONE_INFO.name(),
+            new ChangeRequestInfo.BuilderImpl(CHANGE_REQUEST_PARTIAL))));
     assertEquals(2, Lists.newArrayList(changeRequestPage.values()).size());
     Integer size = (Integer) capturedOptions.getValue().get(CHANGE_LIST_OPTIONS[0].rpcOption());
     assertEquals(MAX_SIZE, size);