Skip to content

Commit 3f3e7c0

Browse files
michaelbausorgarrettjonesgoogle
michaelbausor
authored and
garrettjonesgoogle
committed
Regenerate pubsub with resource names (#1403)
1 parent 628b7c9 commit 3f3e7c0

11 files changed

Lines changed: 288 additions & 276 deletions

File tree

‎google-cloud-pubsub/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
</dependency>
3030
<dependency>
3131
<groupId>com.google.api.grpc</groupId>
32-
<artifactId>grpc-google-pubsub-v1</artifactId>
33-
<version>0.1.0</version>
32+
<artifactId>grpc-google-cloud-pubsub-v1</artifactId>
33+
<version>0.1.3</version>
3434
<exclusions>
3535
<exclusion>
3636
<groupId>io.grpc</groupId>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919
import com.google.api.gax.grpc.PagedListDescriptor;
2020
import com.google.api.gax.grpc.PagedListResponseImpl;
2121
import com.google.api.gax.grpc.UnaryCallable;
22+
import com.google.common.base.Function;
23+
import com.google.common.collect.Iterables;
2224
import com.google.pubsub.v1.ListSubscriptionsRequest;
2325
import com.google.pubsub.v1.ListSubscriptionsResponse;
2426
import com.google.pubsub.v1.ListTopicSubscriptionsRequest;
2527
import com.google.pubsub.v1.ListTopicSubscriptionsResponse;
2628
import com.google.pubsub.v1.ListTopicsRequest;
2729
import com.google.pubsub.v1.ListTopicsResponse;
2830
import com.google.pubsub.v1.Subscription;
31+
import com.google.pubsub.v1.SubscriptionName;
2932
import com.google.pubsub.v1.Topic;
3033

3134
// AUTO-GENERATED DOCUMENTATION AND CLASS
@@ -61,6 +64,17 @@ public ListTopicSubscriptionsPagedResponse(
6164
CallContext context) {
6265
super(callable, pageDescriptor, request, context);
6366
}
67+
68+
public Iterable<SubscriptionName> iterateAllAsSubscriptionName() {
69+
return Iterables.transform(
70+
iterateAllElements(),
71+
new Function<String, SubscriptionName>() {
72+
@Override
73+
public SubscriptionName apply(String arg0) {
74+
return SubscriptionName.parse(arg0);
75+
}
76+
});
77+
}
6478
}
6579

6680
public static class ListSubscriptionsPagedResponse

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

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

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

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

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/package-info.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
* <pre>
3030
* <code>
3131
* try (PublisherApi publisherApi = PublisherApi.create()) {
32-
* String formattedName = PublisherApi.formatTopicName("[PROJECT]", "[TOPIC]");
33-
* Topic response = publisherApi.createTopic(formattedName);
32+
* TopicName name = TopicName.create("[PROJECT]", "[TOPIC]");
33+
* Topic response = publisherApi.createTopic(name);
3434
* }
3535
* </code>
3636
* </pre>
@@ -45,11 +45,11 @@
4545
* <pre>
4646
* <code>
4747
* try (SubscriberApi subscriberApi = SubscriberApi.create()) {
48-
* String formattedName = SubscriberApi.formatSubscriptionName("[PROJECT]", "[SUBSCRIPTION]");
49-
* String formattedTopic = SubscriberApi.formatTopicName("[PROJECT]", "[TOPIC]");
48+
* SubscriptionName name = SubscriptionName.create("[PROJECT]", "[SUBSCRIPTION]");
49+
* TopicName topic = TopicName.create("[PROJECT]", "[TOPIC]");
5050
* PushConfig pushConfig = PushConfig.newBuilder().build();
5151
* int ackDeadlineSeconds = 0;
52-
* Subscription response = subscriberApi.createSubscription(formattedName, formattedTopic, pushConfig, ackDeadlineSeconds);
52+
* Subscription response = subscriberApi.createSubscription(name, topic, pushConfig, ackDeadlineSeconds);
5353
* }
5454
* </code>
5555
* </pre>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
4343
serviceImpl.addException(exception);
4444
}
4545

46-
@Override
4746
public void setResponses(List<GeneratedMessageV3> responses) {
4847
serviceImpl.setResponses(responses);
4948
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
4343
serviceImpl.addException(exception);
4444
}
4545

