move MessageReceiver to reduce nesting

pongad · pongad · commit 8ca5bb2b8d1b · 2017-01-12T14:57:54.000+11:00
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/MessageReceiver.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/MessageReceiver.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.pubsub;
+
+import com.google.api.gax.bundling.FlowController;
+import com.google.auth.Credentials;
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.cloud.Clock;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.Service;
+import com.google.pubsub.v1.PubsubMessage;
+import io.grpc.ManagedChannelBuilder;
+import java.io.IOException;
+import java.util.concurrent.ScheduledExecutorService;
+import org.joda.time.Duration;
+
+/** Users of the {@link Subscriber} must implement this interface to receive messages. */
+interface MessageReceiver {
+   enum AckReply {
+    /** To be used for acking a message. */
+    ACK,
+    /** To be used for nacking a message. */
+    NACK
+  }
+  /**
+   * Called when a message is received by the subscriber.
+   *
+   * @return A future that signals when a message has been processed.
+   */
+  ListenableFuture<AckReply> receiveMessage(PubsubMessage message);
+}
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/MessagesProcessor.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/MessagesProcessor.java
@@ -19,8 +19,7 @@
 import com.google.api.gax.bundling.FlowController;
 import com.google.api.stats.Distribution;
 import com.google.cloud.Clock;
-import com.google.cloud.pubsub.Subscriber.MessageReceiver;
-import com.google.cloud.pubsub.Subscriber.MessageReceiver.AckReply;
+import com.google.cloud.pubsub.MessageReceiver.AckReply;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;
@@ -140,7 +139,10 @@ public void addAckId(String ackId) {
     }
   }
 
-  /** Handles callbacks for acking/nacking messages from the {@link MessageReceiver}. */
+  /**
+   * Handles callbacks for acking/nacking messages from the {@link
+   * com.google.cloud.pubsub.MessageReceiver}.
+   */
   private class AckHandler implements FutureCallback<AckReply> {
     private final String ackId;
     private final int outstandingBytes;
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PollingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PollingSubscriberConnection.java
@@ -24,7 +24,6 @@
 import com.google.cloud.Clock;
 import com.google.cloud.pubsub.MessagesProcessor.AcksProcessor;
 import com.google.cloud.pubsub.MessagesProcessor.PendingModifyAckDeadline;
-import com.google.cloud.pubsub.Subscriber.MessageReceiver;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AbstractService;
 import com.google.common.util.concurrent.FutureCallback;
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/StreamingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/StreamingSubscriberConnection.java
@@ -24,7 +24,6 @@
 import com.google.cloud.Clock;
 import com.google.cloud.pubsub.MessagesProcessor.AcksProcessor;
 import com.google.cloud.pubsub.MessagesProcessor.PendingModifyAckDeadline;
-import com.google.cloud.pubsub.Subscriber.MessageReceiver;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AbstractService;
 import com.google.common.util.concurrent.FutureCallback;
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/Subscriber.java
@@ -20,12 +20,10 @@
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.Clock;
-import com.google.cloud.pubsub.Subscriber.MessageReceiver.AckReply;
+import com.google.cloud.pubsub.MessageReceiver.AckReply;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.Service;
-import com.google.pubsub.v1.PubsubMessage;
 import io.grpc.ManagedChannelBuilder;
 import java.io.IOException;
 import java.util.concurrent.ScheduledExecutorService;
@@ -94,27 +92,6 @@ public interface Subscriber extends Service {
   /** Retrieves a snapshot of the current subscriber statistics. */
   SubscriberStats getStats();
 
-  /** Users of the {@link Subscriber} must implement this interface to receive messages. */
-  interface MessageReceiver {
-    public static enum AckReply {
-      /**
-       * To be used for acking a message.
-       */
-      ACK,
-      /**
-       * To be used for nacking a message.
-       */
-      NACK
-    }
-
-    /**
-     * Called when a message is received by the subscriber.
-     *
-     * @return A future that signals when a message has been processed.
-     */
-    ListenableFuture<AckReply> receiveMessage(PubsubMessage message);
-  }
-
   /** Subscription for which the subscriber is streaming messages. */
   String getSubscription();
 
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/SubscriberImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/SubscriberImplTest.java
@@ -20,9 +20,8 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.cloud.pubsub.FakeSubscriberServiceImpl.ModifyAckDeadline;
+import com.google.cloud.pubsub.MessageReceiver.AckReply;
 import com.google.cloud.pubsub.Subscriber.Builder;
-import com.google.cloud.pubsub.Subscriber.MessageReceiver;
-import com.google.cloud.pubsub.Subscriber.MessageReceiver.AckReply;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
