Skip to content

Commit 97c0824

Browse files
yoshi-automationyoshi-automation
authored
chore: Re-generated to pick up changes from googleapis (#231)
* changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * bazel: update protobuf, rules_go, gazelle, and gapic-generator-go versions - protobuf v3.12.1 - rules_go v0.23.0 - gazelle v0.21.0 - gapic-generator-go v0.14.1 PiperOrigin-RevId: 313460921 Source-Author: Google APIs <noreply@google.com> Source-Date: Wed May 27 14:10:16 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: c4e37010d74071851ff24121f522e802231ac86e Source-Link: googleapis/googleapis@c4e3701 * Use correct resource type for DetachSubscriptionRequest PiperOrigin-RevId: 313488995 Source-Author: Google APIs <noreply@google.com> Source-Date: Wed May 27 16:45:32 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: eafa840ceec23b44a5c21670288107c661252711 Source-Link: googleapis/googleapis@eafa840 * docs: Add comment for MessageStoragePolicy message PiperOrigin-RevId: 313795529 Source-Author: Google APIs <noreply@google.com> Source-Date: Fri May 29 09:33:18 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: f4bd71cc173d848ec24d28eede271cca9abc411f Source-Link: googleapis/googleapis@f4bd71c * Drop the experimental tag on the Subscription filter and retry policy fields Clarify some retry policy comments PiperOrigin-RevId: 313812131 Source-Author: Google APIs <noreply@google.com> Source-Date: Fri May 29 10:59:34 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: fb21971becb6c0441efc855dabc371825732872c Source-Link: googleapis/googleapis@fb21971 * Add "detached" bool to Subscription PiperOrigin-RevId: 314795690 Source-Author: Google APIs <noreply@google.com> Source-Date: Thu Jun 4 13:43:59 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 86285bbd54fbf9708838219e3422aa47fb8fc0b0 Source-Link: googleapis/googleapis@86285bb
1 parent 6ca2e1e commit 97c0824

47 files changed

Lines changed: 686 additions & 320 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ public final TestIamPermissionsResponse testIamPermissions(
14281428
*
14291429
* <pre><code>
14301430
* try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
1431-
* TopicName subscription = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]");
1431+
* ProjectSubscriptionName subscription = ProjectSubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]");
14321432
* DetachSubscriptionRequest request = DetachSubscriptionRequest.newBuilder()
14331433
* .setSubscription(subscription.toString())
14341434
* .build();
@@ -1453,7 +1453,7 @@ public final DetachSubscriptionResponse detachSubscription(DetachSubscriptionReq
14531453
*
14541454
* <pre><code>
14551455
* try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
1456-
* TopicName subscription = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]");
1456+
* ProjectSubscriptionName subscription = ProjectSubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]");
14571457
* DetachSubscriptionRequest request = DetachSubscriptionRequest.newBuilder()
14581458
* .setSubscription(subscription.toString())
14591459
* .build();

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public void createSubscriptionTest() {
136136
boolean retainAckedMessages = false;
137137
boolean enableMessageOrdering = true;
138138
String filter = "filter-1274492040";
139+
boolean detached = true;
139140
Subscription expectedResponse =
140141
Subscription.newBuilder()
141142
.setName(name2.toString())
@@ -144,6 +145,7 @@ public void createSubscriptionTest() {
144145
.setRetainAckedMessages(retainAckedMessages)
145146
.setEnableMessageOrdering(enableMessageOrdering)
146147
.setFilter(filter)
148+
.setDetached(detached)
147149
.build();
148150
mockSubscriber.addResponse(expectedResponse);
149151

@@ -198,6 +200,7 @@ public void getSubscriptionTest() {
198200
boolean retainAckedMessages = false;
199201
boolean enableMessageOrdering = true;
200202
String filter = "filter-1274492040";
203+
boolean detached = true;
201204
Subscription expectedResponse =
202205
Subscription.newBuilder()
203206
.setName(name.toString())
@@ -206,6 +209,7 @@ public void getSubscriptionTest() {
206209
.setRetainAckedMessages(retainAckedMessages)
207210
.setEnableMessageOrdering(enableMessageOrdering)
208211
.setFilter(filter)
212+
.setDetached(detached)
209213
.build();
210214
mockSubscriber.addResponse(expectedResponse);
211215

@@ -253,6 +257,7 @@ public void updateSubscriptionTest() {
253257
boolean retainAckedMessages = false;
254258
boolean enableMessageOrdering = true;
255259
String filter = "filter-1274492040";
260+
boolean detached = true;
256261
Subscription expectedResponse =
257262
Subscription.newBuilder()
258263
.setName(name.toString())
@@ -261,6 +266,7 @@ public void updateSubscriptionTest() {
261266
.setRetainAckedMessages(retainAckedMessages)
262267
.setEnableMessageOrdering(enableMessageOrdering)
263268
.setFilter(filter)
269+
.setDetached(detached)
264270
.build();
265271
mockSubscriber.addResponse(expectedResponse);
266272

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,8 @@ public void detachSubscriptionTest() {
631631
DetachSubscriptionResponse expectedResponse = DetachSubscriptionResponse.newBuilder().build();
632632
mockPublisher.addResponse(expectedResponse);
633633

634-
TopicName subscription = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]");
634+
ProjectSubscriptionName subscription =
635+
ProjectSubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]");
635636
DetachSubscriptionRequest request =
636637
DetachSubscriptionRequest.newBuilder().setSubscription(subscription.toString()).build();
637638

@@ -642,7 +643,8 @@ public void detachSubscriptionTest() {
642643
Assert.assertEquals(1, actualRequests.size());
643644
DetachSubscriptionRequest actualRequest = (DetachSubscriptionRequest) actualRequests.get(0);
644645

645-
Assert.assertEquals(subscription, TopicName.parse(actualRequest.getSubscription()));
646+
Assert.assertEquals(
647+
subscription, ProjectSubscriptionName.parse(actualRequest.getSubscription()));
646648
Assert.assertTrue(
647649
channelProvider.isHeaderSent(
648650
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -656,7 +658,8 @@ public void detachSubscriptionExceptionTest() throws Exception {
656658
mockPublisher.addException(exception);
657659

658660
try {
659-
TopicName subscription = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]");
661+
ProjectSubscriptionName subscription =
662+
ProjectSubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]");
660663
DetachSubscriptionRequest request =
661664
DetachSubscriptionRequest.newBuilder().setSubscription(subscription.toString()).build();
662665

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
142142
*
143143
* @return The subscription.
144144
*/
145+
@java.lang.Override
145146
public java.lang.String getSubscription() {
146147
java.lang.Object ref = subscription_;
147148
if (ref instanceof java.lang.String) {
@@ -167,6 +168,7 @@ public java.lang.String getSubscription() {
167168
*
168169
* @return The bytes for subscription.
169170
*/
171+
@java.lang.Override
170172
public com.google.protobuf.ByteString getSubscriptionBytes() {
171173
java.lang.Object ref = subscription_;
172174
if (ref instanceof java.lang.String) {

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
164164
*
165165
* @return The name.
166166
*/
167+
@java.lang.Override
167168
public java.lang.String getName() {
168169
java.lang.Object ref = name_;
169170
if (ref instanceof java.lang.String) {
@@ -193,6 +194,7 @@ public java.lang.String getName() {
193194
*
194195
* @return The bytes for name.
195196
*/
197+
@java.lang.Override
196198
public com.google.protobuf.ByteString getNameBytes() {
197199
java.lang.Object ref = name_;
198200
if (ref instanceof java.lang.String) {
@@ -228,6 +230,7 @@ public com.google.protobuf.ByteString getNameBytes() {
228230
*
229231
* @return The subscription.
230232
*/
233+
@java.lang.Override
231234
public java.lang.String getSubscription() {
232235
java.lang.Object ref = subscription_;
233236
if (ref instanceof java.lang.String) {
@@ -260,6 +263,7 @@ public java.lang.String getSubscription() {
260263
*
261264
* @return The bytes for subscription.
262265
*/
266+
@java.lang.Override
263267
public com.google.protobuf.ByteString getSubscriptionBytes() {
264268
java.lang.Object ref = subscription_;
265269
if (ref instanceof java.lang.String) {
@@ -307,13 +311,15 @@ public int getLabelsCount() {
307311
*
308312
* <code>map&lt;string, string&gt; labels = 3;</code>
309313
*/
314+
@java.lang.Override
310315
public boolean containsLabels(java.lang.String key) {
311316
if (key == null) {
312317
throw new java.lang.NullPointerException();
313318
}
314319
return internalGetLabels().getMap().containsKey(key);
315320
}
316321
/** Use {@link #getLabelsMap()} instead. */
322+
@java.lang.Override
317323
@java.lang.Deprecated
318324
public java.util.Map<java.lang.String, java.lang.String> getLabels() {
319325
return getLabelsMap();
@@ -328,6 +334,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
328334
*
329335
* <code>map&lt;string, string&gt; labels = 3;</code>
330336
*/
337+
@java.lang.Override
331338
public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
332339
return internalGetLabels().getMap();
333340
}
@@ -341,6 +348,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
341348
*
342349
* <code>map&lt;string, string&gt; labels = 3;</code>
343350
*/
351+
@java.lang.Override
344352
public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
345353
if (key == null) {
346354
throw new java.lang.NullPointerException();
@@ -358,6 +366,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
358366
*
359367
* <code>map&lt;string, string&gt; labels = 3;</code>
360368
*/
369+
@java.lang.Override
361370
public java.lang.String getLabelsOrThrow(java.lang.String key) {
362371
if (key == null) {
363372
throw new java.lang.NullPointerException();
@@ -1077,13 +1086,15 @@ public int getLabelsCount() {
10771086
*
10781087
* <code>map&lt;string, string&gt; labels = 3;</code>
10791088
*/
1089+
@java.lang.Override
10801090
public boolean containsLabels(java.lang.String key) {
10811091
if (key == null) {
10821092
throw new java.lang.NullPointerException();
10831093
}
10841094
return internalGetLabels().getMap().containsKey(key);
10851095
}
10861096
/** Use {@link #getLabelsMap()} instead. */
1097+
@java.lang.Override
10871098
@java.lang.Deprecated
10881099
public java.util.Map<java.lang.String, java.lang.String> getLabels() {
10891100
return getLabelsMap();
@@ -1098,6 +1109,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
10981109
*
10991110
* <code>map&lt;string, string&gt; labels = 3;</code>
11001111
*/
1112+
@java.lang.Override
11011113
public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
11021114
return internalGetLabels().getMap();
11031115
}
@@ -1111,6 +1123,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
11111123
*
11121124
* <code>map&lt;string, string&gt; labels = 3;</code>
11131125
*/
1126+
@java.lang.Override
11141127
public java.lang.String getLabelsOrDefault(
11151128
java.lang.String key, java.lang.String defaultValue) {
11161129
if (key == null) {
@@ -1129,6 +1142,7 @@ public java.lang.String getLabelsOrDefault(
11291142
*
11301143
* <code>map&lt;string, string&gt; labels = 3;</code>
11311144
*/
1145+
@java.lang.Override
11321146
public java.lang.String getLabelsOrThrow(java.lang.String key) {
11331147
if (key == null) {
11341148
throw new java.lang.NullPointerException();

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeadLetterPolicy.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
139139
*
140140
* @return The deadLetterTopic.
141141
*/
142+
@java.lang.Override
142143
public java.lang.String getDeadLetterTopic() {
143144
java.lang.Object ref = deadLetterTopic_;
144145
if (ref instanceof java.lang.String) {
@@ -168,6 +169,7 @@ public java.lang.String getDeadLetterTopic() {
168169
*
169170
* @return The bytes for deadLetterTopic.
170171
*/
172+
@java.lang.Override
171173
public com.google.protobuf.ByteString getDeadLetterTopicBytes() {
172174
java.lang.Object ref = deadLetterTopic_;
173175
if (ref instanceof java.lang.String) {
@@ -201,6 +203,7 @@ public com.google.protobuf.ByteString getDeadLetterTopicBytes() {
201203
*
202204
* @return The maxDeliveryAttempts.
203205
*/
206+
@java.lang.Override
204207
public int getMaxDeliveryAttempts() {
205208
return maxDeliveryAttempts_;
206209
}
@@ -698,6 +701,7 @@ public Builder setDeadLetterTopicBytes(com.google.protobuf.ByteString value) {
698701
*
699702
* @return The maxDeliveryAttempts.
700703
*/
704+
@java.lang.Override
701705
public int getMaxDeliveryAttempts() {
702706
return maxDeliveryAttempts_;
703707
}

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
127127
*
128128
* @return The snapshot.
129129
*/
130+
@java.lang.Override
130131
public java.lang.String getSnapshot() {
131132
java.lang.Object ref = snapshot_;
132133
if (ref instanceof java.lang.String) {
@@ -152,6 +153,7 @@ public java.lang.String getSnapshot() {
152153
*
153154
* @return The bytes for snapshot.
154155
*/
156+
@java.lang.Override
155157
public com.google.protobuf.ByteString getSnapshotBytes() {
156158
java.lang.Object ref = snapshot_;
157159
if (ref instanceof java.lang.String) {

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
127127
*
128128
* @return The subscription.
129129
*/
130+
@java.lang.Override
130131
public java.lang.String getSubscription() {
131132
java.lang.Object ref = subscription_;
132133
if (ref instanceof java.lang.String) {
@@ -152,6 +153,7 @@ public java.lang.String getSubscription() {
152153
*
153154
* @return The bytes for subscription.
154155
*/
156+
@java.lang.Override
155157
public com.google.protobuf.ByteString getSubscriptionBytes() {
156158
java.lang.Object ref = subscription_;
157159
if (ref instanceof java.lang.String) {

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
127127
*
128128
* @return The topic.
129129
*/
130+
@java.lang.Override
130131
public java.lang.String getTopic() {
131132
java.lang.Object ref = topic_;
132133
if (ref instanceof java.lang.String) {
@@ -152,6 +153,7 @@ public java.lang.String getTopic() {
152153
*
153154
* @return The bytes for topic.
154155
*/
156+
@java.lang.Override
155157
public com.google.protobuf.ByteString getTopicBytes() {
156158
java.lang.Object ref = topic_;
157159
if (ref instanceof java.lang.String) {

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DetachSubscriptionRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
127127
*
128128
* @return The subscription.
129129
*/
130+
@java.lang.Override
130131
public java.lang.String getSubscription() {
131132
java.lang.Object ref = subscription_;
132133
if (ref instanceof java.lang.String) {
@@ -152,6 +153,7 @@ public java.lang.String getSubscription() {
152153
*
153154
* @return The bytes for subscription.
154155
*/
156+
@java.lang.Override
155157
public com.google.protobuf.ByteString getSubscriptionBytes() {
156158
java.lang.Object ref = subscription_;
157159
if (ref instanceof java.lang.String) {

0 commit comments

Comments
 (0)