Skip to content

Commit c7f8138

Browse files
pongadpongad
authored
---
yaml --- r: 7779 b: refs/heads/tswast-patch-1 c: 5593253 h: refs/heads/master i: 7777: c5b370f 7775: 8ca6cb3
1 parent 260f981 commit c7f8138

16 files changed

Lines changed: 77 additions & 567 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: f59ac2e4d14c82b1ab4a4998723c8e7dbfdfb8a5
60+
refs/heads/tswast-patch-1: 5593253ec7925d441e398091fa45a88ea5c8a9de
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,18 @@
2121
import com.google.cloud.Role;
2222
import com.google.cloud.pubsub.PubSub;
2323
import com.google.cloud.pubsub.PubSubOptions;
24-
import com.google.cloud.pubsub.PushConfig;
2524
import com.google.cloud.pubsub.Subscription;
2625
import com.google.cloud.pubsub.SubscriptionId;
2726
import com.google.cloud.pubsub.SubscriptionInfo;
2827
import com.google.cloud.pubsub.Topic;
2928
import com.google.cloud.pubsub.TopicInfo;
3029
import com.google.common.collect.ImmutableMap;
31-
32-
import java.util.ArrayList;
30+
import com.google.pubsub.v1.PushConfig;
3331
import java.util.Arrays;
3432
import java.util.HashMap;
3533
import java.util.Iterator;
3634
import java.util.List;
3735
import java.util.Map;
38-
import java.util.concurrent.TimeUnit;
39-
import java.util.concurrent.atomic.AtomicInteger;
4036

