Make job configuration classes final

googleapis · Apr 14, 2016 · d1d3463 · d1d3463
1 parent bd53cca
commit d1d3463
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 33 deletions.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/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 class CopyJobConfiguration extends JobConfiguration {
+public final class CopyJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = 1140509641399762967L;
 
@@ -180,15 +180,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public final boolean equals(Object obj) {
+  public boolean equals(Object obj) {
     return obj == this
-        || obj != null
-        && obj.getClass().equals(CopyJobConfiguration.class)
+        || obj instanceof CopyJobConfiguration
         && baseEquals((CopyJobConfiguration) obj);
   }
 
   @Override
-  public final int hashCode() {
+  public int hashCode() {
     return Objects.hash(baseHashCode(), sourceTables, destinationTable, createDisposition,
         writeDisposition);
   }

diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/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 class ExtractJobConfiguration extends JobConfiguration {
+public final class ExtractJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = 4147749733166593761L;
 
@@ -210,15 +210,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public final boolean equals(Object obj) {
+  public boolean equals(Object obj) {
     return obj == this
-        || obj != null
-        && obj.getClass().equals(ExtractJobConfiguration.class)
+        || obj instanceof ExtractJobConfiguration
         && baseEquals((ExtractJobConfiguration) obj);
   }
 
   @Override
-  public final int hashCode() {
+  public int hashCode() {
     return Objects.hash(baseHashCode(), sourceTable, destinationUris, printHeader, fieldDelimiter,
         format, compression);
   }

diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/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 class LoadJobConfiguration extends JobConfiguration implements LoadConfiguration {
+public final class LoadJobConfiguration extends JobConfiguration implements LoadConfiguration {
 
   private static final long serialVersionUID = -2673554846792429829L;
 
@@ -268,15 +268,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public final boolean equals(Object obj) {
+  public boolean equals(Object obj) {
     return obj == this
-        || obj != null
-        && obj.getClass().equals(LoadJobConfiguration.class)
+        || obj instanceof LoadJobConfiguration
         && baseEquals((LoadJobConfiguration) obj);
   }
 
   @Override
-  public final int hashCode() {
+  public int hashCode() {
     return Objects.hash(baseHashCode(), sourceUris);
   }
 

diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java
@@ -35,10 +35,23 @@
  * Google BigQuery Query Job configuration. A Query Job runs a query against BigQuery data. Query
  * job configurations have {@link JobConfiguration.Type#QUERY} type.
  */
-public class QueryJobConfiguration extends JobConfiguration {
+public final class QueryJobConfiguration extends JobConfiguration {
 
   private static final long serialVersionUID = -1108948249081804890L;
 
+  private final String query;
+  private final TableId destinationTable;
+  private final Map<String, ExternalTableDefinition> tableDefinitions;
+  private final List<UserDefinedFunction> userDefinedFunctions;
+  private final CreateDisposition createDisposition;
+  private final WriteDisposition writeDisposition;
+  private final DatasetId defaultDataset;
+  private final Priority priority;
+  private final Boolean allowLargeResults;
+  private final Boolean useQueryCache;
+  private final Boolean flattenResults;
+  private final Boolean dryRun;
+
   /**
    * Priority levels for a query. If not specified the priority is assumed to be
    * {@link Priority#INTERACTIVE}.
@@ -59,19 +72,6 @@ public enum Priority {
     BATCH
   }
 
-  private final String query;
-  private final TableId destinationTable;
-  private final Map<String, ExternalTableDefinition> tableDefinitions;
-  private final List<UserDefinedFunction> userDefinedFunctions;
-  private final CreateDisposition createDisposition;
-  private final WriteDisposition writeDisposition;
-  private final DatasetId defaultDataset;
-  private final Priority priority;
-  private final Boolean allowLargeResults;
-  private final Boolean useQueryCache;
-  private final Boolean flattenResults;
-  private final Boolean dryRun;
-
   public static final class Builder
       extends JobConfiguration.Builder<QueryJobConfiguration, Builder> {
 
@@ -449,15 +449,14 @@ ToStringHelper toStringHelper() {
   }
 
   @Override
-  public final boolean equals(Object obj) {
+  public boolean equals(Object obj) {
     return obj == this
-        || obj != null
-        && obj.getClass().equals(QueryJobConfiguration.class)
+        || obj instanceof QueryJobConfiguration
         && baseEquals((QueryJobConfiguration) obj);
   }
 
   @Override
-  public final int hashCode() {
+  public int hashCode() {
     return Objects.hash(baseHashCode(), allowLargeResults, createDisposition, destinationTable,
         defaultDataset, flattenResults, priority, query, tableDefinitions, useQueryCache,
         userDefinedFunctions, writeDisposition, dryRun);