Fix SyncQuerySample

Bill Prin · Bill Prin · commit 005689fa20ce · 2015-05-28T14:37:13.000-07:00
diff --git a/bigquery/src/main/java/com/google/cloud/bigquery/samples/SyncQuerySample.java b/bigquery/src/main/java/com/google/cloud/bigquery/samples/SyncQuerySample.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,58 +24,74 @@
 import java.util.Iterator;
 import java.util.Scanner;
 /**
- * TODO: Insert description here. (generated by elibixby)
+ * Runs a synchronous query against Bigtable.
  */
-public class SyncQuerySample extends BigqueryUtils{
+public class SyncQuerySample {
+
 
+    /**
+     * Protected because this is a collection of static methods.
+     */
+    protected SyncQuerySample() {
+
+    }
 
   //[START main]
  /**
-  * @param args
-  * @throws IOException
+  * @param args args
+  * @throws IOException ioexceptino
   */
- public static void main(String[] args) 
-     throws IOException{
-
-  
+ public static void main(final String[] args)
+     throws IOException {
    Scanner scanner = new Scanner(System.in);
    System.out.println("Enter your project id: ");
    String projectId = scanner.nextLine();
    System.out.println("Enter your query string: ");
    String queryString = scanner.nextLine();
-   System.out.println("Enter how long to wait for the query to complete (in milliseconds):\n " +
-                      "(if longer than 10 seconds, use an asynchronous query)");
+   System.out.println("Enter how long to wait for the query to complete"
+           + " (in milliseconds):\n "
+           + "(if longer than 10 seconds, use an asynchronous query)");
    long waitTime = scanner.nextLong();
    scanner.close();
-   Iterator<GetQueryResultsResponse> pages = run(projectId, queryString, waitTime);
-   while(pages.hasNext()){
-     printRows(pages.next().getRows(), System.out);
+   Iterator<GetQueryResultsResponse> pages = run(projectId, queryString,
+           waitTime);
+   while (pages.hasNext()) {
+     BigqueryUtils.printRows(pages.next().getRows(), System.out);
    }
  }
  // [END main]
-  
 
+
+    /**
+     *
+      * @param projectId project id from developer console
+     * @param queryString query to run
+     * @param waitTime Timeout in milliseconds before we abort
+     * @return Iterator that pages through the results of the query
+     * @throws IOException ioexception
+     */
  // [START run]
- public static Iterator<GetQueryResultsResponse> run(String projectId, 
-     String queryString, 
-     long waitTime) throws IOException{
+ public static Iterator<GetQueryResultsResponse> run(final String projectId,
+     final String queryString,
+     final long waitTime) throws IOException {
    Bigquery bigquery = BigqueryServiceFactory.getService();
    //Wait until query is done with 10 second timeout, at most 5 retries on error
    QueryResponse query = bigquery.jobs().query(
        projectId,
-       new QueryRequest().setTimeoutMs(waitTime).setQuery(queryString)).execute();
-   
-   //Make a request to get the results of the query 
+       new QueryRequest().setTimeoutMs(waitTime).setQuery(queryString))
+           .execute();
+
+   //Make a request to get the results of the query
    //(timeout is zero since job should be complete)
-   
+
    GetQueryResults getRequest = bigquery.jobs().getQueryResults(
        query.getJobReference().getProjectId(),
        query.getJobReference().getJobId());
-   
-   
-   return getPages(getRequest);
+
+
+   return BigqueryUtils.getPages(getRequest);
  }
  // [END run]
- 
+
 
 }
