Skip to content

Commit

Permalink
Removed formatted prefix from parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelbausor
michaelbausor committed May 13, 2016
1 parent e619db5 commit da345eb
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 126 deletions.
48 changes: 24 additions & 24 deletions gcloud-java-pubsub/baseline/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,17 +288,17 @@ public void close() throws IOException {
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedName The name of the topic. It must have the format
* @param name The name of the topic. It must have the format
* `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter,
* and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`),
* underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent
* signs (`%`). It must be between 3 and 255 characters in length, and it
* must not start with `"goog"`.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final Topic createTopic(String formattedName) {
TOPIC_PATH_TEMPLATE.validate(formattedName);
Topic request = Topic.newBuilder().setName(formattedName).build();
public final Topic createTopic(String name) {
TOPIC_PATH_TEMPLATE.validate(name);
Topic request = Topic.newBuilder().setName(name).build();
return createTopic(request);
}

Expand Down Expand Up @@ -371,15 +371,15 @@ public final ApiCallable<Topic, Topic> createTopicCallable() {
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedTopic The messages in the request will be published on this topic.
* @param topic The messages in the request will be published on this topic.
* @param messages The messages to publish.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final PublishResponse publish(String formattedTopic, List<PubsubMessage> messages) {
TOPIC_PATH_TEMPLATE.validate(formattedTopic);
public final PublishResponse publish(String topic, List<PubsubMessage> messages) {
TOPIC_PATH_TEMPLATE.validate(topic);

PublishRequest request =
PublishRequest.newBuilder().setTopic(formattedTopic).addAllMessages(messages).build();
PublishRequest.newBuilder().setTopic(topic).addAllMessages(messages).build();
return publish(request);
}

Expand Down Expand Up @@ -457,12 +457,12 @@ public final ApiCallable<PublishRequest, PublishResponse> publishCallable() {
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedTopic The name of the topic to get.
* @param topic The name of the topic to get.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final Topic getTopic(String formattedTopic) {
TOPIC_PATH_TEMPLATE.validate(formattedTopic);
GetTopicRequest request = GetTopicRequest.newBuilder().setTopic(formattedTopic).build();
public final Topic getTopic(String topic) {
TOPIC_PATH_TEMPLATE.validate(topic);
GetTopicRequest request = GetTopicRequest.newBuilder().setTopic(topic).build();
return getTopic(request);
}

Expand Down Expand Up @@ -534,12 +534,12 @@ public final ApiCallable<GetTopicRequest, Topic> getTopicCallable() {
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedProject The name of the cloud project that topics belong to.
* @param project The name of the cloud project that topics belong to.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final PageAccessor<Topic> listTopics(String formattedProject) {
PROJECT_PATH_TEMPLATE.validate(formattedProject);
ListTopicsRequest request = ListTopicsRequest.newBuilder().setProject(formattedProject).build();
public final PageAccessor<Topic> listTopics(String project) {
PROJECT_PATH_TEMPLATE.validate(project);
ListTopicsRequest request = ListTopicsRequest.newBuilder().setProject(project).build();
return listTopics(request);
}

Expand Down Expand Up @@ -648,13 +648,13 @@ public final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallab
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedTopic The name of the topic that subscriptions are attached to.
* @param topic The name of the topic that subscriptions are attached to.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final PageAccessor<String> listTopicSubscriptions(String formattedTopic) {
TOPIC_PATH_TEMPLATE.validate(formattedTopic);
public final PageAccessor<String> listTopicSubscriptions(String topic) {
TOPIC_PATH_TEMPLATE.validate(topic);
ListTopicSubscriptionsRequest request =
ListTopicSubscriptionsRequest.newBuilder().setTopic(formattedTopic).build();
ListTopicSubscriptionsRequest.newBuilder().setTopic(topic).build();
return listTopicSubscriptions(request);
}

Expand Down Expand Up @@ -767,12 +767,12 @@ public final PageAccessor<String> listTopicSubscriptions(ListTopicSubscriptionsR
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedTopic Name of the topic to delete.
* @param topic Name of the topic to delete.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final void deleteTopic(String formattedTopic) {
TOPIC_PATH_TEMPLATE.validate(formattedTopic);
DeleteTopicRequest request = DeleteTopicRequest.newBuilder().setTopic(formattedTopic).build();
public final void deleteTopic(String topic) {
TOPIC_PATH_TEMPLATE.validate(topic);
DeleteTopicRequest request = DeleteTopicRequest.newBuilder().setTopic(topic).build();
deleteTopic(request);
}

Expand Down
74 changes: 35 additions & 39 deletions gcloud-java-pubsub/baseline/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,13 @@ public void close() throws IOException {
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedName The name of the subscription. It must have the format
* @param name The name of the subscription. It must have the format
* `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must
* start with a letter, and contain only letters (`[A-Za-z]`), numbers
* (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`),
* plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters
* in length, and it must not start with `"goog"`.
* @param formattedTopic The name of the topic from which this subscription is receiving messages.
* @param topic The name of the topic from which this subscription is receiving messages.
* @param pushConfig If push delivery is used with this subscription, this field is
* used to configure it. An empty `pushConfig` signifies that the subscriber
* will pull and ack messages using API methods.
Expand All @@ -366,14 +366,14 @@ public void close() throws IOException {
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final Subscription createSubscription(
String formattedName, String formattedTopic, PushConfig pushConfig, int ackDeadlineSeconds) {
SUBSCRIPTION_PATH_TEMPLATE.validate(formattedName);
TOPIC_PATH_TEMPLATE.validate(formattedTopic);
String name, String topic, PushConfig pushConfig, int ackDeadlineSeconds) {
SUBSCRIPTION_PATH_TEMPLATE.validate(name);
TOPIC_PATH_TEMPLATE.validate(topic);

Subscription request =
Subscription.newBuilder()
.setName(formattedName)
.setTopic(formattedTopic)
.setName(name)
.setTopic(topic)
.setPushConfig(pushConfig)
.setAckDeadlineSeconds(ackDeadlineSeconds)
.build();
Expand Down Expand Up @@ -463,13 +463,13 @@ public final ApiCallable<Subscription, Subscription> createSubscriptionCallable(
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedSubscription The name of the subscription to get.
* @param subscription The name of the subscription to get.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final Subscription getSubscription(String formattedSubscription) {
SUBSCRIPTION_PATH_TEMPLATE.validate(formattedSubscription);
public final Subscription getSubscription(String subscription) {
SUBSCRIPTION_PATH_TEMPLATE.validate(subscription);
GetSubscriptionRequest request =
GetSubscriptionRequest.newBuilder().setSubscription(formattedSubscription).build();
GetSubscriptionRequest.newBuilder().setSubscription(subscription).build();
return getSubscription(request);
}

Expand Down Expand Up @@ -550,13 +550,13 @@ public final ApiCallable<GetSubscriptionRequest, Subscription> getSubscriptionCa
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedProject The name of the cloud project that subscriptions belong to.
* @param project The name of the cloud project that subscriptions belong to.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final PageAccessor<Subscription> listSubscriptions(String formattedProject) {
PROJECT_PATH_TEMPLATE.validate(formattedProject);
public final PageAccessor<Subscription> listSubscriptions(String project) {
PROJECT_PATH_TEMPLATE.validate(project);
ListSubscriptionsRequest request =
ListSubscriptionsRequest.newBuilder().setProject(formattedProject).build();
ListSubscriptionsRequest.newBuilder().setProject(project).build();
return listSubscriptions(request);
}

Expand Down Expand Up @@ -678,13 +678,13 @@ public final PageAccessor<Subscription> listSubscriptions(ListSubscriptionsReque
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedSubscription The subscription to delete.
* @param subscription The subscription to delete.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final void deleteSubscription(String formattedSubscription) {
SUBSCRIPTION_PATH_TEMPLATE.validate(formattedSubscription);
public final void deleteSubscription(String subscription) {
SUBSCRIPTION_PATH_TEMPLATE.validate(subscription);
DeleteSubscriptionRequest request =
DeleteSubscriptionRequest.newBuilder().setSubscription(formattedSubscription).build();
DeleteSubscriptionRequest.newBuilder().setSubscription(subscription).build();
deleteSubscription(request);
}

Expand Down Expand Up @@ -767,7 +767,7 @@ public final ApiCallable<DeleteSubscriptionRequest, Empty> deleteSubscriptionCal
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedSubscription The name of the subscription.
* @param subscription The name of the subscription.
* @param ackIds List of acknowledgment IDs.
* @param ackDeadlineSeconds The new ack deadline with respect to the time this request was sent to
* the Pub/Sub system. Must be &gt;= 0. For example, if the value is 10, the new
Expand All @@ -777,12 +777,12 @@ public final ApiCallable<DeleteSubscriptionRequest, Empty> deleteSubscriptionCal
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final void modifyAckDeadline(
String formattedSubscription, List<String> ackIds, int ackDeadlineSeconds) {
SUBSCRIPTION_PATH_TEMPLATE.validate(formattedSubscription);
String subscription, List<String> ackIds, int ackDeadlineSeconds) {
SUBSCRIPTION_PATH_TEMPLATE.validate(subscription);

ModifyAckDeadlineRequest request =
ModifyAckDeadlineRequest.newBuilder()
.setSubscription(formattedSubscription)
.setSubscription(subscription)
.addAllAckIds(ackIds)
.setAckDeadlineSeconds(ackDeadlineSeconds)
.build();
Expand Down Expand Up @@ -876,19 +876,16 @@ public final ApiCallable<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineCalla
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedSubscription The subscription whose message is being acknowledged.
* @param subscription The subscription whose message is being acknowledged.
* @param ackIds The acknowledgment ID for the messages being acknowledged that was returned
* by the Pub/Sub system in the `Pull` response. Must not be empty.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final void acknowledge(String formattedSubscription, List<String> ackIds) {
SUBSCRIPTION_PATH_TEMPLATE.validate(formattedSubscription);
public final void acknowledge(String subscription, List<String> ackIds) {
SUBSCRIPTION_PATH_TEMPLATE.validate(subscription);

AcknowledgeRequest request =
AcknowledgeRequest.newBuilder()
.setSubscription(formattedSubscription)
.addAllAckIds(ackIds)
.build();
AcknowledgeRequest.newBuilder().setSubscription(subscription).addAllAckIds(ackIds).build();
acknowledge(request);
}

Expand Down Expand Up @@ -979,7 +976,7 @@ public final ApiCallable<AcknowledgeRequest, Empty> acknowledgeCallable() {
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedSubscription The subscription from which messages should be pulled.
* @param subscription The subscription from which messages should be pulled.
* @param returnImmediately If this is specified as true the system will respond immediately even if
* it is not able to return a message in the `Pull` response. Otherwise the
* system is allowed to wait until at least one message is available rather
Expand All @@ -988,13 +985,12 @@ public final ApiCallable<AcknowledgeRequest, Empty> acknowledgeCallable() {
* system may return fewer than the number specified.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final PullResponse pull(
String formattedSubscription, boolean returnImmediately, int maxMessages) {
SUBSCRIPTION_PATH_TEMPLATE.validate(formattedSubscription);
public final PullResponse pull(String subscription, boolean returnImmediately, int maxMessages) {
SUBSCRIPTION_PATH_TEMPLATE.validate(subscription);

PullRequest request =
PullRequest.newBuilder()
.setSubscription(formattedSubscription)
.setSubscription(subscription)
.setReturnImmediately(returnImmediately)
.setMaxMessages(maxMessages)
.build();
Expand Down Expand Up @@ -1083,7 +1079,7 @@ public final ApiCallable<PullRequest, PullResponse> pullCallable() {
* <!-- manual edit -->
* <!-- end manual edit -->
*
* @param formattedSubscription The name of the subscription.
* @param subscription The name of the subscription.
* @param pushConfig The push configuration for future deliveries.
*
* An empty `pushConfig` indicates that the Pub/Sub system should
Expand All @@ -1092,12 +1088,12 @@ public final ApiCallable<PullRequest, PullResponse> pullCallable() {
* the subscription if `Pull` is not called.
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
*/
public final void modifyPushConfig(String formattedSubscription, PushConfig pushConfig) {
SUBSCRIPTION_PATH_TEMPLATE.validate(formattedSubscription);
public final void modifyPushConfig(String subscription, PushConfig pushConfig) {
SUBSCRIPTION_PATH_TEMPLATE.validate(subscription);

ModifyPushConfigRequest request =
ModifyPushConfigRequest.newBuilder()
.setSubscription(formattedSubscription)
.setSubscription(subscription)
.setPushConfig(pushConfig)
.build();
modifyPushConfig(request);
Expand Down
Loading

0 comments on commit da345eb

Please sign in to comment.