Skip to content

DO NOT MERGE: pubsub: make Subscriber use ApiService #1824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pongad merged 2 commits into from
Apr 3, 2017
Merged

DO NOT MERGE: pubsub: make Subscriber use ApiService #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9ed280
DO NOT MERGE: pubsub: make Subscriber use ApiService
pongad Mar 29, 2017
058ddd6
Merge branch 'master' into apiservice
pongad Apr 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
try {
subscriber = Subscriber.newBuilder(subscriptionName, receiver).build();
subscriber.addListener(
new Subscriber.SubscriberListener() {
new Subscriber.Listener() {
@Override
public void failed(Subscriber.State from, Throwable failure) {
// Handle failure.
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
try {
subscriber = Subscriber.newBuilder(subscription, receiver).build();
subscriber.addListener(
new Subscriber.SubscriberListener() {
new Subscriber.Listener() {
@Override
public void failed(Subscriber.State from, Throwable failure) {
// Handle failure. This is called when the Subscriber encountered a fatal error and is shutting down.
Expand Down
2 changes: 1 addition & 1 deletion ...-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public SubscriberSnippets(
public void startAndWait() throws Exception {
// [START startAsync]
Subscriber subscriber = Subscriber.newBuilder(subscription, receiver).build();
subscriber.addListener(new Subscriber.SubscriberListener() {
subscriber.addListener(new Subscriber.Listener() {
public void failed(Subscriber.State from, Throwable failure) {
// Handle error.
}
Expand Down
9 changes: 4 additions & 5 deletions ...loud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package com.google.cloud.pubsub.spi.v1;

import com.google.api.gax.core.FlowController;
import com.google.api.gax.core.AbstractApiService;
import com.google.api.gax.core.ApiClock;
import com.google.api.gax.core.FlowController;
import com.google.api.stats.Distribution;
import com.google.auth.Credentials;
import com.google.cloud.pubsub.spi.v1.MessageDispatcher.AckProcessor;
import com.google.cloud.pubsub.spi.v1.MessageDispatcher.PendingModifyAckDeadline;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.AbstractService;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
Expand All @@ -45,10 +45,9 @@
import org.joda.time.Duration;

/**
* Implementation of {@link AckProcessor} based on Cloud Pub/Sub pull and
* acknowledge operations.
* Implementation of {@link AckProcessor} based on Cloud Pub/Sub pull and acknowledge operations.
*/
final class PollingSubscriberConnection extends AbstractService implements AckProcessor {
final class PollingSubscriberConnection extends AbstractApiService implements AckProcessor {
private static final int MAX_PER_REQUEST_CHANGES = 1000;
private static final Duration DEFAULT_TIMEOUT = Duration.standardSeconds(10);
private static final int DEFAULT_MAX_MESSAGES = 1000;
Expand Down
6 changes: 3 additions & 3 deletions ...ud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

package com.google.cloud.pubsub.spi.v1;

import com.google.api.gax.core.FlowController;
import com.google.api.gax.core.AbstractApiService;
import com.google.api.gax.core.ApiClock;
import com.google.api.gax.core.FlowController;
import com.google.api.stats.Distribution;
import com.google.auth.Credentials;
import com.google.cloud.pubsub.spi.v1.MessageDispatcher.AckProcessor;
import com.google.cloud.pubsub.spi.v1.MessageDispatcher.PendingModifyAckDeadline;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.AbstractService;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
Expand All @@ -48,7 +48,7 @@
import org.joda.time.Duration;

/** Implementation of {@link AckProcessor} based on Cloud Pub/Sub streaming pull. */
final class StreamingSubscriberConnection extends AbstractService implements AckProcessor {
final class StreamingSubscriberConnection extends AbstractApiService implements AckProcessor {
private static final Logger logger =
Logger.getLogger(StreamingSubscriberConnection.class.getName());

Expand Down
Loading