Skip to content

Commit 4e518dc

Browse files
pongadpongad
committed
move old pubsub.spi to pubsub.deprecated.spi
1 parent f8a7867 commit 4e518dc

8 files changed

Lines changed: 21 additions & 26 deletions

File tree

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/MessageConsumerImpl.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
import com.google.cloud.GrpcServiceOptions.ExecutorFactory;
2222
import com.google.cloud.pubsub.deprecated.PubSub.MessageConsumer;
2323
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
24-
import com.google.cloud.pubsub.spi.PubSubRpc;
25-
import com.google.cloud.pubsub.spi.PubSubRpc.PullCallback;
26-
import com.google.cloud.pubsub.spi.PubSubRpc.PullFuture;
24+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc;
25+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc.PullCallback;
26+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc.PullFuture;
2727
import com.google.pubsub.v1.PullRequest;
2828
import com.google.pubsub.v1.PullResponse;
29-
3029
import com.google.pubsub.v1.SubscriptionName;
3130
import io.grpc.internal.SharedResourceHolder;
32-
3331
import java.util.List;
3432
import java.util.concurrent.CancellationException;
3533
import java.util.concurrent.ExecutorService;

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/PubSubImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import com.google.cloud.Page;
3030
import com.google.cloud.PageImpl;
3131
import com.google.cloud.Policy;
32-
import com.google.cloud.pubsub.spi.PubSubRpc;
33-
import com.google.cloud.pubsub.spi.PubSubRpc.PullFuture;
32+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc;
33+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc.PullFuture;
3434
import com.google.common.annotations.VisibleForTesting;
3535
import com.google.common.base.Function;
3636
import com.google.common.base.Throwables;

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/PubSubOptions.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
package com.google.cloud.pubsub.deprecated;
1818

1919
import com.google.cloud.GrpcServiceOptions;
20-
import com.google.cloud.pubsub.spi.DefaultPubSubRpc;
21-
import com.google.cloud.pubsub.spi.PubSubRpc;
22-
import com.google.cloud.pubsub.spi.PubSubRpcFactory;
20+
import com.google.cloud.pubsub.deprecated.spi.DefaultPubSubRpc;
21+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc;
22+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpcFactory;
2323
import com.google.cloud.pubsub.spi.v1.PublisherSettings;
2424
import com.google.common.collect.ImmutableSet;
25-
2625
import java.io.IOException;
2726
import java.util.Set;
2827
import java.util.concurrent.ScheduledExecutorService;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/DefaultPubSubRpc.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/spi/DefaultPubSubRpc.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.spi;
17+
package com.google.cloud.pubsub.deprecated.spi;
1818

1919
import com.google.api.gax.core.ForwardingRpcFuture;
2020
import com.google.api.gax.core.Function;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/PubSubRpc.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/spi/PubSubRpc.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.spi;
17+
package com.google.cloud.pubsub.deprecated.spi;
1818

1919
import com.google.iam.v1.Policy;
2020
import com.google.iam.v1.SetIamPolicyRequest;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/PubSubRpcFactory.java renamed to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/spi/PubSubRpcFactory.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.spi;
17+
package com.google.cloud.pubsub.deprecated.spi;
1818

1919
import com.google.cloud.pubsub.deprecated.PubSubOptions;
2020
import com.google.cloud.spi.ServiceRpcFactory;

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/deprecated/MessageConsumerImplTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919
import com.google.cloud.GrpcServiceOptions.ExecutorFactory;
2020
import com.google.cloud.pubsub.deprecated.PubSub.MessageConsumer;
2121
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
22-
import com.google.cloud.pubsub.spi.PubSubRpc;
23-
import com.google.cloud.pubsub.spi.PubSubRpc.PullCallback;
24-
import com.google.cloud.pubsub.spi.PubSubRpc.PullFuture;
22+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc;
23+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc.PullCallback;
24+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc.PullFuture;
2525
import com.google.common.util.concurrent.ForwardingListenableFuture;
2626
import com.google.common.util.concurrent.FutureCallback;
2727
import com.google.common.util.concurrent.Futures;
2828
import com.google.pubsub.v1.PullRequest;
2929
import com.google.pubsub.v1.PullResponse;
30-
30+
import java.util.concurrent.CountDownLatch;
31+
import java.util.concurrent.ExecutorService;
32+
import java.util.concurrent.Future;
3133
import org.easymock.EasyMock;
3234
import org.easymock.IAnswer;
3335
import org.junit.After;
@@ -36,10 +38,6 @@
3638
import org.junit.Test;
3739
import org.junit.rules.Timeout;
3840

39-
import java.util.concurrent.CountDownLatch;
40-
import java.util.concurrent.ExecutorService;
41-
import java.util.concurrent.Future;
42-
4341
public class MessageConsumerImplTest {
4442

4543
private static final String PROJECT = "project";

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/deprecated/PubSubImplTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
import com.google.cloud.pubsub.deprecated.PubSub.MessageConsumer;
3737
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
3838
import com.google.cloud.pubsub.deprecated.PubSub.PullOption;
39-
import com.google.cloud.pubsub.spi.PubSubRpc;
40-
import com.google.cloud.pubsub.spi.PubSubRpc.PullCallback;
41-
import com.google.cloud.pubsub.spi.PubSubRpc.PullFuture;
42-
import com.google.cloud.pubsub.spi.PubSubRpcFactory;
39+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc;
40+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc.PullCallback;
41+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpc.PullFuture;
42+
import com.google.cloud.pubsub.deprecated.spi.PubSubRpcFactory;
4343
import com.google.common.base.Function;
4444
import com.google.common.collect.ImmutableList;
4545
import com.google.common.collect.Iterables;

0 commit comments

Comments
 (0)