Merge pull request googleapis#573 from mziccard/rename-equals

aozarov · aozarov · commit 055681310664 · 2016-01-22T12:55:41.000-08:00
Rename equals and hashCode in base abstract classes
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java
@@ -386,14 +386,12 @@ public String toString() {
     return toStringHelper().toString();
   }
 
-  @Override
-  public int hashCode() {
+  protected final int baseHashCode() {
     return Objects.hash(tableId);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof BaseTableInfo && Objects.equals(toPb(), ((BaseTableInfo) obj).toPb());
+  protected final boolean baseEquals(BaseTableInfo tableInfo) {
+    return Objects.equals(toPb(), tableInfo.toPb());
   }
 
   Table toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobInfo.java
@@ -178,12 +178,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof CopyJobInfo && Objects.equals(toPb(), ((CopyJobInfo) obj).toPb());
+    return obj instanceof CopyJobInfo && baseEquals((CopyJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceTables, destinationTable, createDisposition,
+    return Objects.hash(baseHashCode(), sourceTables, destinationTable, createDisposition,
         writeDisposition);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -107,13 +107,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ExternalTableInfo
-        && Objects.equals(toPb(), ((ExternalTableInfo) obj).toPb());
+    return obj instanceof ExternalTableInfo && baseEquals((ExternalTableInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), configuration);
+    return Objects.hash(baseHashCode(), configuration);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobInfo.java
@@ -212,12 +212,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ExtractJobInfo && Objects.equals(toPb(), ((ExtractJobInfo) obj).toPb());
+    return obj instanceof ExtractJobInfo && baseEquals((ExtractJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
+    return Objects.hash(baseHashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
         format, compression);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -264,14 +264,12 @@ public String toString() {
     return toStringHelper().toString();
   }
 
-  @Override
-  public int hashCode() {
+  protected final int baseHashCode() {
     return Objects.hash(jobId);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof JobInfo && Objects.equals(toPb(), ((JobInfo) obj).toPb());
+  protected final boolean baseEquals(JobInfo jobInfo) {
+    return Objects.equals(toPb(), jobInfo.toPb());
   }
 
   Job toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobInfo.java
@@ -117,12 +117,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof LoadJobInfo && Objects.equals(toPb(), ((LoadJobInfo) obj).toPb());
+    return obj instanceof LoadJobInfo && baseEquals((LoadJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), sourceUris, configuration);
+    return Objects.hash(baseHashCode(), sourceUris, configuration);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobInfo.java
@@ -447,12 +447,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof QueryJobInfo && Objects.equals(toPb(), ((QueryJobInfo) obj).toPb());
+    return obj instanceof QueryJobInfo && baseEquals((QueryJobInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), allowLargeResults, createDisposition, destinationTable,
+    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/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -215,12 +215,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof TableInfo && Objects.equals(toPb(), ((TableInfo) obj).toPb());
+    return obj instanceof TableInfo && baseEquals((TableInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), location, streamingBuffer);
+    return Objects.hash(baseHashCode(), location, streamingBuffer);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
@@ -146,12 +146,12 @@ ToStringHelper toStringHelper() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof ViewInfo && Objects.equals(toPb(), ((ViewInfo) obj).toPb());
+    return obj instanceof ViewInfo && baseEquals((ViewInfo) obj);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), query, userDefinedFunctions);
+    return Objects.hash(baseHashCode(), query, userDefinedFunctions);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -386,14 +386,12 @@ public String toString() {`
`386`	`386`	`return toStringHelper().toString();`
`387`	`387`	`}`
`388`	`388`
`389`		`- @Override`
`390`		`- public int hashCode() {`
	`389`	`+ protected final int baseHashCode() {`
`391`	`390`	`return Objects.hash(tableId);`
`392`	`391`	`}`
`393`	`392`
`394`		`- @Override`
`395`		`- public boolean equals(Object obj) {`
`396`		`- return obj instanceof BaseTableInfo && Objects.equals(toPb(), ((BaseTableInfo) obj).toPb());`
	`393`	`+ protected final boolean baseEquals(BaseTableInfo tableInfo) {`
	`394`	`+ return Objects.equals(toPb(), tableInfo.toPb());`
`397`	`395`	`}`
`398`	`396`
`399`	`397`	`Table toPb() {`
Original file line number	Diff line number	Diff line change
`@@ -178,12 +178,12 @@ ToStringHelper toStringHelper() {`
`178`	`178`
`179`	`179`	`@Override`
`180`	`180`	`public boolean equals(Object obj) {`
`181`		`- return obj instanceof CopyJobInfo && Objects.equals(toPb(), ((CopyJobInfo) obj).toPb());`
	`181`	`+ return obj instanceof CopyJobInfo && baseEquals((CopyJobInfo) obj);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`@Override`
`185`	`185`	`public int hashCode() {`
`186`		`- return Objects.hash(super.hashCode(), sourceTables, destinationTable, createDisposition,`
	`186`	`+ return Objects.hash(baseHashCode(), sourceTables, destinationTable, createDisposition,`
`187`	`187`	`writeDisposition);`
`188`	`188`	`}`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,12 @@ ToStringHelper toStringHelper() {`
`107`	`107`
`108`	`108`	`@Override`
`109`	`109`	`public boolean equals(Object obj) {`
`110`		`- return obj instanceof ExternalTableInfo`
`111`		`- && Objects.equals(toPb(), ((ExternalTableInfo) obj).toPb());`
	`110`	`+ return obj instanceof ExternalTableInfo && baseEquals((ExternalTableInfo) obj);`
`112`	`111`	`}`
`113`	`112`
`114`	`113`	`@Override`
`115`	`114`	`public int hashCode() {`
`116`		`- return Objects.hash(super.hashCode(), configuration);`
	`115`	`+ return Objects.hash(baseHashCode(), configuration);`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -212,12 +212,12 @@ ToStringHelper toStringHelper() {`
`212`	`212`
`213`	`213`	`@Override`
`214`	`214`	`public boolean equals(Object obj) {`
`215`		`- return obj instanceof ExtractJobInfo && Objects.equals(toPb(), ((ExtractJobInfo) obj).toPb());`
	`215`	`+ return obj instanceof ExtractJobInfo && baseEquals((ExtractJobInfo) obj);`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`@Override`
`219`	`219`	`public int hashCode() {`
`220`		`- return Objects.hash(super.hashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,`
	`220`	`+ return Objects.hash(baseHashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,`
`221`	`221`	`format, compression);`
`222`	`222`	`}`
`223`	`223`
Original file line number	Diff line number	Diff line change
`@@ -264,14 +264,12 @@ public String toString() {`
`264`	`264`	`return toStringHelper().toString();`
`265`	`265`	`}`
`266`	`266`
`267`		`- @Override`
`268`		`- public int hashCode() {`
	`267`	`+ protected final int baseHashCode() {`
`269`	`268`	`return Objects.hash(jobId);`
`270`	`269`	`}`
`271`	`270`
`272`		`- @Override`
`273`		`- public boolean equals(Object obj) {`
`274`		`- return obj instanceof JobInfo && Objects.equals(toPb(), ((JobInfo) obj).toPb());`
	`271`	`+ protected final boolean baseEquals(JobInfo jobInfo) {`
	`272`	`+ return Objects.equals(toPb(), jobInfo.toPb());`
`275`	`273`	`}`
`276`	`274`
`277`	`275`	`Job toPb() {`
Original file line number	Diff line number	Diff line change
`@@ -117,12 +117,12 @@ ToStringHelper toStringHelper() {`
`117`	`117`
`118`	`118`	`@Override`
`119`	`119`	`public boolean equals(Object obj) {`
`120`		`- return obj instanceof LoadJobInfo && Objects.equals(toPb(), ((LoadJobInfo) obj).toPb());`
	`120`	`+ return obj instanceof LoadJobInfo && baseEquals((LoadJobInfo) obj);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`@Override`
`124`	`124`	`public int hashCode() {`
`125`		`- return Objects.hash(super.hashCode(), sourceUris, configuration);`
	`125`	`+ return Objects.hash(baseHashCode(), sourceUris, configuration);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -447,12 +447,12 @@ ToStringHelper toStringHelper() {`
`447`	`447`
`448`	`448`	`@Override`
`449`	`449`	`public boolean equals(Object obj) {`
`450`		`- return obj instanceof QueryJobInfo && Objects.equals(toPb(), ((QueryJobInfo) obj).toPb());`
	`450`	`+ return obj instanceof QueryJobInfo && baseEquals((QueryJobInfo) obj);`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`@Override`
`454`	`454`	`public int hashCode() {`
`455`		`- return Objects.hash(super.hashCode(), allowLargeResults, createDisposition, destinationTable,`
	`455`	`+ return Objects.hash(baseHashCode(), allowLargeResults, createDisposition, destinationTable,`
`456`	`456`	`defaultDataset, flattenResults, priority, query, tableDefinitions, useQueryCache,`
`457`	`457`	`userDefinedFunctions, writeDisposition, dryRun);`
`458`	`458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,12 +215,12 @@ ToStringHelper toStringHelper() {`
`215`	`215`
`216`	`216`	`@Override`
`217`	`217`	`public boolean equals(Object obj) {`
`218`		`- return obj instanceof TableInfo && Objects.equals(toPb(), ((TableInfo) obj).toPb());`
	`218`	`+ return obj instanceof TableInfo && baseEquals((TableInfo) obj);`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`@Override`
`222`	`222`	`public int hashCode() {`
`223`		`- return Objects.hash(super.hashCode(), location, streamingBuffer);`
	`223`	`+ return Objects.hash(baseHashCode(), location, streamingBuffer);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,12 @@ ToStringHelper toStringHelper() {`
`146`	`146`
`147`	`147`	`@Override`
`148`	`148`	`public boolean equals(Object obj) {`
`149`		`- return obj instanceof ViewInfo && Objects.equals(toPb(), ((ViewInfo) obj).toPb());`
	`149`	`+ return obj instanceof ViewInfo && baseEquals((ViewInfo) obj);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`@Override`
`153`	`153`	`public int hashCode() {`
`154`		`- return Objects.hash(super.hashCode(), query, userDefinedFunctions);`
	`154`	`+ return Objects.hash(baseHashCode(), query, userDefinedFunctions);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`@Override`