Skip to content

Commit 13570f1

Browse files
michaelbausormichaelbausor
committed
Manual updates to support pubsub changes
1 parent b97ad05 commit 13570f1

File tree

15 files changed

+170
-1222
lines changed

15 files changed

+170
-1222
lines changed

‎google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java‎

Lines changed: 43 additions & 43 deletions
Large diffs are not rendered by default.

‎google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.cloud.pubsub.spi.v1.AckReplyConsumer;
2121
import com.google.cloud.pubsub.spi.v1.MessageReceiver;
2222
import com.google.cloud.pubsub.spi.v1.Subscriber;
23-
import com.google.cloud.pubsub.spi.v1.SubscriberClient;
23+
import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient;
2424
import com.google.common.util.concurrent.MoreExecutors;
2525
import com.google.pubsub.v1.PubsubMessage;
2626
import com.google.pubsub.v1.PushConfig;
@@ -37,8 +37,8 @@ public static void main(String... args) throws Exception {
3737
TopicName topic = TopicName.create("test-project", "test-topic");
3838
SubscriptionName subscription = SubscriptionName.create("test-project", "test-subscription");
3939

40-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
41-
subscriberClient.createSubscription(subscription, topic, PushConfig.getDefaultInstance(), 0);
40+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
41+
subscriptionAdminClient.createSubscription(subscription, topic, PushConfig.getDefaultInstance(), 0);
4242
}
4343

4444
MessageReceiver receiver =

