From f4d05164c527ebc5aa3c5d5104624d65ac26389a Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 30 Nov 2018 12:10:53 -0800 Subject: [PATCH 1/2] Regenerate pubsub client --- .../java/com/google/pubsub/v1/TopicNames.java | 1 + .../pubsub/v1/stub/PublisherStubSettings.java | 13 ++++++------- .../pubsub/v1/stub/SubscriberStubSettings.java | 15 +++++++-------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java index 8d45672bdcd4..dfd8a64e7a6f 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java @@ -14,6 +14,7 @@ package com.google.pubsub.v1; + // AUTO-GENERATED DOCUMENTATION AND CLASS @javax.annotation.Generated("by GAPIC protoc plugin") public class TopicNames { diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java index 4214080d9433..612fbb6b44a9 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java +++ b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java @@ -292,7 +292,9 @@ public String extractNextToken(ListTopicsResponse payload) { @Override public Iterable extractResources(ListTopicsResponse payload) { - return payload.getTopicsList(); + return payload.getTopicsList() != null + ? payload.getTopicsList() + : ImmutableList.of(); } }; @@ -332,7 +334,9 @@ public String extractNextToken(ListTopicSubscriptionsResponse payload) { @Override public Iterable extractResources(ListTopicSubscriptionsResponse payload) { - return payload.getSubscriptionsList(); + return payload.getSubscriptionsList() != null + ? payload.getSubscriptionsList() + : ImmutableList.of(); } }; @@ -476,11 +480,6 @@ public static class Builder extends StubSettings.BuildernewArrayList( StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); - definitions.put( - "http_get", - ImmutableSet.copyOf( - Lists.newArrayList( - StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList())); definitions.put( "one_plus_delivery", diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java index 7072eb0a55eb..3fa5e0d9a915 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java +++ b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java @@ -267,7 +267,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde /** Returns a builder for the default ChannelProvider for this service. */ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { - return InstantiatingGrpcChannelProvider.newBuilder().setMaxInboundMessageSize(20 << 20); // 20MB + return InstantiatingGrpcChannelProvider.newBuilder(); } public static TransportChannelProvider defaultTransportChannelProvider() { @@ -355,7 +355,9 @@ public String extractNextToken(ListSubscriptionsResponse payload) { @Override public Iterable extractResources(ListSubscriptionsResponse payload) { - return payload.getSubscriptionsList(); + return payload.getSubscriptionsList() != null + ? payload.getSubscriptionsList() + : ImmutableList.of(); } }; @@ -389,7 +391,9 @@ public String extractNextToken(ListSnapshotsResponse payload) { @Override public Iterable extractResources(ListSnapshotsResponse payload) { - return payload.getSnapshotsList(); + return payload.getSnapshotsList() != null + ? payload.getSnapshotsList() + : ImmutableList.of(); } }; @@ -484,11 +488,6 @@ public static class Builder extends StubSettings.BuildernewArrayList( - StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList())); RETRYABLE_CODE_DEFINITIONS = definitions.build(); } From 2e97a70b0f9fab5bfb864fdbc594048c1f2dfb37 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 5 Dec 2018 13:43:16 -0800 Subject: [PATCH 2/2] Fix the default maxInboundMessageSize config via synth --- .../src/main/java/com/google/pubsub/v1/TopicNames.java | 1 - .../google/cloud/pubsub/v1/stub/SubscriberStubSettings.java | 2 +- google-cloud-clients/google-cloud-pubsub/synth.py | 6 ++++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java index dfd8a64e7a6f..8d45672bdcd4 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java @@ -14,7 +14,6 @@ package com.google.pubsub.v1; - // AUTO-GENERATED DOCUMENTATION AND CLASS @javax.annotation.Generated("by GAPIC protoc plugin") public class TopicNames { diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java index 3fa5e0d9a915..d66dca70da74 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java +++ b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java @@ -267,7 +267,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde /** Returns a builder for the default ChannelProvider for this service. */ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { - return InstantiatingGrpcChannelProvider.newBuilder(); + return InstantiatingGrpcChannelProvider.newBuilder().setMaxInboundMessageSize(20 << 20); // 20MB } public static TransportChannelProvider defaultTransportChannelProvider() { diff --git a/google-cloud-clients/google-cloud-pubsub/synth.py b/google-cloud-clients/google-cloud-pubsub/synth.py index f8862c71e023..0601c96b8bb0 100644 --- a/google-cloud-clients/google-cloud-pubsub/synth.py +++ b/google-cloud-clients/google-cloud-pubsub/synth.py @@ -35,6 +35,12 @@ s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src') s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src') + s.replace( + '**/stub/SubscriberStubSettings.java', + r'return InstantiatingGrpcChannelProvider\.newBuilder\(\);', + 'return InstantiatingGrpcChannelProvider.newBuilder().setMaxInboundMessageSize(20 << 20); // 20MB' + ) + java.format_code('./src') java.format_code(f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src') java.format_code(f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')