Upgrade gax dependency to 1.40.0. (#4534)

kolea2 · web-flow · commit 9cf9e1a59b7b · 2019-02-21T14:22:33.000-05:00
* Gax dependency upgrade

* Gax dependency upgrade

* code formatting fix

* Moving google-http-client-apache dependency to storage.
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
@@ -168,7 +168,7 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-bom</artifactId>
-        <version>1.39.0</version>
+        <version>1.40.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java
@@ -56,7 +56,7 @@ public class FieldValueListTest {
   private final Map<String, String> stringPb = ImmutableMap.of("v", "string");
   private final Map<String, String> timestampPb = ImmutableMap.of("v", "42");
   private final Map<String, String> bytesPb = ImmutableMap.of("v", BYTES_BASE64);
-  private final Map<String, Object> nullPb = ImmutableMap.of("v", Data.nullOf(String.class));
+  private final Map<String, String> nullPb = ImmutableMap.of("v", Data.nullOf(String.class));
   private final Map<String, Object> repeatedPb =
       ImmutableMap.<String, Object>of("v", ImmutableList.<Object>of(integerPb, integerPb));
   private final Map<String, Object> recordPb =
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java
@@ -42,7 +42,7 @@ public class FieldValueTest {
   private static final Map<String, String> STRING_FIELD = ImmutableMap.of("v", "string");
   private static final Map<String, String> TIMESTAMP_FIELD = ImmutableMap.of("v", "42");
   private static final Map<String, String> BYTES_FIELD = ImmutableMap.of("v", BYTES_BASE64);
-  private static final Map<String, Object> NULL_FIELD =
+  private static final Map<String, String> NULL_FIELD =
       ImmutableMap.of("v", Data.nullOf(String.class));
   private static final Map<String, Object> REPEATED_FIELD =
       ImmutableMap.<String, Object>of("v", ImmutableList.<Object>of(INTEGER_FIELD, INTEGER_FIELD));
diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
@@ -37,7 +37,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -31,6 +31,11 @@
       <artifactId>google-api-services-storage</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-apache</artifactId>
+      <version>2.0.0</version>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java
@@ -483,10 +483,11 @@ Builder setMediaLink(String mediaLink) {
 
     @Override
     public Builder setMetadata(Map<String, String> metadata) {
-      this.metadata =
-          metadata != null
-              ? new HashMap<>(metadata)
-              : Data.<Map<String, String>>nullOf(ImmutableEmptyMap.class);
+      if (metadata != null) {
+        this.metadata = new HashMap<>(metadata);
+      } else {
+        this.metadata = (Map<String, String>) Data.nullOf(ImmutableEmptyMap.class);
+      }
       return this;
     }
 
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
@@ -155,14 +155,14 @@
     <bom.version>0.80.1-alpha-SNAPSHOT</bom.version><!-- {x-version-update:google-cloud-bom:current} -->
     <api-client.version>1.27.0</api-client.version>
     <!-- make sure to keep gax version in sync with google-cloud-bom -->
-    <gax.version>1.39.0</gax.version>
+    <gax.version>1.40.0</gax.version>
     <api.common.java.version>1.7.0</api.common.java.version>
-    <google.auth.version>0.12.0</google.auth.version>
+    <google.auth.version>0.13.0</google.auth.version>
     <grpc.version>1.18.0</grpc.version>
     <!-- We are currently using the *-android version to support JDK7. -->
     <guava.version>26.0-android</guava.version>
-    <http-client.version>1.27.0</http-client.version>
-    <oauth-client.version>1.27.0</oauth-client.version>
+    <http-client.version>1.28.0</http-client.version>
+    <oauth-client.version>1.28.0</oauth-client.version>
     <protobuf.version>3.6.1</protobuf.version>
     <!-- make sure to keep opencensus version in sync with grpc -->
     <opencensus.version>0.18.0</opencensus.version>
