Fixing Codacy warnings

garrettjonesgoogle · garrettjonesgoogle · commit 38451c226dd8 · 2016-12-06T16:35:11.000-08:00
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameter.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameter.java
@@ -18,18 +18,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.api.services.bigquery.Bigquery.Jobs.Query;
-import com.google.cloud.bigquery.Field.Builder;
-import com.google.cloud.bigquery.Field.Mode;
-import com.google.cloud.bigquery.Field.Type;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 
 /**
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
@@ -394,7 +394,7 @@ com.google.api.services.bigquery.model.QueryParameterValue toValuePb() {
     com.google.api.services.bigquery.model.QueryParameterValue valuePb =
         new com.google.api.services.bigquery.model.QueryParameterValue();
     valuePb.setValue(value);
-    if (arrayValues != null && arrayValues.size() > 0) {
+    if (arrayValues != null && !arrayValues.isEmpty()) {
       valuePb.setArrayValues(
           Lists.transform(arrayValues, QueryParameterValue.TO_VALUE_PB_FUNCTION));
     }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryRequest.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryRequest.java
@@ -19,13 +19,11 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.base.MoreObjects;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.concurrent.Immutable;
 
 /**
  * Google Cloud BigQuery Query Request. This class can be used to run a BigQuery SQL query and
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -75,6 +75,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import com.google.common.io.BaseEncoding;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -89,7 +90,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
@@ -860,10 +860,7 @@ public void testNamedQueryParameters() throws InterruptedException {
     QueryResponse response = queryAndWaitForResponse(request);
     assertEquals(QUERY_RESULT_SCHEMA, response.getResult().getSchema());
     int rowCount = 0;
-    for (List<FieldValue> row : response.getResult().getValues()) {
-      rowCount++;
-    }
-    assertEquals(2, rowCount);
+    assertEquals(2, Iterables.size(response.getResult().getValues()));
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ com.google.api.services.bigquery.model.QueryParameterValue toValuePb() {`
`394`	`394`	`com.google.api.services.bigquery.model.QueryParameterValue valuePb =`
`395`	`395`	`new com.google.api.services.bigquery.model.QueryParameterValue();`
`396`	`396`	`valuePb.setValue(value);`
`397`		`- if (arrayValues != null && arrayValues.size() > 0) {`
	`397`	`+ if (arrayValues != null && !arrayValues.isEmpty()) {`
`398`	`398`	`valuePb.setArrayValues(`
`399`	`399`	`Lists.transform(arrayValues, QueryParameterValue.TO_VALUE_PB_FUNCTION));`
`400`	`400`	`}`