Skip to content

Commit 2239a50

Browse files
pongadpongad
committed
google-java-format changed lines
1 parent c644775 commit 2239a50

File tree

4 files changed

+24
-43
lines changed

4 files changed

+24
-43
lines changed

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSub.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@
2121
import com.google.cloud.Page;
2222
import com.google.cloud.Policy;
2323
import com.google.cloud.Service;
24-
2524
import java.io.IOException;
26-
import java.util.Iterator;
2725
import java.util.List;
2826
import java.util.Map;
2927
import java.util.concurrent.ExecutorService;
3028
import java.util.concurrent.Future;
31-
import java.util.concurrent.TimeUnit;
3229

3330
/**
3431
* An interface for Google Cloud Pub/Sub.
@@ -675,7 +672,8 @@ public static PullOption executorFactory(ExecutorFactory executorFactory) {
675672
*/
676673
Future<AsyncPage<SubscriptionId>> listSubscriptionsAsync(String topic, ListOption... options);
677674

678-
Subscriber subscriber(SubscriptionInfo subscription, Subscriber.MessageReceiver receiver) throws IOException;
675+
Subscriber subscriber(SubscriptionInfo subscription, Subscriber.MessageReceiver receiver)
676+
throws IOException;
679677

680678
/**
681679
* Returns the IAM access control policy for the specified topic. Returns {@code null} if the

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

+5-14
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import static com.google.cloud.pubsub.PubSub.ListOption.OptionType.PAGE_SIZE;
2020
import static com.google.cloud.pubsub.PubSub.ListOption.OptionType.PAGE_TOKEN;
21-
import static com.google.cloud.pubsub.PubSub.PullOption.OptionType.EXECUTOR_FACTORY;
22-
import static com.google.cloud.pubsub.PubSub.PullOption.OptionType.MAX_QUEUED_CALLBACKS;
2321
import static com.google.common.base.MoreObjects.firstNonNull;
2422
import static com.google.common.base.Preconditions.checkArgument;
2523

@@ -30,16 +28,13 @@
3028
import com.google.cloud.PageImpl;
3129
import com.google.cloud.Policy;
3230
import com.google.cloud.pubsub.spi.PubSubRpc;
33-
import com.google.cloud.pubsub.spi.PubSubRpc.PullFuture;
3431
import com.google.cloud.pubsub.spi.v1.PublisherClient;
3532
import com.google.cloud.pubsub.spi.v1.SubscriberClient;
36-
import com.google.common.annotations.VisibleForTesting;
3733
import com.google.common.base.Function;
3834
import com.google.common.base.Throwables;
3935
import com.google.common.collect.ImmutableList;
4036
import com.google.common.collect.ImmutableSet;
4137
import com.google.common.collect.Iterables;
42-
import com.google.common.collect.Iterators;
4338
import com.google.common.collect.Lists;
4439
import com.google.common.collect.Maps;
4540
import com.google.common.util.concurrent.Futures;
@@ -49,7 +44,6 @@
4944
import com.google.iam.v1.TestIamPermissionsRequest;
5045
import com.google.iam.v1.TestIamPermissionsResponse;
5146
import com.google.protobuf.Empty;
52-
import com.google.pubsub.v1.AcknowledgeRequest;
5347
import com.google.pubsub.v1.DeleteSubscriptionRequest;
5448
import com.google.pubsub.v1.DeleteTopicRequest;
5549
import com.google.pubsub.v1.GetSubscriptionRequest;
@@ -60,22 +54,16 @@
6054
import com.google.pubsub.v1.ListTopicSubscriptionsResponse;
6155
import com.google.pubsub.v1.ListTopicsRequest;
6256
import com.google.pubsub.v1.ListTopicsResponse;
63-
import com.google.pubsub.v1.ModifyAckDeadlineRequest;
6457
import com.google.pubsub.v1.ModifyPushConfigRequest;
6558
import com.google.pubsub.v1.PublishRequest;
6659
import com.google.pubsub.v1.PublishResponse;
67-
import com.google.pubsub.v1.PullRequest;
68-
import com.google.pubsub.v1.PullResponse;
69-
7060
import java.io.IOException;
7161
import java.util.Collections;
72-
import java.util.Iterator;
7362
import java.util.List;
7463
import java.util.Map;
7564
import java.util.Set;
7665
import java.util.concurrent.ExecutionException;
7766
import java.util.concurrent.Future;
78-
import java.util.concurrent.TimeUnit;
7967

8068
class PubSubImpl extends BaseService<PubSubOptions> implements PubSub {
8169

@@ -505,9 +493,12 @@ public Future<AsyncPage<SubscriptionId>> listSubscriptionsAsync(String topic,
505493
}
506494

507495
@Override
508-
public Subscriber subscriber(SubscriptionInfo subscription, Subscriber.MessageReceiver receiver) throws IOException {
496+
public Subscriber subscriber(SubscriptionInfo subscription, Subscriber.MessageReceiver receiver)
497+
throws IOException {
509498
// TODO(pongad): Provide a way to pass in the rest of the options.
510-
String subName = SubscriberClient.formatSubscriptionName(getOptions().getProjectId(), subscription.getName());
499+
String subName =
500+
SubscriberClient.formatSubscriptionName(
501+
getOptions().getProjectId(), subscription.getName());
511502
return Subscriber.Builder.newBuilder(subName, receiver)
512503
.setCredentials(getOptions().getCredentials())
513504
.setClock(getOptions().getClock())

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

+3-21
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,15 @@
2323
import static org.junit.Assert.assertNull;
2424
import static org.junit.Assert.assertSame;
2525
import static org.junit.Assert.assertTrue;
26-
import static org.junit.Assert.fail;
2726

2827
import com.google.cloud.AsyncPage;
29-
import com.google.cloud.GrpcServiceOptions.ExecutorFactory;
3028
import com.google.cloud.Identity;
3129
import com.google.cloud.Page;
3230
import com.google.cloud.Policy;
3331
import com.google.cloud.RetryParams;
3432
import com.google.cloud.Role;
3533
import com.google.cloud.pubsub.PubSub.ListOption;
36-
import com.google.cloud.pubsub.PubSub.PullOption;
3734
import com.google.cloud.pubsub.spi.PubSubRpc;
38-
import com.google.cloud.pubsub.spi.PubSubRpc.PullCallback;
39-
import com.google.cloud.pubsub.spi.PubSubRpc.PullFuture;
4035
import com.google.cloud.pubsub.spi.PubSubRpcFactory;
4136
import com.google.common.base.Function;
4237
import com.google.common.collect.ImmutableList;
@@ -48,7 +43,6 @@
4843
import com.google.iam.v1.TestIamPermissionsRequest;
4944
import com.google.iam.v1.TestIamPermissionsResponse;
5045
import com.google.protobuf.Empty;
51-
import com.google.pubsub.v1.AcknowledgeRequest;
5246
import com.google.pubsub.v1.DeleteSubscriptionRequest;
5347
import com.google.pubsub.v1.DeleteTopicRequest;
5448
import com.google.pubsub.v1.GetSubscriptionRequest;
@@ -59,31 +53,19 @@
5953
import com.google.pubsub.v1.ListTopicSubscriptionsResponse;
6054
import com.google.pubsub.v1.ListTopicsRequest;
6155
import com.google.pubsub.v1.ListTopicsResponse;
62-
import com.google.pubsub.v1.ModifyAckDeadlineRequest;
6356
import com.google.pubsub.v1.ModifyPushConfigRequest;
6457
import com.google.pubsub.v1.PublishRequest;
6558
import com.google.pubsub.v1.PublishResponse;
66-
import com.google.pubsub.v1.PullRequest;
67-
import com.google.pubsub.v1.PullResponse;
68-
69-
import org.easymock.Capture;
59+
import java.util.List;
60+
import java.util.concurrent.ExecutionException;
61+
import java.util.concurrent.Future;
7062
import org.easymock.EasyMock;
71-
import org.easymock.IAnswer;
7263
import org.junit.After;
7364
import org.junit.Before;
7465
import org.junit.Rule;
7566
import org.junit.Test;
7667
import org.junit.rules.ExpectedException;
7768

78-
import java.io.IOException;
79-
import java.util.Iterator;
80-
import java.util.List;
81-
import java.util.concurrent.CountDownLatch;
82-
import java.util.concurrent.ExecutionException;
83-
import java.util.concurrent.ExecutorService;
84-
import java.util.concurrent.Future;
85-
import java.util.concurrent.TimeUnit;
86-
8769
public class PubSubImplTest {
8870

8971
private static final String PROJECT = "project";

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/SerializationTest.java

+14-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.cloud.Restorable;
2323
import com.google.cloud.pubsub.PubSub.ListOption;
2424
import com.google.cloud.pubsub.PubSub.PullOption;
25-
2625
import java.io.Serializable;
2726
import java.util.concurrent.ScheduledExecutorService;
2827

@@ -88,9 +87,20 @@ protected Serializable[] serializableObjects() {
8887
.setProjectId("p2")
8988
.setExecutorFactory(new TestExecutorFactory())
9089
.build();
91-
return new Serializable[]{options, otherOptions, MESSAGE, SUBSCRIPTION_INFO,
92-
SUBSCRIPTION, SUBSCRIPTION_ID, TOPIC_INFO, TOPIC, PAGE_TOKEN_OPTION, PAGE_SIZE_OPTION,
93-
MAX_QUEUED_CALLBACKS_OPTION, EXECUTOR_FACTORY_OPTION};
90+
return new Serializable[] {
91+
options,
92+
otherOptions,
93+
MESSAGE,
94+
SUBSCRIPTION_INFO,
95+
SUBSCRIPTION,
96+
SUBSCRIPTION_ID,
97+
TOPIC_INFO,
98+
TOPIC,
99+
PAGE_TOKEN_OPTION,
100+
PAGE_SIZE_OPTION,
101+
MAX_QUEUED_CALLBACKS_OPTION,
102+
EXECUTOR_FACTORY_OPTION
103+
};
94104
}
95105

96106
@Override

0 commit comments

Comments
 (0)