lint + fix unittest

Author: logachev

google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java

@@ -1065,7 +1065,10 @@ private BigQuery getBigQueryConnection() {
     }
 
     BigQueryOptions options = bigQueryOptions.setHeaderProvider(HEADER_PROVIDER).build();
-    options.setDefaultJobCreationMode(this.useStatelessQueryMode ? JobCreationMode.JOB_CREATION_OPTIONAL : JobCreationMode.JOB_CREATION_REQUIRED);
+    options.setDefaultJobCreationMode(
+        this.useStatelessQueryMode
+            ? JobCreationMode.JOB_CREATION_OPTIONAL
+            : JobCreationMode.JOB_CREATION_REQUIRED);
     return options.getService();
   }
 

google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnectionProperty.java

@@ -36,7 +36,7 @@ public String getDescription() {
   }
 
   public String getDefaultValue() {
-    if (defaultValueSupplier != null){
+    if (defaultValueSupplier != null) {
       return defaultValueSupplier.get();
     }
     return defaultValue;

google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtility.java

@@ -38,6 +38,7 @@
 import java.awt.Desktop;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -365,13 +366,15 @@ private static GoogleCredentials getGoogleServiceAccountCredentials(
 
       final String keyPath = pvtKeyPath != null ? pvtKeyPath : pvtKey;
       PrivateKey key = null;
-      InputStream stream = null;
       byte[] keyBytes = pvtKey != null ? pvtKey.getBytes() : null;
-      
+
       if (isFileExists(keyPath)) {
-        keyBytes = Files.readAllBytes(Paths.get(keyPath));
+        InputStream stream = new FileInputStream(keyPath);
+        keyBytes = stream.readNBytes(1024 * 1024);
+        stream.close();
       }
 
+      InputStream stream = null;
       if (isJson(keyBytes)) {
         stream = new ByteArrayInputStream(keyBytes);
       } else if (pvtKey != null) {

google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcUrlUtility.java

@@ -26,9 +26,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.function.Supplier;
 import java.util.Properties;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -682,7 +682,10 @@ static String parseStringProperty(
   }
 
   static String parseStringPropertyLazyDefault(
-      String url, String propertyName, Supplier<String> defaultValueSupplier, String callerClassName) {
+      String url,
+      String propertyName,
+      Supplier<String> defaultValueSupplier,
+      String callerClassName) {
     LOG.finest("++enter++\t" + callerClassName);
     String parsedValue = BigQueryJdbcUrlUtility.parseUriProperty(url, propertyName);
     if (parsedValue != null) {

google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryConnectionTest.java

@@ -40,6 +40,9 @@ public class BigQueryConnectionTest {
 
   private static final String DEFAULT_VERSION = "0.0.0";
   private static final String DEFAULT_JDBC_TOKEN_VALUE = "Google-BigQuery-JDBC-Driver";
+  private static final String BASE_URL =
+      "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+          + "OAuthType=2;OAuthAccessToken=redacted;ProjectId=project;";
   private String expectedVersion;
 
   @Before
@@ -386,34 +389,31 @@ public void testBigQueryReadClientKeepAliveSettings() throws SQLException, IOExc
 
   @Test
   public void testBigQueryJobCreationMode_required() throws Exception {
-    String url =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
-            + "OAuthType=3;JobCreationMode=1;";
-      try (BigQueryConnection connection = new BigQueryConnection(url)) {
-        BigQuery bq = connection.getBigQuery();
-        assertEquals(bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_REQUIRED);
-      }
+    String url = BASE_URL + "JobCreationMode=1;";
+    try (BigQueryConnection connection = new BigQueryConnection(url)) {
+      BigQuery bq = connection.getBigQuery();
+      assertEquals(
+          bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_REQUIRED);
+    }
   }
 
   @Test
   public void testBigQueryJobCreationMode_optional() throws Exception {
-    String url =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
-            + "OAuthType=3;JobCreationMode=2;";
-      try (BigQueryConnection connection = new BigQueryConnection(url)) {
-        BigQuery bq = connection.getBigQuery();
-        assertEquals(bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
-      }
+    String url = BASE_URL + "JobCreationMode=2;";
+    try (BigQueryConnection connection = new BigQueryConnection(url)) {
+      BigQuery bq = connection.getBigQuery();
+      assertEquals(
+          bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
+    }
   }
 
   @Test
   public void testBigQueryJobCreationMode_default() throws Exception {
-    String url =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
-            + "OAuthType=3;";
-      try (BigQueryConnection connection = new BigQueryConnection(url)) {
-        BigQuery bq = connection.getBigQuery();
-        assertEquals(bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
-      }
+    String url = BASE_URL;
+    try (BigQueryConnection connection = new BigQueryConnection(url)) {
+      BigQuery bq = connection.getBigQuery();
+      assertEquals(
+          bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
+    }
   }
 }