From 16abf36655b4f47c6c337b074156098f09ec5577 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 21 Nov 2018 00:40:27 -0800 Subject: [PATCH] Regenerate logging client --- .../logging/v2/stub/ConfigServiceV2StubSettings.java | 8 ++++++-- .../v2/stub/LoggingServiceV2StubSettings.java | 12 +++++++++--- .../v2/stub/MetricsServiceV2StubSettings.java | 4 +++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java index 8916f2ab8922..abe760a9a13d 100644 --- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java +++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java @@ -280,7 +280,9 @@ public String extractNextToken(ListSinksResponse payload) { @Override public Iterable extractResources(ListSinksResponse payload) { - return payload.getSinksList(); + return payload.getSinksList() != null + ? payload.getSinksList() + : ImmutableList.of(); } }; @@ -316,7 +318,9 @@ public String extractNextToken(ListExclusionsResponse payload) { @Override public Iterable extractResources(ListExclusionsResponse payload) { - return payload.getExclusionsList(); + return payload.getExclusionsList() != null + ? payload.getExclusionsList() + : ImmutableList.of(); } }; diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java index 097f634aba94..e1353f8a61e6 100644 --- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java +++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java @@ -262,7 +262,9 @@ public String extractNextToken(ListLogEntriesResponse payload) { @Override public Iterable extractResources(ListLogEntriesResponse payload) { - return payload.getEntriesList(); + return payload.getEntriesList() != null + ? payload.getEntriesList() + : ImmutableList.of(); } }; @@ -307,7 +309,9 @@ public String extractNextToken(ListMonitoredResourceDescriptorsResponse payload) @Override public Iterable extractResources( ListMonitoredResourceDescriptorsResponse payload) { - return payload.getResourceDescriptorsList(); + return payload.getResourceDescriptorsList() != null + ? payload.getResourceDescriptorsList() + : ImmutableList.of(); } }; @@ -341,7 +345,9 @@ public String extractNextToken(ListLogsResponse payload) { @Override public Iterable extractResources(ListLogsResponse payload) { - return payload.getLogNamesList(); + return payload.getLogNamesList() != null + ? payload.getLogNamesList() + : ImmutableList.of(); } }; diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java index 6f62a06191f2..9a6af63de6bd 100644 --- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java +++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java @@ -236,7 +236,9 @@ public String extractNextToken(ListLogMetricsResponse payload) { @Override public Iterable extractResources(ListLogMetricsResponse payload) { - return payload.getMetricsList(); + return payload.getMetricsList() != null + ? payload.getMetricsList() + : ImmutableList.of(); } };