Skip to content

Commit 19acb03

Browse files
pongadpongad
authored
move classes from pubsub to pubsub/spi/v1 (#1530)
1 parent 36bbe4c commit 19acb03

21 files changed

Lines changed: 33 additions & 102 deletions

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

Lines changed: 0 additions & 54 deletions
This file was deleted.

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/MessageReceiver.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageReceiver.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

19-
import com.google.api.gax.bundling.FlowController;
20-
import com.google.auth.Credentials;
21-
import com.google.auth.oauth2.GoogleCredentials;
22-
import com.google.cloud.Clock;
23-
import com.google.common.base.Optional;
24-
import com.google.common.base.Preconditions;
2519
import com.google.common.util.concurrent.ListenableFuture;
26-
import com.google.common.util.concurrent.Service;
2720
import com.google.pubsub.v1.PubsubMessage;
28-
import io.grpc.ManagedChannelBuilder;
29-
import java.io.IOException;
30-
import java.util.concurrent.ScheduledExecutorService;
31-
import org.joda.time.Duration;
3221

3322
/** Users of the {@link Subscriber} must implement this interface to receive messages. */
3423
interface MessageReceiver {

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/MessagesProcessor.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessagesProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

1919
import com.google.api.gax.bundling.FlowController;
2020
import com.google.api.stats.Distribution;
2121
import com.google.cloud.Clock;
22-
import com.google.cloud.pubsub.MessageReceiver.AckReply;
22+
import com.google.cloud.pubsub.spi.v1.MessageReceiver.AckReply;
2323
import com.google.common.annotations.VisibleForTesting;
2424
import com.google.common.collect.Lists;
2525
import com.google.common.primitives.Ints;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/MessagesWaiter.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessagesWaiter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

1919
import com.google.common.annotations.VisibleForTesting;
2020
import java.util.concurrent.atomic.AtomicBoolean;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PollingSubscriberConnection.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

19-
import static com.google.cloud.pubsub.StatusUtil.isRetryable;
19+
import static com.google.cloud.pubsub.spi.v1.StatusUtil.isRetryable;
2020

2121
import com.google.api.gax.bundling.FlowController;
2222
import com.google.api.stats.Distribution;
2323
import com.google.auth.Credentials;
2424
import com.google.cloud.Clock;
25-
import com.google.cloud.pubsub.MessagesProcessor.AcksProcessor;
26-
import com.google.cloud.pubsub.MessagesProcessor.PendingModifyAckDeadline;
25+
import com.google.cloud.pubsub.spi.v1.MessagesProcessor.AcksProcessor;
26+
import com.google.cloud.pubsub.spi.v1.MessagesProcessor.PendingModifyAckDeadline;
2727
import com.google.common.collect.Lists;
2828
import com.google.common.util.concurrent.AbstractService;
2929
import com.google.common.util.concurrent.FutureCallback;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/Publisher.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

1919
import com.google.api.gax.bundling.FlowController;
2020
import com.google.api.gax.grpc.BundlingSettings;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PublisherImpl.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

1919
import com.google.api.gax.bundling.FlowController;
2020
import com.google.auth.oauth2.GoogleCredentials;
21-
import com.google.cloud.pubsub.spi.v1.PublisherSettings;
2221
import com.google.common.base.Optional;
2322
import com.google.common.collect.ImmutableList;
2423
import com.google.common.primitives.Ints;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PublisherStats.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherStats.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

1919
import com.google.auto.value.AutoValue;
2020

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/StatusUtil.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StatusUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

1919
import io.grpc.Status;
2020

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/StreamingSubscriberConnection.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.spi.v1;
1818

19-
import static com.google.cloud.pubsub.StatusUtil.isRetryable;
19+
import static com.google.cloud.pubsub.spi.v1.StatusUtil.isRetryable;
2020

2121
import com.google.api.gax.bundling.FlowController;
2222
import com.google.api.stats.Distribution;
2323
import com.google.auth.Credentials;
2424
import com.google.cloud.Clock;
25-
import com.google.cloud.pubsub.MessagesProcessor.AcksProcessor;
26-
import com.google.cloud.pubsub.MessagesProcessor.PendingModifyAckDeadline;
25+
import com.google.cloud.pubsub.spi.v1.MessagesProcessor.AcksProcessor;
26+
import com.google.cloud.pubsub.spi.v1.MessagesProcessor.PendingModifyAckDeadline;
2727
import com.google.common.collect.Lists;
2828
import com.google.common.util.concurrent.AbstractService;
2929
import com.google.common.util.concurrent.FutureCallback;

0 commit comments

Comments
 (0)