Rename equals to baseEquals and hashCode to baseHashCode in BaseTableInfo

mziccard · mziccard · commit e1ddedb296a9 · 2016-01-22T19:50:59.000+01:00
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/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/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
`@@ -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
`@@ -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`