Fix style on ExportDataCloudStorageSample

Bill Prin · Bill Prin · commit 8fc1c6ddd465 · 2015-05-28T13:15:16.000-07:00
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryUtils.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/BigqueryUtils.java
@@ -43,7 +43,7 @@ public final class BigqueryUtils {
    * Private contructor to prevent creation of this class, which is just all
    * static helper methods.
    */
-  private BigqueryUtils() {
+  protected BigqueryUtils() {
 
   }
 
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/ExportDataCloudStorageSample.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/ExportDataCloudStorageSample.java
@@ -1,15 +1,15 @@
 /*
-	Copyright 2015, Google, Inc. 
- Licensed under the Apache License, Version 2.0 (the "License"); 
- you may not use this file except in compliance with the License. 
- You may obtain a copy of the License at 
-  
-    http://www.apache.org/licenses/LICENSE-2.0 
-  
- Unless required by applicable law or agreed to in writing, software 
- distributed under the License is distributed on an "AS IS" BASIS, 
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- See the License for the specific language governing permissions and 
+ Copyright 2015, Google, Inc.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
  limitations under the License.
 */
 package com.google.cloud.bigquery.samples;
@@ -24,79 +24,112 @@
 import java.util.Scanner;
 
 /**
- * TODO: Insert description here. (generated by elibixby)
+ * Sample of how to Export Cloud Data.
  */
-public class ExportDataCloudStorageSample extends BigqueryUtils {
+public class ExportDataCloudStorageSample  {
 
+    /**
+     * Protected constructor since this is a collection of static functions.
+     */
+    protected ExportDataCloudStorageSample() {
+        super();
+    }
 
- 
+  /**
+   * This program can be run to demonstrate running a Bigquery query from the
+   * CLI.
+   * @param args Command line args
+   * @throws IOException If there is an error connceting to bigquery
+   * @throws InterruptedException Should never be thrown.
+   */
   // [START main]
-  public static void main(String[] args) throws IOException, InterruptedException{
+  public static void main(final String[] args) throws IOException,
+          InterruptedException {
     Scanner scanner = new Scanner(System.in);
     System.out.println("Enter your project id: ");
     String projectId = scanner.nextLine();
     System.out.println("Enter your dataset id: ");
     String datasetId = scanner.nextLine();
     System.out.println("Enter your table id: ");
     String tableId = scanner.nextLine();
-    System.out.println("Enter the Google Cloud Storage Path to which you'd like to export: ");
+    System.out.println("Enter the Google Cloud Storage Path to which you'd "
+            + "like to export: ");
     String cloudStoragePath = scanner.nextLine();
-    System.out.println("Enter how often to check if your job is complete (milliseconds): ");
+    System.out.println("Enter how often to check if your job is  complete "
+            + "(milliseconds): ");
     long interval = scanner.nextLong();
     scanner.close();
-    
+
     run(cloudStoragePath, projectId, datasetId, tableId, interval);
-    
+
   }
   // [END main]
-  
+
+  /**
+   * Run the bigquery ClI.
+   * @param cloudStoragePath The bucket we are using
+   * @param projectId Project id
+   * @param datasetId datasetid
+   * @param tableId tableid
+   * @param interval interval to wait between polling in milliseconds
+   * @throws IOException Thrown if there is an error connecting to Bigquery.
+   * @throws InterruptedException Should never be thrown
+   */
   // [START run]
-  public static void run( 
-      String cloudStoragePath, 
-      String projectId, 
-      String datasetId, 
-      String tableId,
-      long interval) throws IOException, InterruptedException{
+  public static void run(
+      final String cloudStoragePath,
+      final String projectId,
+      final String datasetId,
+      final String tableId,
+      final long interval) throws IOException, InterruptedException {
 
     Bigquery bigquery = BigqueryServiceFactory.getService();
-    
+
     Job extractJob = extractJob(
         bigquery,
         cloudStoragePath,
         new TableReference()
         .setProjectId(projectId)
         .setDatasetId(datasetId)
         .setTableId(tableId));
-    
-    Bigquery.Jobs.Get get_job = bigquery.jobs().get(
-        extractJob.getJobReference().getProjectId(), 
+
+    Bigquery.Jobs.Get getJob = bigquery.jobs().get(
+        extractJob.getJobReference().getProjectId(),
         extractJob.getJobReference().getJobId());
-    
-    pollJob(get_job, interval);
-    
+
+    BigqueryUtils.pollJob(getJob, interval);
+
     System.out.println("Export is Done!");
-    
+
   }
   // [END run]
-  
-  
+
+
+  /**
+   * A job that extracts data from a table.
+   * @param bigquery Bigquery service to use
+   * @param cloudStoragePath Cloud storage bucket we are inserting into
+   * @param table Table to extract from
+   * @return The job to extract data from the table
+   * @throws IOException Thrown if error connceting to Bigtable
+   */
   // [START extract_job]
   public static Job extractJob(
-      Bigquery bigquery,
-      String cloudStoragePath, 
-      TableReference table) throws IOException{
-    
+      final Bigquery bigquery,
+      final String cloudStoragePath,
+      final TableReference table) throws IOException {
+
     JobConfigurationExtract extract = new JobConfigurationExtract()
     .setSourceTable(table)
     .setDestinationUri(cloudStoragePath);
 
-    return bigquery.jobs().insert(table.getProjectId(), 
+    return bigquery.jobs().insert(table.getProjectId(),
         new Job().setConfiguration(new JobConfiguration().setExtract(extract)))
         .execute();
   }
   // [END extract_job]
 
-  
-  
+
+
 
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public final class BigqueryUtils {`
`43`	`43`	`* Private contructor to prevent creation of this class, which is just all`
`44`	`44`	`* static helper methods.`
`45`	`45`	`*/`
`46`		`- private BigqueryUtils() {`
	`46`	`+ protected BigqueryUtils() {`
`47`	`47`
`48`	`48`	`}`
`49`	`49`