Refactor bigquery function objects builders

mziccard · mziccard · commit b6ad4512fe83 · 2016-02-04T09:39:47.000+01:00
- Remove static builder methods
- Add builder methods params to builder constructors
- Better javadoc for builder classes
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
@@ -41,17 +41,21 @@ public final class Dataset extends DatasetInfo {
   private final BigQueryOptions options;
   private transient BigQuery bigquery;
 
+  /**
+   * A builder for {@code Dataset} objects.
+   */
   public static final class Builder extends DatasetInfo.Builder {
 
     private final BigQuery bigquery;
     private final DatasetInfo.BuilderImpl infoBuilder;
 
-    private Builder(BigQuery bigquery) {
+    Builder(BigQuery bigquery, DatasetId datasetId) {
       this.bigquery = bigquery;
       this.infoBuilder = new DatasetInfo.BuilderImpl();
+      this.infoBuilder.datasetId(datasetId);
     }
 
-    private Builder(Dataset dataset) {
+    Builder(Dataset dataset) {
       this.bigquery = dataset.bigquery;
       this.infoBuilder = new DatasetInfo.BuilderImpl(dataset);
     }
@@ -220,14 +224,6 @@ public BigQuery bigquery() {
     return bigquery;
   }
 
-  static Builder builder(BigQuery bigquery, DatasetId datasetId) {
-    return new Builder(bigquery).datasetId(datasetId);
-  }
-
-  static Builder builder(BigQuery bigquery, String datasetId) {
-    return builder(bigquery, DatasetId.of(datasetId));
-  }
-
   @Override
   public Builder toBuilder() {
     return new Builder(this);
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
@@ -70,6 +70,9 @@ public Dataset apply(DatasetInfo datasetInfo) {
   private final String location;
   private final String selfLink;
 
+  /**
+   * A builder for {@code DatasetInfo} objects.
+   */
   public abstract static class Builder {
 
     /**
@@ -132,9 +135,6 @@ public abstract static class Builder {
     public abstract DatasetInfo build();
   }
 
-  /**
-   * Base class for a {@code DatasetInfo} builder.
-   */
   static final class BuilderImpl extends Builder {
 
     private DatasetId datasetId;
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
@@ -37,17 +37,21 @@ public final class Job extends JobInfo {
   private final BigQueryOptions options;
   private transient BigQuery bigquery;
 
+  /**
+   * A builder for {@code Job} objects.
+   */
   public static final class Builder extends JobInfo.Builder {
 
     private final BigQuery bigquery;
     private final JobInfo.BuilderImpl infoBuilder;
 
-    private Builder(BigQuery bigquery) {
+    Builder(BigQuery bigquery, JobConfiguration configuration) {
       this.bigquery = bigquery;
       this.infoBuilder = new JobInfo.BuilderImpl();
+      this.infoBuilder.configuration(configuration);
     }
 
-    private Builder(Job job) {
+    Builder(Job job) {
       this.bigquery = job.bigquery;
       this.infoBuilder = new JobInfo.BuilderImpl(job);
     }
@@ -171,10 +175,6 @@ public BigQuery bigquery() {
     return bigquery;
   }
 
-  static Builder builder(BigQuery bigquery, JobConfiguration configuration) {
-    return new Builder(bigquery).configuration(configuration);
-  }
-
   @Override
   public Builder toBuilder() {
     return new Builder(this);
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
@@ -89,7 +89,7 @@ public enum WriteDisposition {
   }
 
   /**
-   * Base class for a {@code JobInfo} builder.
+   * A builder for {@code JobInfo} objects.
    */
   public abstract static class Builder {
 
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
@@ -42,14 +42,18 @@ public final class Table extends TableInfo {
   private final BigQueryOptions options;
   private transient BigQuery bigquery;
 
+  /**
+   * A builder for {@code Table} objects.
+   */
   public static class Builder extends TableInfo.Builder {
 
     private final BigQuery bigquery;
     private final TableInfo.BuilderImpl infoBuilder;
 
-    Builder(BigQuery bigquery) {
+    Builder(BigQuery bigquery, TableId tableId, TableDefinition defintion) {
       this.bigquery = bigquery;
       this.infoBuilder = new TableInfo.BuilderImpl();
+      this.infoBuilder.tableId(tableId).definition(defintion);
     }
 
     Builder(Table table) {
@@ -228,7 +232,7 @@ Job copy(String destinationDataset, String destinationTable, BigQuery.JobOption.
 
   /**
    * Starts a BigQuery Job to copy the current table to the provided destination table. Returns the
-   * started {@link Job} object. ddd
+   * started {@link Job} object.
    *
    * @param destinationTable the destination table of the copy job
    * @param options job options
@@ -309,10 +313,6 @@ public BigQuery bigquery() {
     return bigquery;
   }
 
-  static Builder builder(BigQuery bigquery, TableId tableId, TableDefinition definition) {
-    return new Builder(bigquery).tableId(tableId).definition(definition);
-  }
-
   @Override
   public Builder toBuilder() {
     return new Builder(this);
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
@@ -66,7 +66,7 @@ public Table apply(TableInfo tableInfo) {
   private final TableDefinition definition;
 
   /**
-   * Base class for a {@code JobInfo} builder.
+   * A builder for {@code TableInfo} objects.
    */
   public abstract static class Builder {
 
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java
@@ -95,7 +95,7 @@ public void tearDown() throws Exception {
   public void testBuilder() {
     initializeExpectedDataset(2);
     replay(bigquery);
-    Dataset builtDataset = Dataset.builder(serviceMockReturnsOptions, DATASET_ID)
+    Dataset builtDataset = new Dataset.Builder(serviceMockReturnsOptions, DATASET_ID)
         .acl(ACCESS_RULES)
         .creationTime(CREATION_TIME)
         .defaultTableLifetime(DEFAULT_TABLE_EXPIRATION)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
@@ -84,7 +84,7 @@ public void tearDown() throws Exception {
   public void testBuilder() {
     initializeExpectedJob(2);
     replay(bigquery);
-    Job builtJob = Job.builder(serviceMockReturnsOptions, COPY_CONFIGURATION)
+    Job builtJob = new Job.Builder(serviceMockReturnsOptions, COPY_CONFIGURATION)
         .jobId(JOB_ID)
         .statistics(COPY_JOB_STATISTICS)
         .jobId(JOB_ID)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java
@@ -109,7 +109,7 @@ public void tearDown() throws Exception {
   public void testBuilder() {
     initializeExpectedTable(2);
     replay(bigquery);
-    Table builtTable = Table.builder(serviceMockReturnsOptions, TABLE_ID1, TABLE_DEFINITION)
+    Table builtTable = new Table.Builder(serviceMockReturnsOptions, TABLE_ID1, TABLE_DEFINITION)
         .creationTime(CREATION_TIME)
         .description(DESCRIPTION)
         .etag(ETAG)

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public enum WriteDisposition {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
`92`		`- * Base class for a {@code JobInfo} builder.`
	`92`	`+ * A builder for {@code JobInfo} objects.`
`93`	`93`	`*/`
`94`	`94`	`public abstract static class Builder {`
`95`	`95`