4137
/**
4238
* An example of using Google BigQuery.
@@ -336,7 +332,7 @@ SubscriptionInfo parse(String... args) throws Exception {
336332
} else {
337333
SubscriptionInfo.Builder builder = SubscriptionInfo.newBuilder(args[0], args[1]);
338334
if (args.length == 3) {
339-
builder.setPushConfig(PushConfig.of(args[2]));
335+
builder.setPushConfig(PushConfig.newBuilder().setPushEndpoint(args[2]).build());
340336
}
341337
return builder.build();
342338
}
@@ -387,7 +383,7 @@ Tuple<String, PushConfig> parse(String... args) throws Exception {
387383
String subscription = args[0];
388384
PushConfig pushConfig = null;
389385
if (args.length == 2) {
390-
pushConfig = PushConfig.of(args[1]);
386+
pushConfig = PushConfig.newBuilder().setPushEndpoint(args[2]).build();
391387
}
392388
return Tuple.of(subscription, pushConfig);
393389
}

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PubSubSnippets.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,17 @@
2929
import com.google.cloud.Role;
3030
import com.google.cloud.pubsub.PubSub;
3131
import com.google.cloud.pubsub.PubSub.ListOption;
32-
import com.google.cloud.pubsub.PushConfig;
3332
import com.google.cloud.pubsub.Subscription;
3433
import com.google.cloud.pubsub.SubscriptionId;
3534
import com.google.cloud.pubsub.SubscriptionInfo;
3635
import com.google.cloud.pubsub.Topic;
3736
import com.google.cloud.pubsub.TopicInfo;
38-
37+
import com.google.pubsub.v1.PushConfig;
3938
import java.util.Iterator;
4039
import java.util.LinkedList;
4140
import java.util.List;
4241
import java.util.concurrent.ExecutionException;
4342
import java.util.concurrent.Future;
44-
import java.util.concurrent.TimeUnit;
4543

4644
/**
4745
* This class contains a number of snippets for the {@link PubSub} interface.
@@ -224,7 +222,7 @@ public Subscription createSubscriptionAsync(String topicName, String subscriptio
224222
// [VARIABLE "https://www.example.com/push"]
225223
public void replacePushConfig(String subscriptionName, String endpoint) {
226224
// [START replacePushConfig]
227-
PushConfig pushConfig = PushConfig.of(endpoint);
225+
PushConfig pushConfig = PushConfig.newBuilder().setPushEndpoint(endpoint).build();
228226
pubsub.replacePushConfig(subscriptionName, pushConfig);
229227
// [END replacePushConfig]
230228
}
@@ -251,7 +249,7 @@ public void replacePushConfigToPull(String subscriptionName) {
251249
public void replacePushConfigAsync(String subscriptionName, String endpoint)
252250
throws ExecutionException, InterruptedException {
253251
// [START replacePushConfigAsync]
254-
PushConfig pushConfig = PushConfig.of(endpoint);
252+
PushConfig pushConfig = PushConfig.newBuilder().setPushEndpoint(endpoint).build();
255253
Future<Void> future = pubsub.replacePushConfigAsync(subscriptionName, pushConfig);
256254
// ...
257255
future.get();

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionSnippets.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
import com.google.cloud.Identity;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.PushConfig;
2928
import com.google.cloud.pubsub.Subscription;
30-
31-
import java.util.Iterator;
29+
import com.google.pubsub.v1.PushConfig;
3230
import java.util.LinkedList;
3331
import java.util.List;
3432
import java.util.concurrent.ExecutionException;
@@ -116,7 +114,7 @@ public boolean deleteAsync() throws ExecutionException, InterruptedException {
116114
// [VARIABLE "https://www.example.com/push"]
117115
public void replacePushConfig(String endpoint) {
118116
// [START replacePushConfig]
119-
PushConfig pushConfig = PushConfig.of(endpoint);
117+
PushConfig pushConfig = PushConfig.newBuilder().setPushEndpoint(endpoint).build();
120118
subscription.replacePushConfig(pushConfig);
121119
// [END replacePushConfig]
122120
}
@@ -141,7 +139,7 @@ public void replacePushConfigToPull() {
141139
public void replacePushConfigAsync(String endpoint)
142140
throws ExecutionException, InterruptedException {
143141
// [START replacePushConfigAsync]
144-
PushConfig pushConfig = PushConfig.of(endpoint);
142+
PushConfig pushConfig = PushConfig.newBuilder().setPushEndpoint(endpoint).build();
145143
Future<Void> future = subscription.replacePushConfigAsync(pushConfig);
146144
// ...
147145
future.get();

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,19 @@
2929
import com.google.cloud.pubsub.PubSubOptions;
3030
import com.google.cloud.pubsub.Subscription;
3131
import com.google.cloud.pubsub.SubscriptionId;
32-
import com.google.cloud.pubsub.SubscriptionInfo;
3332
import com.google.cloud.pubsub.Topic;
34-
import com.google.cloud.pubsub.TopicInfo;
3533
import com.google.common.collect.Iterators;
3634
import com.google.common.collect.Sets;
37-
35+
import java.util.List;
36+
import java.util.Set;
37+
import java.util.UUID;
38+
import java.util.concurrent.ExecutionException;
3839
import org.junit.AfterClass;
3940
import org.junit.BeforeClass;
4041
import org.junit.Rule;
4142
import org.junit.Test;
4243
import org.junit.rules.Timeout;
4344

44-
import java.util.HashSet;
45-
import java.util.Iterator;
46-
import java.util.List;
47-
import java.util.Set;
48-
import java.util.UUID;
49-
import java.util.concurrent.ExecutionException;
50-
5145
public class ITPubSubSnippets {
5246

5347
private static final String NAME_SUFFIX = UUID.randomUUID().toString();
@@ -120,8 +114,8 @@ public void testTopicAndSubscription() throws ExecutionException, InterruptedExc
120114
pubsubSnippets.replacePushConfigAsync(subscriptionName2, endpoint);
121115
subscription1 = pubsubSnippets.getSubscription(subscriptionName1);
122116
subscription2 = pubsubSnippets.getSubscriptionAsync(subscriptionName2);
123-
assertEquals(endpoint, subscription1.getPushConfig().getEndpoint());
124-
assertEquals(endpoint, subscription2.getPushConfig().getEndpoint());
117+
assertEquals(endpoint, subscription1.getPushConfig().getPushEndpoint());
118+
assertEquals(endpoint, subscription2.getPushConfig().getPushEndpoint());
125119
pubsubSnippets.replacePushConfigToPull(subscriptionName1);
126120
pubsubSnippets.replacePushConfigToPullAsync(subscriptionName2);
127121
subscription1 = pubsubSnippets.getSubscription(subscriptionName1);

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionSnippets.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@
3131
import com.google.cloud.pubsub.SubscriptionInfo;
3232
import com.google.cloud.pubsub.Topic;
3333
import com.google.cloud.pubsub.TopicInfo;
34-
34+
import java.util.UUID;
35+
import java.util.concurrent.ExecutionException;
3536
import org.junit.AfterClass;
3637
import org.junit.BeforeClass;
3738
import org.junit.Test;
3839

39-
import java.util.Iterator;
40-
import java.util.UUID;
41-
import java.util.concurrent.ExecutionException;
42-
4340
public class ITSubscriptionSnippets {
4441

4542
private static final String TOPIC =
@@ -73,13 +70,13 @@ public void testPushConfig() throws ExecutionException, InterruptedException {
7370
String endpoint = "https://" + pubsub.getOptions().getProjectId() + ".appspot.com/push";
7471
subscriptionSnippets.replacePushConfig(endpoint);
7572
Subscription updatedSubscription = pubsub.getSubscription(SUBSCRIPTION);
76-
assertEquals(endpoint, updatedSubscription.getPushConfig().getEndpoint());
73+
assertEquals(endpoint, updatedSubscription.getPushConfig().getPushEndpoint());
7774
subscriptionSnippets.replacePushConfigToPull();
7875
updatedSubscription = pubsub.getSubscription(SUBSCRIPTION);
7976
assertNull(updatedSubscription.getPushConfig());
8077
subscriptionSnippets.replacePushConfigAsync(endpoint);
8178
updatedSubscription = pubsub.getSubscription(SUBSCRIPTION);
82-
assertEquals(endpoint, updatedSubscription.getPushConfig().getEndpoint());
79+
assertEquals(endpoint, updatedSubscription.getPushConfig().getPushEndpoint());
8380
subscriptionSnippets.replacePushConfigToPullAsync();
8481
updatedSubscription = pubsub.getSubscription(SUBSCRIPTION);
8582
assertNull(updatedSubscription.getPushConfig());

‎branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSub.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
package com.google.cloud.pubsub;
1818

1919
import com.google.cloud.AsyncPage;
20-
import com.google.cloud.GrpcServiceOptions.ExecutorFactory;
2120
import com.google.cloud.Page;
2221
import com.google.cloud.Policy;
2322
import com.google.cloud.Service;
23+
import com.google.pubsub.v1.PushConfig;
2424
import java.io.IOException;
2525
import java.util.List;
2626
import java.util.Map;
27-
import java.util.concurrent.ExecutorService;
2827
import java.util.concurrent.Future;
2928

3029
/**

‎branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubImpl.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.google.pubsub.v1.ListTopicsRequest;
5555
import com.google.pubsub.v1.ListTopicsResponse;
5656
import com.google.pubsub.v1.ModifyPushConfigRequest;
57+
import com.google.pubsub.v1.PushConfig;
5758
import java.io.IOException;
5859
import java.util.List;
5960
import java.util.Map;
@@ -326,12 +327,12 @@ public void replacePushConfig(String subscription, PushConfig pushConfig) {
326327

327328
@Override
328329
public Future<Void> replacePushConfigAsync(String subscription, PushConfig pushConfig) {
329-
ModifyPushConfigRequest request = ModifyPushConfigRequest.newBuilder()
330-
.setSubscription(
331-
SubscriberClient.formatSubscriptionName(getOptions().getProjectId(), subscription))
332-
.setPushConfig(pushConfig != null ? pushConfig.toPb()
333-
: com.google.pubsub.v1.PushConfig.getDefaultInstance())
334-
.build();
330+
ModifyPushConfigRequest request =
331+
ModifyPushConfigRequest.newBuilder()
332+
.setSubscription(
333+
SubscriberClient.formatSubscriptionName(getOptions().getProjectId(), subscription))
334+
.setPushConfig(pushConfig != null ? pushConfig : PushConfig.getDefaultInstance())
335+
.build();
335336
return transform(rpc.modify(request), EMPTY_TO_VOID_FUNCTION);
336337
}
337338

0 commit comments

Comments
 (0)