46-
@Override
4746
public void setResponses(List<GeneratedMessageV3> responses) {
4847
serviceImpl.setResponses(responses);
4948
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void addException(Exception exception) {
4343
serviceImpl.addException(exception);
4444
}
4545

46-
@Override
4746
public void setResponses(List<GeneratedMessageV3> responses) {
4847
serviceImpl.setResponses(responses);
4948
}

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
import com.google.pubsub.v1.PullResponse;
2323
import com.google.pubsub.v1.PushConfig;
2424
import com.google.pubsub.v1.Topic;
25+
import com.google.pubsub.v1.ProjectName;
26+
import com.google.pubsub.v1.TopicName;
27+
import com.google.pubsub.v1.SubscriptionName;
2528

2629
import io.grpc.ManagedChannel;
2730

@@ -106,18 +109,17 @@ public void tearDown() throws Exception {
106109

107110
@Test
108111
public void testCreateTopic() throws Exception {
109-
String topicName = PublisherApi.formatTopicName("my-project", "my-topic");
112+
TopicName topicName = TopicName.create("my-project", "my-topic");
110113
Topic result = publisherApi.createTopic(topicName);
111-
Assert.assertEquals(topicName, result.getName());
114+
Assert.assertEquals(topicName, result.getNameAsTopicName());
112115
}
113116

114117
@Test
115118
public void testPublish() throws Exception {
116-
String topicName = PublisherApi.formatTopicName("my-project", "publish-topic");
119+
TopicName topicName = TopicName.create("my-project", "my-topic");
117120
publisherApi.createTopic(topicName);
118121

119-
String subscriberName =
120-
SubscriberApi.formatSubscriptionName("my-project", "my-subscribe");
122+
SubscriptionName subscriberName = SubscriptionName.create("my-project", "my-subscribe");
121123
PushConfig config = PushConfig.getDefaultInstance();
122124
subscriberApi.createSubscription(subscriberName, topicName, config, 5);
123125

@@ -133,11 +135,10 @@ public void testPublish() throws Exception {
133135

134136
@Test
135137
public void testBundledPublish() throws Exception {
136-
String topicName = PublisherApi.formatTopicName("my-project", "publish-topic");
138+
TopicName topicName = TopicName.create("my-project", "my-topic");
137139
bundledPublisherApi.createTopic(topicName);
138140

139-
String subscriberName =
140-
SubscriberApi.formatSubscriptionName("my-project", "my-subscribe");
141+
SubscriptionName subscriberName = SubscriptionName.create("my-project", "my-subscribe");
141142
PushConfig config = PushConfig.getDefaultInstance();
142143
subscriberApi.createSubscription(subscriberName, topicName, config, 5);
143144

@@ -154,19 +155,19 @@ public void testBundledPublish() throws Exception {
154155

155156
@Test
156157
public void testGetTopic() throws Exception {
157-
String topicName = PublisherApi.formatTopicName("my-project", "fun-topic");
158+
TopicName topicName = TopicName.create("my-project", "my-topic");
158159
publisherApi.createTopic(topicName);
159160
Topic result = publisherApi.getTopic(topicName);
160161
Assert.assertNotNull(result);
161-
Assert.assertEquals(topicName, result.getName());
162+
Assert.assertEquals(topicName, result.getNameAsTopicName());
162163
}
163164

164165
@Test
165166
public void testListTopics() throws Exception {
166-
String project1 = PublisherApi.formatProjectName("project.1");
167-
String topicName1 = PublisherApi.formatTopicName("project.1", "topic.1");
168-
String topicName2 = PublisherApi.formatTopicName("project.1", "topic.2");
169-
String topicName3 = PublisherApi.formatTopicName("project.2", "topic.3");
167+
ProjectName project1 = ProjectName.create("project.1");
168+
TopicName topicName1 = TopicName.create("project.1", "topic.1");
169+
TopicName topicName2 = TopicName.create("project.1", "topic.2");
170+
TopicName topicName3 = TopicName.create("project.2", "topic.3");
170171
publisherApi.createTopic(topicName1);
171172
publisherApi.createTopic(topicName2);
172173
publisherApi.createTopic(topicName3);
@@ -175,14 +176,14 @@ public void testListTopics() throws Exception {
175176
topics.add(topic);
176177
}
177178
Assert.assertEquals(2, topics.size());
178-
Assert.assertEquals(topicName1, topics.get(0).getName());
179-
Assert.assertEquals(topicName2, topics.get(1).getName());
179+
Assert.assertEquals(topicName1, topics.get(0).getNameAsTopicName());
180+
Assert.assertEquals(topicName2, topics.get(1).getNameAsTopicName());
180181
}
181182

182183
@Test
183184
public void testDeleteTopic() throws Exception {
184-
String project = PublisherApi.formatProjectName("project.1");
185-
String topicName = PublisherApi.formatTopicName("my-project", "fun-topic");
185+
ProjectName project = ProjectName.create("project.1");
186+
TopicName topicName = TopicName.create("my-project", "my-topic");
186187
publisherApi.createTopic(topicName);
187188
publisherApi.deleteTopic(topicName);
188189
List<Topic> topics = new ArrayList<>();

0 commit comments

Comments
 (0)