Enable mocking of functional classes and configurations

mziccard · mziccard · commit 51c418a74777 · 2016-04-11T17:49:07.000+02:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
@@ -31,7 +31,7 @@
  * Google BigQuery copy job configuration. A copy job copies an existing table to another new or
  * existing table. Copy job configurations have {@link JobConfiguration.Type#COPY} type.
  */
-public final class CopyJobConfiguration extends JobConfiguration {
+public class CopyJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = 1140509641399762967L;
 
@@ -180,12 +180,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof CopyJobConfiguration && baseEquals((CopyJobConfiguration) obj);
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof CopyJobConfiguration
+        && baseEquals((CopyJobConfiguration) obj);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(baseHashCode(), sourceTables, destinationTable, createDisposition,
         writeDisposition);
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
@@ -34,7 +34,7 @@
  * {@link DatasetInfo}.
  * </p>
  */
-public final class Dataset extends DatasetInfo {
+public class Dataset extends DatasetInfo {
 
   private static final long serialVersionUID = -4272921483363065593L;
 
@@ -230,14 +230,15 @@ public Builder toBuilder() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof Dataset
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof Dataset
         && Objects.equals(toPb(), ((Dataset) obj).toPb())
         && Objects.equals(options, ((Dataset) obj).options);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), options);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableDefinition.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableDefinition.java
@@ -255,12 +255,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof ExternalTableDefinition && baseEquals((ExternalTableDefinition) obj);
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof ExternalTableDefinition
+        && baseEquals((ExternalTableDefinition) obj);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(baseHashCode(), compression, ignoreUnknownValues, maxBadRecords,
         formatOptions, sourceUris);
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
@@ -30,7 +30,7 @@
  * Cloud Storage. The extract destination provided as URIs that point to objects in Google Cloud
  * Storage. Extract job configurations have {@link JobConfiguration.Type#EXTRACT} type.
  */
-public final class ExtractJobConfiguration extends JobConfiguration {
+public class ExtractJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = 4147749733166593761L;
 
@@ -210,12 +210,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof ExtractJobConfiguration && baseEquals((ExtractJobConfiguration) obj);
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof ExtractJobConfiguration
+        && baseEquals((ExtractJobConfiguration) obj);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(baseHashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
         format, compression);
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
@@ -30,7 +30,7 @@
  * {@link JobInfo}.
  * </p>
  */
-public final class Job extends JobInfo {
+public class Job extends JobInfo {
 
   private static final long serialVersionUID = -4324100991693024704L;
 
@@ -178,14 +178,15 @@ public Builder toBuilder() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof Job
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof Job
         && Objects.equals(toPb(), ((Job) obj).toPb())
         && Objects.equals(options, ((Job) obj).options);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), options);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
@@ -30,7 +30,7 @@
  * table. Data is provided as URIs that point to objects in Google Cloud Storage. Load job
  * configurations have {@link JobConfiguration.Type#LOAD} type.
  */
-public final class LoadJobConfiguration extends JobConfiguration implements LoadConfiguration {
+public class LoadJobConfiguration extends JobConfiguration implements LoadConfiguration {
 
   private static final long serialVersionUID = -2673554846792429829L;
 
@@ -268,12 +268,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof LoadJobConfiguration && baseEquals((LoadJobConfiguration) obj);
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof LoadJobConfiguration
+        && baseEquals((LoadJobConfiguration) obj);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(baseHashCode(), sourceUris);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
@@ -35,7 +35,7 @@
  * Google BigQuery Query Job configuration. A Query Job runs a query against BigQuery data. Query
  * job configurations have {@link JobConfiguration.Type#QUERY} type.
  */
-public final class QueryJobConfiguration extends JobConfiguration {
+public class QueryJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = -1108948249081804890L;
 
@@ -449,12 +449,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof QueryJobConfiguration && baseEquals((QueryJobConfiguration) obj);
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof QueryJobConfiguration
+        && baseEquals((QueryJobConfiguration) obj);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(baseHashCode(), allowLargeResults, createDisposition, destinationTable,
         defaultDataset, flattenResults, priority, query, tableDefinitions, useQueryCache,
         userDefinedFunctions, writeDisposition, dryRun);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
@@ -373,8 +373,9 @@ public String toString() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(computeRatioAvg, computeRatioMax, generatedId, name, readRatioAvg, readRatioMax,
-        recordsRead, recordsWritten, steps, waitRatioAvg, waitRatioMax, writeRatioAvg);
+    return Objects.hash(computeRatioAvg, computeRatioMax, generatedId, name, readRatioAvg,
+        readRatioMax, recordsRead, recordsWritten, steps, waitRatioAvg, waitRatioMax,
+        writeRatioAvg);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/StandardTableDefinition.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/StandardTableDefinition.java
@@ -252,12 +252,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof StandardTableDefinition && baseEquals((StandardTableDefinition) obj);
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof StandardTableDefinition
+        && baseEquals((StandardTableDefinition) obj);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(baseHashCode(), numBytes, numRows, location, streamingBuffer);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -35,7 +35,7 @@
  * {@link TableInfo}.
  * </p>
  */
-public final class Table extends TableInfo {
+public class Table extends TableInfo {
 
   private static final long serialVersionUID = 5744556727066570096L;
 
@@ -322,14 +322,15 @@ public Builder toBuilder() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof Table
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof Table
         && Objects.equals(toPb(), ((Table) obj).toPb())
         && Objects.equals(options, ((Table) obj).options);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), options);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewDefinition.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewDefinition.java
@@ -33,7 +33,7 @@
  *
  * @see <a href="https://cloud.google.com/bigquery/querying-data#views">Views</a>
  */
-public final class ViewDefinition extends TableDefinition {
+public class ViewDefinition extends TableDefinition {
 
   private static final long serialVersionUID = -8789311196910794545L;
 
@@ -146,12 +146,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof ViewDefinition && baseEquals((ViewDefinition) obj);
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof ViewDefinition
+        && baseEquals((ViewDefinition) obj);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(baseHashCode(), query, userDefinedFunctions);
   }
 
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java
@@ -192,7 +192,10 @@ public Builder toBuilder() {
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public final boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
     if (obj == null || !obj.getClass().equals(ChangeRequest.class)) {
       return false;
     } else {
@@ -204,7 +207,7 @@ public boolean equals(Object obj) {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), options, zone);
   }
 
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/RecordSet.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/RecordSet.java
@@ -276,13 +276,15 @@ public Type type() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(name, rrdatas, ttl, type);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof RecordSet && Objects.equals(this.toPb(), ((RecordSet) obj).toPb());
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof RecordSet
+        && Objects.equals(this.toPb(), ((RecordSet) obj).toPb());
   }
 
   ResourceRecordSet toPb() {
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/Zone.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/Zone.java
@@ -196,13 +196,15 @@ public Dns dns() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof Zone && Objects.equals(toPb(), ((Zone) obj).toPb())
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof Zone
+        && Objects.equals(toPb(), ((Zone) obj).toPb())
         && Objects.equals(options, ((Zone) obj).options);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), options);
   }
 
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -257,13 +257,15 @@ public Builder toBuilder() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof Project && Objects.equals(toPb(), ((Project) obj).toPb())
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof Project
+        && Objects.equals(toPb(), ((Project) obj).toPb())
         && Objects.equals(options, ((Project) obj).options);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), options);
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -526,7 +526,9 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return obj instanceof Blob && Objects.equals(toPb(), ((Blob) obj).toPb())
+    return this == obj
+        || obj instanceof Blob
+        && Objects.equals(toPb(), ((Blob) obj).toPb())
         && Objects.equals(options, ((Blob) obj).options);
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -49,7 +49,7 @@
  * {@link BucketInfo}.
  * </p>
  */
-public final class Bucket extends BucketInfo {
+public class Bucket extends BucketInfo {
 
   private static final long serialVersionUID = 8574601739542252586L;
 
@@ -714,13 +714,15 @@ public Builder toBuilder() {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof Bucket && Objects.equals(toPb(), ((Bucket) obj).toPb())
+  public final boolean equals(Object obj) {
+    return this == obj
+        || obj instanceof Bucket
+        && Objects.equals(toPb(), ((Bucket) obj).toPb())
         && Objects.equals(options, ((Bucket) obj).options);
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), options);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -255,12 +255,14 @@ ToStringHelper toStringHelper() {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`@Override`
`258`		`- public boolean equals(Object obj) {`
`259`		`- return obj instanceof ExternalTableDefinition && baseEquals((ExternalTableDefinition) obj);`
	`258`	`+ public final boolean equals(Object obj) {`
	`259`	`+ return this == obj`
	`260`	`+ \|\| obj instanceof ExternalTableDefinition`
	`261`	`+ && baseEquals((ExternalTableDefinition) obj);`
`260`	`262`	`}`
`261`	`263`
`262`	`264`	`@Override`
`263`		`- public int hashCode() {`
	`265`	`+ public final int hashCode() {`
`264`	`266`	`return Objects.hash(baseHashCode(), compression, ignoreUnknownValues, maxBadRecords,`
`265`	`267`	`formatOptions, sourceUris);`
`266`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,12 +252,14 @@ ToStringHelper toStringHelper() {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`@Override`
`255`		`- public boolean equals(Object obj) {`
`256`		`- return obj instanceof StandardTableDefinition && baseEquals((StandardTableDefinition) obj);`
	`255`	`+ public final boolean equals(Object obj) {`
	`256`	`+ return this == obj`
	`257`	`+ \|\| obj instanceof StandardTableDefinition`
	`258`	`+ && baseEquals((StandardTableDefinition) obj);`
`257`	`259`	`}`
`258`	`260`
`259`	`261`	`@Override`
`260`		`- public int hashCode() {`
	`262`	`+ public final int hashCode() {`
`261`	`263`	`return Objects.hash(baseHashCode(), numBytes, numRows, location, streamingBuffer);`
`262`	`264`	`}`
`263`	`265`