Skip to content

Commit 582449f

Browse files
yoshi-automationchingor13
yoshi-automation
authored and
chingor13
committed
---
yaml --- r: 17703 b: refs/heads/autosynth-trace c: f3d0703 h: refs/heads/master i: 17701: 8568b79 17699: 3f8bf42 17695: ae80d7a
1 parent 58710fc commit 582449f

4 files changed

Lines changed: 19 additions & 15 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ refs/heads/autosynth-spanner: 9bff86d057df31e04c76d72865e8e073ac5794fb
144144
refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232
145145
refs/heads/autosynth-tasks: b0cdb991f3f75345151a3f68db1aab273dfc069b
146146
refs/heads/autosynth-texttospeech: 2dcc5dc22be0f456caa1b6a8a4bcdace2641239c
147-
refs/heads/autosynth-trace: 07348682bf2640969553fa7a64e309678ae533d6
147+
refs/heads/autosynth-trace: f3d070350ae78d030012ec258ddfe32c7eb27c9d
148148
refs/heads/autosynth-websecurityscanner: d4febbffb6c648b74faec62fe90e20adadc9a7d3
149149
refs/heads/bigquerystorage: 06db74d123d7f8a3ef48755c2fcabed09faf8e64
150150
refs/heads/elharo-patch-1: ce159ef828d3c545991ff78e7b6e0d912a9453e9

‎branches/autosynth-trace/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,9 @@ public String extractNextToken(ListTopicsResponse payload) {
292292

293293
@Override
294294
public Iterable<Topic> extractResources(ListTopicsResponse payload) {
295-
return payload.getTopicsList();
295+
return payload.getTopicsList() != null
296+
? payload.getTopicsList()
297+
: ImmutableList.<Topic>of();
296298
}
297299
};
298300

@@ -332,7 +334,9 @@ public String extractNextToken(ListTopicSubscriptionsResponse payload) {
332334

333335
@Override
334336
public Iterable<String> extractResources(ListTopicSubscriptionsResponse payload) {
335-
return payload.getSubscriptionsList();
337+
return payload.getSubscriptionsList() != null
338+
? payload.getSubscriptionsList()
339+
: ImmutableList.<String>of();
336340
}
337341
};
338342

@@ -476,11 +480,6 @@ public static class Builder extends StubSettings.Builder<PublisherStubSettings,
476480
ImmutableSet.copyOf(
477481
Lists.<StatusCode.Code>newArrayList(
478482
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
479-
definitions.put(
480-
"http_get",
481-
ImmutableSet.copyOf(
482-
Lists.<StatusCode.Code>newArrayList(
483-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
484483
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
485484
definitions.put(
486485
"one_plus_delivery",

‎branches/autosynth-trace/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,9 @@ public String extractNextToken(ListSubscriptionsResponse payload) {
355355

356356
@Override
357357
public Iterable<Subscription> extractResources(ListSubscriptionsResponse payload) {
358-
return payload.getSubscriptionsList();
358+
return payload.getSubscriptionsList() != null
359+
? payload.getSubscriptionsList()
360+
: ImmutableList.<Subscription>of();
359361
}
360362
};
361363

@@ -389,7 +391,9 @@ public String extractNextToken(ListSnapshotsResponse payload) {
389391

390392
@Override
391393
public Iterable<Snapshot> extractResources(ListSnapshotsResponse payload) {
392-
return payload.getSnapshotsList();
394+
return payload.getSnapshotsList() != null
395+
? payload.getSnapshotsList()
396+
: ImmutableList.<Snapshot>of();
393397
}
394398
};
395399

@@ -484,11 +488,6 @@ public static class Builder extends StubSettings.Builder<SubscriberStubSettings,
484488
StatusCode.Code.INTERNAL,
485489
StatusCode.Code.RESOURCE_EXHAUSTED,
486490
StatusCode.Code.UNAVAILABLE)));
487-
definitions.put(
488-
"http_get",
489-
ImmutableSet.copyOf(
490-
Lists.<StatusCode.Code>newArrayList(
491-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
492491
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
493492
RETRYABLE_CODE_DEFINITIONS = definitions.build();
494493
}

‎branches/autosynth-trace/google-cloud-clients/google-cloud-pubsub/synth.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src')
3636
s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')
3737

38+
s.replace(
39+
'**/stub/SubscriberStubSettings.java',
40+
r'return InstantiatingGrpcChannelProvider\.newBuilder\(\);',
41+
'return InstantiatingGrpcChannelProvider.newBuilder().setMaxInboundMessageSize(20 << 20); // 20MB'
42+
)
43+
3844
java.format_code('./src')
3945
java.format_code(f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src')
4046
java.format_code(f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')

0 commit comments

Comments
 (0)