From 1607b4c7e1e2dfc23020653d9ea26f7ac316dc5d Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Thu, 21 Feb 2019 11:07:31 -0500 Subject: [PATCH 1/4] Gax dependency upgrade --- google-cloud-bom/pom.xml | 2 +- .../google/cloud/bigquery/FieldValueListTest.java | 2 +- .../com/google/cloud/bigquery/FieldValueTest.java | 2 +- google-cloud-clients/google-cloud-core/pom.xml | 5 +++++ .../java/com/google/cloud/storage/BlobInfo.java | 3 ++- google-cloud-clients/pom.xml | 13 +++++++++---- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 5e7fb89e0e77..fbb004d7e891 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -168,7 +168,7 @@ com.google.api gax-bom - 1.39.0 + 1.40.0 pom import 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 index 15b72ec67f3d..779fd85a1091 100644 --- 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 stringPb = ImmutableMap.of("v", "string"); private final Map timestampPb = ImmutableMap.of("v", "42"); private final Map bytesPb = ImmutableMap.of("v", BYTES_BASE64); - private final Map nullPb = ImmutableMap.of("v", Data.nullOf(String.class)); + private final Map nullPb = ImmutableMap.of("v", Data.nullOf(String.class)); private final Map repeatedPb = ImmutableMap.of("v", ImmutableList.of(integerPb, integerPb)); private final Map 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 index d8071746f1df..9ba408f218c1 100644 --- 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_FIELD = ImmutableMap.of("v", "string"); private static final Map TIMESTAMP_FIELD = ImmutableMap.of("v", "42"); private static final Map BYTES_FIELD = ImmutableMap.of("v", BYTES_BASE64); - private static final Map NULL_FIELD = + private static final Map NULL_FIELD = ImmutableMap.of("v", Data.nullOf(String.class)); private static final Map REPEATED_FIELD = ImmutableMap.of("v", ImmutableList.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 index 15dbae2f9ac2..226b30469904 100644 --- a/google-cloud-clients/google-cloud-core/pom.xml +++ b/google-cloud-clients/google-cloud-core/pom.xml @@ -38,6 +38,11 @@ + + com.google.http-client + google-http-client-apache + + com.google.code.findbugs jsr305 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 index d1bea35a9487..148b4a1b0673 100644 --- 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 metadata) { + Map immutableEmptyMap = Data.nullOf(ImmutableEmptyMap.class); this.metadata = metadata != null ? new HashMap<>(metadata) - : Data.>nullOf(ImmutableEmptyMap.class); + : immutableEmptyMap; return this; } diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index d4add2216d34..15b55508ca51 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -155,14 +155,14 @@ 0.80.1-alpha-SNAPSHOT 1.27.0 - 1.39.0 + 1.40.0 1.7.0 - 0.12.0 + 0.13.0 1.18.0 26.0-android - 1.27.0 - 1.27.0 + 1.28.0 + 1.28.0 3.6.1 0.18.0 @@ -318,6 +318,11 @@ google-http-client ${http-client.version} + + com.google.http-client + google-http-client-apache + 2.0.0 + com.google.http-client google-http-client-appengine From 997ea12f94edd43a79b43ac3d10c1c3956020e5b Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Thu, 21 Feb 2019 11:41:04 -0500 Subject: [PATCH 2/4] Gax dependency upgrade --- .../main/java/com/google/cloud/storage/BlobInfo.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 index 148b4a1b0673..e573953550fa 100644 --- 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,11 +483,12 @@ Builder setMediaLink(String mediaLink) { @Override public Builder setMetadata(Map metadata) { - Map immutableEmptyMap = Data.nullOf(ImmutableEmptyMap.class); - this.metadata = - metadata != null - ? new HashMap<>(metadata) - : immutableEmptyMap; + if (metadata != null) { + this.metadata = new HashMap<>(metadata); + } + else { + this.metadata = (Map) Data.nullOf(ImmutableEmptyMap.class); + } return this; } From 51d71f73d107ea966d407a994deec1d50b0d6d67 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Thu, 21 Feb 2019 11:56:55 -0500 Subject: [PATCH 3/4] code formatting fix --- .../src/main/java/com/google/cloud/storage/BlobInfo.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index e573953550fa..652636ac50dd 100644 --- 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 @@ -485,8 +485,7 @@ Builder setMediaLink(String mediaLink) { public Builder setMetadata(Map metadata) { if (metadata != null) { this.metadata = new HashMap<>(metadata); - } - else { + } else { this.metadata = (Map) Data.nullOf(ImmutableEmptyMap.class); } return this; From 21097b86dff68873ca8c5c798a20c46fc2dcb174 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Thu, 21 Feb 2019 13:07:09 -0500 Subject: [PATCH 4/4] Moving google-http-client-apache dependency to storage. --- google-cloud-clients/google-cloud-core/pom.xml | 6 ------ google-cloud-clients/google-cloud-storage/pom.xml | 5 +++++ google-cloud-clients/pom.xml | 5 ----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml index 226b30469904..de8ee5a1efb4 100644 --- a/google-cloud-clients/google-cloud-core/pom.xml +++ b/google-cloud-clients/google-cloud-core/pom.xml @@ -37,12 +37,6 @@ - - - com.google.http-client - google-http-client-apache - - com.google.code.findbugs jsr305 diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml index 8129a56b3c5f..43743c3326d0 100644 --- a/google-cloud-clients/google-cloud-storage/pom.xml +++ b/google-cloud-clients/google-cloud-storage/pom.xml @@ -31,6 +31,11 @@ google-api-services-storage compile + + com.google.http-client + google-http-client-apache + 2.0.0 + diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 15b55508ca51..0da71fdc2a4b 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -318,11 +318,6 @@ google-http-client ${http-client.version} - - com.google.http-client - google-http-client-apache - 2.0.0 - com.google.http-client google-http-client-appengine