move classes from pubsub to pubsub/spi/v1 (#1530)

googleapis · Jan 13, 2017 · 19acb03 · 19acb03
1 parent 36bbe4c
commit 19acb03
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 102 deletions.
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/package-info.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/package-info.java
diff --git a/.../google/cloud/pubsub/MessageReceiver.java → .../cloud/pubsub/spi/v1/MessageReceiver.java b/.../google/cloud/pubsub/MessageReceiver.java → .../cloud/pubsub/spi/v1/MessageReceiver.java
@@ -14,21 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
-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 {

diff --git a/...oogle/cloud/pubsub/MessagesProcessor.java → ...loud/pubsub/spi/v1/MessagesProcessor.java b/...oogle/cloud/pubsub/MessagesProcessor.java → ...loud/pubsub/spi/v1/MessagesProcessor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.api.gax.bundling.FlowController;
 import com.google.api.stats.Distribution;
 import com.google.cloud.Clock;
-import com.google.cloud.pubsub.MessageReceiver.AckReply;
+import com.google.cloud.pubsub.spi.v1.MessageReceiver.AckReply;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;

diff --git a/...m/google/cloud/pubsub/MessagesWaiter.java → ...e/cloud/pubsub/spi/v1/MessagesWaiter.java b/...m/google/cloud/pubsub/MessagesWaiter.java → ...e/cloud/pubsub/spi/v1/MessagesWaiter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.concurrent.atomic.AtomicBoolean;

diff --git a/...d/pubsub/PollingSubscriberConnection.java → ...b/spi/v1/PollingSubscriberConnection.java b/...d/pubsub/PollingSubscriberConnection.java → ...b/spi/v1/PollingSubscriberConnection.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
-import static com.google.cloud.pubsub.StatusUtil.isRetryable;
+import static com.google.cloud.pubsub.spi.v1.StatusUtil.isRetryable;
 
 import com.google.api.gax.bundling.FlowController;
 import com.google.api.stats.Distribution;
 import com.google.auth.Credentials;
 import com.google.cloud.Clock;
-import com.google.cloud.pubsub.MessagesProcessor.AcksProcessor;
-import com.google.cloud.pubsub.MessagesProcessor.PendingModifyAckDeadline;
+import com.google.cloud.pubsub.spi.v1.MessagesProcessor.AcksProcessor;
+import com.google.cloud.pubsub.spi.v1.MessagesProcessor.PendingModifyAckDeadline;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AbstractService;
 import com.google.common.util.concurrent.FutureCallback;

diff --git a/...va/com/google/cloud/pubsub/Publisher.java → ...google/cloud/pubsub/spi/v1/Publisher.java b/...va/com/google/cloud/pubsub/Publisher.java → ...google/cloud/pubsub/spi/v1/Publisher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.api.gax.bundling.FlowController;
 import com.google.api.gax.grpc.BundlingSettings;

diff --git a/...om/google/cloud/pubsub/PublisherImpl.java → ...le/cloud/pubsub/spi/v1/PublisherImpl.java b/...om/google/cloud/pubsub/PublisherImpl.java → ...le/cloud/pubsub/spi/v1/PublisherImpl.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.api.gax.bundling.FlowController;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.cloud.pubsub.spi.v1.PublisherSettings;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;

diff --git a/...m/google/cloud/pubsub/PublisherStats.java → ...e/cloud/pubsub/spi/v1/PublisherStats.java b/...m/google/cloud/pubsub/PublisherStats.java → ...e/cloud/pubsub/spi/v1/PublisherStats.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.auto.value.AutoValue;
 

diff --git a/...a/com/google/cloud/pubsub/StatusUtil.java → ...oogle/cloud/pubsub/spi/v1/StatusUtil.java b/...a/com/google/cloud/pubsub/StatusUtil.java → ...oogle/cloud/pubsub/spi/v1/StatusUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import io.grpc.Status;
 

diff --git a/...pubsub/StreamingSubscriberConnection.java → ...spi/v1/StreamingSubscriberConnection.java b/...pubsub/StreamingSubscriberConnection.java → ...spi/v1/StreamingSubscriberConnection.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
-import static com.google.cloud.pubsub.StatusUtil.isRetryable;
+import static com.google.cloud.pubsub.spi.v1.StatusUtil.isRetryable;
 
 import com.google.api.gax.bundling.FlowController;
 import com.google.api.stats.Distribution;
 import com.google.auth.Credentials;
 import com.google.cloud.Clock;
-import com.google.cloud.pubsub.MessagesProcessor.AcksProcessor;
-import com.google.cloud.pubsub.MessagesProcessor.PendingModifyAckDeadline;
+import com.google.cloud.pubsub.spi.v1.MessagesProcessor.AcksProcessor;
+import com.google.cloud.pubsub.spi.v1.MessagesProcessor.PendingModifyAckDeadline;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AbstractService;
 import com.google.common.util.concurrent.FutureCallback;

diff --git a/...a/com/google/cloud/pubsub/Subscriber.java → ...oogle/cloud/pubsub/spi/v1/Subscriber.java b/...a/com/google/cloud/pubsub/Subscriber.java → ...oogle/cloud/pubsub/spi/v1/Subscriber.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 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.cloud.pubsub.MessageReceiver.AckReply;
+import com.google.cloud.pubsub.spi.v1.MessageReceiver.AckReply;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Service;

diff --git a/...m/google/cloud/pubsub/SubscriberImpl.java → ...e/cloud/pubsub/spi/v1/SubscriberImpl.java b/...m/google/cloud/pubsub/SubscriberImpl.java → ...e/cloud/pubsub/spi/v1/SubscriberImpl.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.api.gax.bundling.FlowController;
 import com.google.api.stats.Distribution;
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.Clock;
-import com.google.cloud.pubsub.spi.v1.SubscriberSettings;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.primitives.Ints;

diff --git a/.../google/cloud/pubsub/SubscriberStats.java → .../cloud/pubsub/spi/v1/SubscriberStats.java b/.../google/cloud/pubsub/SubscriberStats.java → .../cloud/pubsub/spi/v1/SubscriberStats.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.auto.value.AutoValue;
 

diff --git a/...va/com/google/cloud/pubsub/FakeClock.java → ...google/cloud/pubsub/spi/v1/FakeClock.java b/...va/com/google/cloud/pubsub/FakeClock.java → ...google/cloud/pubsub/spi/v1/FakeClock.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.cloud.Clock;
 import java.util.concurrent.TimeUnit;

diff --git a/.../google/cloud/pubsub/FakeCredentials.java → .../cloud/pubsub/spi/v1/FakeCredentials.java b/.../google/cloud/pubsub/FakeCredentials.java → .../cloud/pubsub/spi/v1/FakeCredentials.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.auth.Credentials;
 import java.io.IOException;

diff --git a/...loud/pubsub/FakePublisherServiceImpl.java → ...bsub/spi/v1/FakePublisherServiceImpl.java b/...loud/pubsub/FakePublisherServiceImpl.java → ...bsub/spi/v1/FakePublisherServiceImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.common.base.Optional;
 import com.google.pubsub.v1.PublishRequest;

diff --git a/.../pubsub/FakeScheduledExecutorService.java → .../spi/v1/FakeScheduledExecutorService.java b/.../pubsub/FakeScheduledExecutorService.java → .../spi/v1/FakeScheduledExecutorService.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.cloud.Clock;
-import com.google.cloud.pubsub.FakeClock;
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.ArrayList;
@@ -34,7 +33,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
-import org.joda.time.MutableDateTime;
 
 /**
  * Fake implementation of {@link ScheduledExecutorService} that allows tests control the reference

diff --git a/...oud/pubsub/FakeSubscriberServiceImpl.java → ...sub/spi/v1/FakeSubscriberServiceImpl.java b/...oud/pubsub/FakeSubscriberServiceImpl.java → ...sub/spi/v1/FakeSubscriberServiceImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import com.google.api.client.util.Preconditions;
 import com.google.common.collect.ImmutableList;

diff --git a/...ogle/cloud/pubsub/MessagesWaiterTest.java → ...oud/pubsub/spi/v1/MessagesWaiterTest.java b/...ogle/cloud/pubsub/MessagesWaiterTest.java → ...oud/pubsub/spi/v1/MessagesWaiterTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/...oogle/cloud/pubsub/PublisherImplTest.java → ...loud/pubsub/spi/v1/PublisherImplTest.java b/...oogle/cloud/pubsub/PublisherImplTest.java → ...loud/pubsub/spi/v1/PublisherImplTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,7 +25,7 @@
 
 import com.google.api.gax.bundling.FlowController;
 import com.google.api.gax.grpc.BundlingSettings;
-import com.google.cloud.pubsub.Publisher.Builder;
+import com.google.cloud.pubsub.spi.v1.Publisher.Builder;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.protobuf.ByteString;

diff --git a/...ogle/cloud/pubsub/SubscriberImplTest.java → ...oud/pubsub/spi/v1/SubscriberImplTest.java b/...ogle/cloud/pubsub/SubscriberImplTest.java → ...oud/pubsub/spi/v1/SubscriberImplTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.cloud.pubsub;
+package com.google.cloud.pubsub.spi.v1;
 
-import static com.google.cloud.pubsub.MessagesProcessor.PENDING_ACKS_SEND_DELAY;
+import static com.google.cloud.pubsub.spi.v1.MessagesProcessor.PENDING_ACKS_SEND_DELAY;
 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.spi.v1.FakeSubscriberServiceImpl.ModifyAckDeadline;
+import com.google.cloud.pubsub.spi.v1.MessageReceiver.AckReply;
+import com.google.cloud.pubsub.spi.v1.Subscriber.Builder;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;