Update Compute equals methods to support mocking

googleapis · Apr 29, 2016 · f0ae430 · f0ae430
1 parent ae0a6d2
commit f0ae430
Show file tree

Hide file tree

Showing 25 changed files with 106 additions and 37 deletions.
diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/Address.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/Address.java
@@ -165,9 +165,14 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Address
-        && Objects.equals(toPb(), ((Address) obj).toPb())
-        && Objects.equals(options, ((Address) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Address.class)) {
+      return false;
+    }
+    Address other = (Address) obj;
+    return Objects.equals(toPb(), other.toPb()) && Objects.equals(options, other.options);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/AddressInfo.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/AddressInfo.java
@@ -496,7 +496,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null
+    return obj == this
+        || obj != null
         && obj.getClass().equals(AddressInfo.class)
         && Objects.equals(toPb(), ((AddressInfo) obj).toPb());
   }

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/DeprecationStatus.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/DeprecationStatus.java
@@ -304,7 +304,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof DeprecationStatus
+    return obj == this
+        || obj instanceof DeprecationStatus
         && Objects.equals(toPb(), ((DeprecationStatus) obj).toPb());
   }
 

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/Disk.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/Disk.java
@@ -235,9 +235,14 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Disk
-        && Objects.equals(toPb(), ((Disk) obj).toPb())
-        && Objects.equals(options, ((Disk) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Disk.class)) {
+      return false;
+    }
+    Disk other = (Disk) obj;
+    return Objects.equals(toPb(), other.toPb()) && Objects.equals(options, other.options);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/DiskImageConfiguration.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/DiskImageConfiguration.java
@@ -122,7 +122,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof DiskImageConfiguration && baseEquals((DiskImageConfiguration) obj);
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(DiskImageConfiguration.class)
+        && baseEquals((DiskImageConfiguration) obj);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/DiskInfo.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/DiskInfo.java
@@ -374,7 +374,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null
+    return obj == this
+        || obj != null
         && obj.getClass().equals(DiskInfo.class)
         && Objects.equals(toPb(), ((DiskInfo) obj).toPb());
   }

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/DiskType.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/DiskType.java
@@ -192,7 +192,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof DiskType && Objects.equals(toPb(), ((DiskType) obj).toPb());
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(DiskType.class)
+        && Objects.equals(toPb(), ((DiskType) obj).toPb());
   }
 
   com.google.api.services.compute.model.DiskType toPb() {

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/GlobalAddressId.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/GlobalAddressId.java
@@ -49,7 +49,7 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof GlobalAddressId && baseEquals((GlobalAddressId) obj);
+    return obj == this || obj instanceof GlobalAddressId && baseEquals((GlobalAddressId) obj);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/GlobalForwardingRuleId.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/GlobalForwardingRuleId.java
@@ -66,7 +66,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof GlobalForwardingRuleId && baseEquals((GlobalForwardingRuleId) obj);
+    return obj == this
+        || obj instanceof GlobalForwardingRuleId
+        && baseEquals((GlobalForwardingRuleId) obj);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/GlobalOperationId.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/GlobalOperationId.java
@@ -49,7 +49,7 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof GlobalOperationId && baseEquals((GlobalOperationId) obj);
+    return obj == this || obj instanceof GlobalOperationId && baseEquals((GlobalOperationId) obj);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/Image.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/Image.java
@@ -188,9 +188,14 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Image
-        && Objects.equals(toPb(), ((Image) obj).toPb())
-        && Objects.equals(options, ((Image) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Image.class)) {
+      return false;
+    }
+    Image other = (Image) obj;
+    return Objects.equals(toPb(), other.toPb()) && Objects.equals(options, other.options);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/ImageDiskConfiguration.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/ImageDiskConfiguration.java
@@ -137,7 +137,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof ImageDiskConfiguration && baseEquals((ImageDiskConfiguration) obj);
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ImageDiskConfiguration.class)
+        && baseEquals((ImageDiskConfiguration) obj);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/ImageInfo.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/ImageInfo.java
@@ -354,7 +354,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null
+    return obj == this
+        || obj != null
         && obj.getClass().equals(ImageInfo.class)
         && Objects.equals(toPb(), ((ImageInfo) obj).toPb());
   }

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/InstanceInfo.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/InstanceInfo.java
@@ -578,7 +578,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof InstanceInfo
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(InstanceInfo.class)
         && Objects.equals(toPb(), ((InstanceInfo) obj).toPb());
   }
 

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/License.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/License.java
@@ -71,7 +71,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof License && Objects.equals(toPb(), ((License) obj).toPb());
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(License.class)
+        && Objects.equals(toPb(), ((License) obj).toPb());
   }
 
   com.google.api.services.compute.model.License toPb() {

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/MachineType.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/MachineType.java
@@ -248,7 +248,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof MachineType && Objects.equals(toPb(), ((MachineType) obj).toPb());
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(MachineType.class)
+        && Objects.equals(toPb(), ((MachineType) obj).toPb());
   }
 
   com.google.api.services.compute.model.MachineType toPb() {

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/Operation.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/Operation.java
@@ -712,9 +712,14 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Operation
-        && Objects.equals(toPb(), ((Operation) obj).toPb())
-        && Objects.equals(options, ((Operation) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Operation.class)) {
+      return false;
+    }
+    Operation other = (Operation) obj;
+    return Objects.equals(toPb(), other.toPb()) && Objects.equals(options, other.options);
   }
 
   com.google.api.services.compute.model.Operation toPb() {

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/Region.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/Region.java
@@ -312,7 +312,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Region && Objects.equals(toPb(), ((Region) obj).toPb());
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(Region.class)
+        && Objects.equals(toPb(), ((Region) obj).toPb());
   }
 
   com.google.api.services.compute.model.Region toPb() {

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/Snapshot.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/Snapshot.java
@@ -189,9 +189,14 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Snapshot
-        && Objects.equals(toPb(), ((Snapshot) obj).toPb())
-        && Objects.equals(options, ((Snapshot) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Snapshot.class)) {
+      return false;
+    }
+    Snapshot other = (Snapshot) obj;
+    return Objects.equals(toPb(), other.toPb()) && Objects.equals(options, other.options);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/SnapshotDiskConfiguration.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/SnapshotDiskConfiguration.java
@@ -141,7 +141,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof SnapshotDiskConfiguration && baseEquals((SnapshotDiskConfiguration) obj);
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(SnapshotDiskConfiguration.class)
+        && baseEquals((SnapshotDiskConfiguration) obj);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/SnapshotInfo.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/SnapshotInfo.java
@@ -421,7 +421,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null
+    return obj == this
+        || obj != null
         && obj.getClass().equals(SnapshotInfo.class)
         && Objects.equals(toPb(), ((SnapshotInfo) obj).toPb());
   }

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/StandardDiskConfiguration.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/StandardDiskConfiguration.java
@@ -82,7 +82,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof StandardDiskConfiguration && baseEquals((StandardDiskConfiguration) obj);
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(StandardDiskConfiguration.class)
+        && baseEquals((StandardDiskConfiguration) obj);
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/StorageImageConfiguration.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/StorageImageConfiguration.java
@@ -158,7 +158,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof StorageImageConfiguration && baseEquals((StorageImageConfiguration) obj);
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(StorageImageConfiguration.class)
+        && Objects.equals(toPb(), ((StorageImageConfiguration) obj).toPb());
   }
 
   @Override

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/Zone.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/Zone.java
@@ -201,7 +201,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Zone && Objects.equals(toPb(), ((Zone) obj).toPb());
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(Zone.class)
+        && Objects.equals(toPb(), ((Zone) obj).toPb());
   }
 
   com.google.api.services.compute.model.Zone toPb() {

diff --git a/gcloud-java-compute/src/main/java/com/google/cloud/compute/ZoneOperationId.java b/gcloud-java-compute/src/main/java/com/google/cloud/compute/ZoneOperationId.java
@@ -76,9 +76,14 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ZoneOperationId
-        && baseEquals((ZoneOperationId) obj)
-        && Objects.equals(zone, ((ZoneOperationId) obj).zone);
+    if (obj == this) {
+      return true;
+    }
+    if (!(obj instanceof ZoneOperationId)) {
+      return false;
+    }
+    ZoneOperationId other = (ZoneOperationId) obj;
+    return baseEquals(other) && Objects.equals(zone, other.zone);
   }
 
   @Override