‎google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.api.gax.core.ApiFuture;
2020
import com.google.cloud.pubsub.spi.v1.Publisher;
21-
import com.google.cloud.pubsub.spi.v1.PublisherClient;
21+
import com.google.cloud.pubsub.spi.v1.TopicAdminClient;
2222
import com.google.protobuf.ByteString;
2323
import com.google.pubsub.v1.PubsubMessage;
2424
import com.google.pubsub.v1.TopicName;
@@ -33,8 +33,8 @@
3333
public class CreateTopicAndPublishMessages {
3434
public static void main(String... args) throws Exception {
3535
TopicName topic = TopicName.create("test-project", "test-topic");
36-
try (PublisherClient publisherClient = PublisherClient.create()) {
37-
publisherClient.createTopic(topic);
36+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
37+
topicAdminClient.createTopic(topic);
3838
}
3939

4040
Publisher publisher = null;

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberClientSnippets.java renamed to google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
/** This class contains snippets for the {@link SubscriberClient} interface. */
17+
/** This class contains snippets for the {@link SubscriptionAdminClient} interface. */
1818

1919
package com.google.cloud.examples.pubsub.snippets;
2020

2121
import com.google.cloud.Identity;
2222
import com.google.cloud.Role;
2323
import com.google.cloud.ServiceOptions;
2424
import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse;
25-
import com.google.cloud.pubsub.spi.v1.PublisherClient;
26-
import com.google.cloud.pubsub.spi.v1.SubscriberClient;
25+
import com.google.cloud.pubsub.spi.v1.TopicAdminClient;
26+
import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient;
2727
import com.google.iam.v1.Binding;
2828
import com.google.iam.v1.Policy;
2929
import com.google.iam.v1.TestIamPermissionsResponse;
@@ -39,12 +39,12 @@
3939
import java.util.LinkedList;
4040
import java.util.List;
4141

42-
/** This class contains a number of snippets for the {@link SubscriberClient} interface. */
43-
public class SubscriberClientSnippets {
42+
/** This class contains a number of snippets for the {@link SubscriptionAdminClient} interface. */
43+
public class SubscriptionAdminClientSnippets {
4444

4545
private final String projectId;
4646

47-
public SubscriberClientSnippets() {
47+
public SubscriptionAdminClientSnippets() {
4848
this.projectId = ServiceOptions.getDefaultProjectId();
4949
}
5050

@@ -54,13 +54,13 @@ public String getProjectId() {
5454

5555
/** Example of creating a pull subscription for a topic. */
5656
public Subscription createSubscription(String topic, String subscriptionId) throws Exception {
57-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
57+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
5858
// [START createSubscription]
5959
TopicName topicName = TopicName.create(projectId, topic);
6060
SubscriptionName subscriptionName =
6161
SubscriptionName.create(projectId, subscriptionId);
6262
Subscription subscription =
63-
subscriberClient.createSubscription(
63+
subscriptionAdminClient.createSubscription(
6464
subscriptionName, topicName, PushConfig.getDefaultInstance(), 0);
6565
// [END createSubscription]
6666
return subscription;
@@ -69,13 +69,13 @@ public Subscription createSubscription(String topic, String subscriptionId) thro
6969

7070
/** Example of pulling a maximum number of messages from a subscription. */
7171
public PullResponse pull(String subscriptionId) throws Exception {
72-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
72+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
7373
// [START pull]
7474
SubscriptionName subscriptionName = SubscriptionName.create(projectId, subscriptionId);
75-
PullResponse response = subscriberClient.pull(subscriptionName, true, 100);
75+
PullResponse response = subscriptionAdminClient.pull(subscriptionName, true, 100);
7676
for (ReceivedMessage message : response.getReceivedMessagesList()) {
7777
// do something with message, then ack or nack
78-
subscriberClient.acknowledge(
78+
subscriptionAdminClient.acknowledge(
7979
subscriptionName, Collections.singletonList(message.getAckId()));
8080
}
8181
// [END pull]
@@ -85,25 +85,25 @@ public PullResponse pull(String subscriptionId) throws Exception {
8585

8686
/** Example of replacing the push configuration of a subscription, setting the push endpoint. */
8787
public void replacePushConfig(String subscriptionId, String endpoint) throws Exception {
88-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
88+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
8989
// [START replacePushConfig]
9090
SubscriptionName subscriptionName = SubscriptionName.create(projectId, subscriptionId);
9191
PushConfig pushConfig = PushConfig.newBuilder().setPushEndpoint(endpoint).build();
92-
subscriberClient.modifyPushConfig(subscriptionName, pushConfig);
92+
subscriptionAdminClient.modifyPushConfig(subscriptionName, pushConfig);
9393
// [END replacePushConfig]
9494
}
9595
}
9696

9797
/** Example of listing subscriptions. */
9898
public ListSubscriptionsPagedResponse listSubscriptions() throws Exception {
99-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
99+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
100100
// [START listSubscriptions]
101101
ListSubscriptionsRequest listSubscriptionsRequest =
102102
ListSubscriptionsRequest.newBuilder()
103103
.setProjectWithProjectName(ProjectName.create(projectId))
104104
.build();
105105
ListSubscriptionsPagedResponse response =
106-
subscriberClient.listSubscriptions(listSubscriptionsRequest);
106+
subscriptionAdminClient.listSubscriptions(listSubscriptionsRequest);
107107
Iterable<Subscription> subscriptions = response.iterateAllElements();
108108
for (Subscription subscription : subscriptions) {
109109
// do something with the subscription
@@ -115,21 +115,21 @@ public ListSubscriptionsPagedResponse listSubscriptions() throws Exception {
115115

116116
/** Example of deleting a subscription. */
117117
public SubscriptionName deleteSubscription(String subscriptionId) throws Exception {
118-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
118+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
119119
// [START deleteSubscription]
120120
SubscriptionName subscriptionName = SubscriptionName.create(projectId, subscriptionId);
121-
subscriberClient.deleteSubscription(subscriptionName);
121+
subscriptionAdminClient.deleteSubscription(subscriptionName);
122122
// [END deleteSubscription]
123123
return subscriptionName;
124124
}
125125
}
126126

127127
/** Example of getting a subscription policy. */
128128
public Policy getSubscriptionPolicy(String subscriptionId) throws Exception {
129-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
129+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
130130
// [START getSubscriptionPolicy]
131131
SubscriptionName subscriptionName = SubscriptionName.create(projectId, subscriptionId);
132-
Policy policy = subscriberClient.getIamPolicy(subscriptionName.toString());
132+
Policy policy = subscriptionAdminClient.getIamPolicy(subscriptionName.toString());
133133
if (policy == null) {
134134
// subscription was not found
135135
}
@@ -140,10 +140,10 @@ public Policy getSubscriptionPolicy(String subscriptionId) throws Exception {
140140

141141
/** Example of replacing a subscription policy. */
142142
public Policy replaceSubscriptionPolicy(String subscriptionId) throws Exception {
143-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
143+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
144144
// [START replaceSubscriptionPolicy]
145145
SubscriptionName subscriptionName = SubscriptionName.create(projectId, subscriptionId);
146-
Policy policy = subscriberClient.getIamPolicy(subscriptionName.toString());
146+
Policy policy = subscriptionAdminClient.getIamPolicy(subscriptionName.toString());
147147
// Create a role => members binding
148148
Binding binding =
149149
Binding.newBuilder()
@@ -153,7 +153,7 @@ public Policy replaceSubscriptionPolicy(String subscriptionId) throws Exception
153153
//Update policy
154154
Policy updatedPolicy = policy.toBuilder().addBindings(binding).build();
155155

156-
updatedPolicy = subscriberClient.setIamPolicy(subscriptionName.toString(), updatedPolicy);
156+
updatedPolicy = subscriptionAdminClient.setIamPolicy(subscriptionName.toString(), updatedPolicy);
157157
// [END replaceSubscriptionPolicy]
158158
return updatedPolicy;
159159
}
@@ -162,24 +162,24 @@ public Policy replaceSubscriptionPolicy(String subscriptionId) throws Exception
162162
/** Example of testing whether the caller has the provided permissions on a subscription. */
163163
public TestIamPermissionsResponse testSubscriptionPermissions(String subscriptionId)
164164
throws Exception {
165-
try (PublisherClient publisherClient = PublisherClient.create()) {
165+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
166166
// [START testSubscriptionPermissions]
167167
List<String> permissions = new LinkedList<>();
168168
permissions.add("pubsub.subscriptions.get");
169169
SubscriptionName subscriptionName = SubscriptionName.create(projectId, subscriptionId);
170170
TestIamPermissionsResponse testedPermissions =
171-
publisherClient.testIamPermissions(subscriptionName.toString(), permissions);
171+
topicAdminClient.testIamPermissions(subscriptionName.toString(), permissions);
172172
// [END testSubscriptionPermissions]
173173
return testedPermissions;
174174
}
175175
}
176176

177177
/** Example of getting a subscription. */
178178
public Subscription getSubscription(String subscriptionId) throws Exception {
179-
try (SubscriberClient subscriberClient = SubscriberClient.create()) {
179+
try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
180180
// [START getSubscription]
181181
SubscriptionName subscriptionName = SubscriptionName.create(projectId, subscriptionId);
182-
Subscription subscription = subscriberClient.getSubscription(subscriptionName);
182+
Subscription subscription = subscriptionAdminClient.getSubscription(subscriptionName);
183183
// [END getSubscription]
184184
return subscription;
185185
}

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherClientSnippets.java renamed to google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.cloud.ServiceOptions;
2222
import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse;
2323
import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse;
24-
import com.google.cloud.pubsub.spi.v1.PublisherClient;
24+
import com.google.cloud.pubsub.spi.v1.TopicAdminClient;
2525
import com.google.iam.v1.Binding;
2626
import com.google.iam.v1.Policy;
2727
import com.google.iam.v1.TestIamPermissionsResponse;
@@ -33,12 +33,12 @@
3333
import java.util.LinkedList;
3434
import java.util.List;
3535

36-
/** This class contains a number of snippets for the {@link PublisherClient} interface. */
37-
public class PublisherClientSnippets {
36+
/** This class contains a number of snippets for the {@link TopicAdminClient} interface. */
37+
public class TopicAdminClientSnippets {
3838

3939
private final String projectId;
4040

41-
public PublisherClientSnippets() {
41+
public TopicAdminClientSnippets() {
4242
this.projectId = ServiceOptions.getDefaultProjectId();
4343
}
4444

@@ -48,24 +48,24 @@ public String getProjectId() {
4848

4949
/** Example of creating a topic. */
5050
public Topic createTopic(String topicId) throws Exception {
51-
try (PublisherClient publisherClient = PublisherClient.create()) {
51+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
5252
// [START createTopic]
5353
TopicName topicName = TopicName.create(projectId, topicId);
54-
Topic topic = publisherClient.createTopic(topicName);
54+
Topic topic = topicAdminClient.createTopic(topicName);
5555
// [END createTopic]
5656
return topic;
5757
}
5858
}
5959

6060
/** Example of listing topics. */
6161
public ListTopicsPagedResponse listTopics() throws Exception {
62-
try (PublisherClient publisherClient = PublisherClient.create()) {
62+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
6363
// [START listTopics]
6464
ListTopicsRequest listTopicsRequest =
6565
ListTopicsRequest.newBuilder()
6666
.setProjectWithProjectName(ProjectName.create(projectId))
6767
.build();
68-
ListTopicsPagedResponse response = publisherClient.listTopics(listTopicsRequest);
68+
ListTopicsPagedResponse response = topicAdminClient.listTopics(listTopicsRequest);
6969
Iterable<Topic> topics = response.iterateAllElements();
7070
for (Topic topic : topics) {
7171
// do something with the topic
@@ -78,15 +78,15 @@ public ListTopicsPagedResponse listTopics() throws Exception {
7878
/** Example of listing topics for a subscription. */
7979
public ListTopicSubscriptionsPagedResponse listTopicSubscriptions(String topicId)
8080
throws Exception {
81-
try (PublisherClient publisherClient = PublisherClient.create()) {
81+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
8282
// [START listTopicSubscriptions]
8383
TopicName topicName = TopicName.create(projectId, topicId);
8484
ListTopicSubscriptionsRequest request =
8585
ListTopicSubscriptionsRequest.newBuilder()
8686
.setTopicWithTopicName(topicName)
8787
.build();
8888
ListTopicSubscriptionsPagedResponse response =
89-
publisherClient.listTopicSubscriptions(request);
89+
topicAdminClient.listTopicSubscriptions(request);
9090
Iterable<String> subscriptionNames = response.iterateAllElements();
9191
for (String subscriptionName : subscriptionNames) {
9292
// do something with the subscription name
@@ -98,21 +98,21 @@ public ListTopicSubscriptionsPagedResponse listTopicSubscriptions(String topicId
9898

9999
/** Example of deleting a topic. */
100100
public TopicName deleteTopic(String topicId) throws Exception {
101-
try (PublisherClient publisherClient = PublisherClient.create()) {
101+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
102102
// [START deleteTopic]
103103
TopicName topicName = TopicName.create(projectId, topicId);
104-
publisherClient.deleteTopic(topicName);
104+
topicAdminClient.deleteTopic(topicName);
105105
// [END deleteTopic]
106106
return topicName;
107107
}
108108
}
109109

110110
/** Example of getting a topic policy. */
111111
public Policy getTopicPolicy(String topicId) throws Exception {
112-
try (PublisherClient publisherClient = PublisherClient.create()) {
112+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
113113
// [START getTopicPolicy]
114114
TopicName topicName = TopicName.create(projectId, topicId);
115-
Policy policy = publisherClient.getIamPolicy(topicName.toString());
115+
Policy policy = topicAdminClient.getIamPolicy(topicName.toString());
116116
if (policy == null) {
117117
// topic iam policy was not found
118118
}
@@ -123,10 +123,10 @@ public Policy getTopicPolicy(String topicId) throws Exception {
123123

124124
/** Example of replacing a topic policy. */
125125
public Policy replaceTopicPolicy(String topicId) throws Exception {
126-
try (PublisherClient publisherClient = PublisherClient.create()) {
126+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
127127
// [START replaceTopicPolicy]
128128
String topicName = TopicName.create(projectId, topicId).toString();
129-
Policy policy = publisherClient.getIamPolicy(topicName);
129+
Policy policy = topicAdminClient.getIamPolicy(topicName);
130130
// add role -> members binding
131131
Binding binding =
132132
Binding.newBuilder()
@@ -135,7 +135,7 @@ public Policy replaceTopicPolicy(String topicId) throws Exception {
135135
.build();
136136
// create updated policy
137137
Policy updatedPolicy = Policy.newBuilder(policy).addBindings(binding).build();
138-
updatedPolicy = publisherClient.setIamPolicy(topicName, updatedPolicy);
138+
updatedPolicy = topicAdminClient.setIamPolicy(topicName, updatedPolicy);
139139
// [END replaceTopicPolicy]
140140
return updatedPolicy;
141141
}
@@ -144,24 +144,24 @@ public Policy replaceTopicPolicy(String topicId) throws Exception {
144144
/** Example of testing whether the caller has the provided permissions on a topic.
145145
* Only viewer, editor or admin/owner can view results of pubsub.topics.get */
146146
public TestIamPermissionsResponse testTopicPermissions(String topicId) throws Exception {
147-
try (PublisherClient publisherClient = PublisherClient.create()) {
147+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
148148
// [START testTopicPermissions]
149149
List<String> permissions = new LinkedList<>();
150150
permissions.add("pubsub.topics.get");
151151
TopicName topicName = TopicName.create(projectId, topicId);
152152
TestIamPermissionsResponse testedPermissions =
153-
publisherClient.testIamPermissions(topicName.toString(), permissions);
153+
topicAdminClient.testIamPermissions(topicName.toString(), permissions);
154154
// [END testTopicPermissions]
155155
return testedPermissions;
156156
}
157157
}
158158

159159
/** Example of getting a topic. */
160160
public Topic getTopic(String topicId) throws Exception {
161-
try (PublisherClient publisherClient = PublisherClient.create()) {
161+
try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
162162
// [START getTopic]
163163
TopicName topicName = TopicName.create(projectId, topicId);
164-
Topic topic = publisherClient.getTopic(topicName);
164+
Topic topic = topicAdminClient.getTopic(topicName);
165165
// [END createTopic]
166166
return topic;
167167
}

0 commit comments

Comments
 (0)