Skip to content

Commit 00582b8

Browse files
AntonZarutskyAntonZarutsky
committed
code formatting
1 parent 779f526 commit 00582b8

2 files changed

Lines changed: 25 additions & 29 deletions

File tree

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,29 @@
1616

1717
package com.google.cloud.pubsub.spi.v1;
1818

19+
import com.google.api.gax.batching.BatchingSettings;
1920
import com.google.api.core.ApiFuture;
2021
import com.google.api.core.ApiFutures;
21-
import com.google.api.core.SettableApiFuture;
22-
import com.google.api.gax.batching.BatchingSettings;
2322
import com.google.api.gax.batching.FlowControlSettings;
2423
import com.google.api.gax.batching.FlowController;
24+
import com.google.api.gax.retrying.RetrySettings;
25+
import com.google.api.core.SettableApiFuture;
2526
import com.google.api.gax.grpc.ChannelProvider;
2627
import com.google.api.gax.grpc.ExecutorProvider;
2728
import com.google.api.gax.grpc.InstantiatingExecutorProvider;
28-
import com.google.api.gax.retrying.RetrySettings;
2929
import com.google.auth.oauth2.GoogleCredentials;
3030
import com.google.common.annotations.VisibleForTesting;
3131
import com.google.common.base.Preconditions;
3232
import com.google.common.collect.ImmutableList;
3333
import com.google.common.util.concurrent.FutureCallback;
3434
import com.google.common.util.concurrent.Futures;
35-
import com.google.pubsub.v1.*;
35+
import com.google.pubsub.v1.PublishRequest;
36+
import com.google.pubsub.v1.PublishResponse;
37+
import com.google.pubsub.v1.PublisherGrpc;
38+
import com.google.pubsub.v1.PubsubMessage;
39+
import com.google.pubsub.v1.TopicName;
3640
import io.grpc.ManagedChannel;
3741
import io.grpc.Status;
38-
import org.threeten.bp.Duration;
39-
4042
import java.io.IOException;
4143
import java.util.ArrayList;
4244
import java.util.Iterator;
@@ -51,6 +53,7 @@
5153
import java.util.concurrent.locks.ReentrantLock;
5254
import java.util.logging.Level;
5355
import java.util.logging.Logger;
56+
import org.threeten.bp.Duration;
5457

5558
/**
5659
* A Cloud Pub/Sub <a href="https://cloud.google.com/pubsub/docs/publisher">publisher</a>, that is
@@ -340,8 +343,7 @@ public void onSuccess(PublishResponse result) {
340343
+ "the expected %s results. Please contact Cloud Pub/Sub support "
341344
+ "if this frequently occurs",
342345
result.getMessageIdsCount(), outstandingBatch.size()));
343-
for (OutstandingPublish oustandingMessage :
344-
outstandingBatch.outstandingPublishes) {
346+
for (OutstandingPublish oustandingMessage : outstandingBatch.outstandingPublishes) {
345347
oustandingMessage.publishResult.setException(t);
346348
}
347349
return;
@@ -364,10 +366,10 @@ public void onFailure(Throwable t) {
364366
computeNextBackoffDelayMs(outstandingBatch, retrySettings, longRandom);
365367

366368
if (!isRetryable(t)
367-
|| retrySettings.getMaxAttempts() > 0 && outstandingBatch.getAttempt() > retrySettings.getMaxAttempts()
369+
|| retrySettings.getMaxAttempts() > 0
370+
&& outstandingBatch.getAttempt() > retrySettings.getMaxAttempts()
368371
|| System.currentTimeMillis() + nextBackoffDelay
369-
> outstandingBatch.creationTime
370-
+ retrySettings.getTotalTimeout().toMillis()) {
372+
> outstandingBatch.creationTime + retrySettings.getTotalTimeout().toMillis()) {
371373
try {
372374
for (OutstandingPublish outstandingPublish :
373375
outstandingBatch.outstandingPublishes) {
@@ -405,10 +407,10 @@ private static final class OutstandingBatch {
405407
this.batchSizeBytes = batchSizeBytes;
406408
}
407409

408-
409410
public int getAttempt() {
410411
return attempt;
411412
}
413+
412414
public int size() {
413415
return outstandingPublishes.size();
414416
}
@@ -507,7 +509,8 @@ interface LongRandom {
507509
* Constructs a new {@link Builder} using the given topic.
508510
*
509511
* <p>Example of creating a {@code Publisher}.
510-
* <pre> {@code
512+
*
513+
* <pre>{@code
511514
* String projectName = "my_project";
512515
* String topicName = "my_topic";
513516
* TopicName topic = TopicName.create(projectName, topicName);
@@ -519,7 +522,6 @@ interface LongRandom {
519522
* publisher.shutdown();
520523
* }
521524
* }</pre>
522-
*
523525
*/
524526
public static Builder defaultBuilder(TopicName topicName) {
525527
return new Builder(topicName);

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -287,20 +287,19 @@ public void testPublishFailureRetries_retriesDisabled() throws Exception {
287287
.toBuilder()
288288
.setTotalTimeout(Duration.ofSeconds(10))
289289
.setMaxAttempts(1)
290-
.build()
291-
)
290+
.build())
292291
.build();
293292

294293
testPublisherServiceImpl.addPublishError(new Throwable("Transiently failing"));
295294

296295
ApiFuture<String> publishFuture1 = sendTestMessage(publisher, "A");
297296

298-
try {
299-
publishFuture1.get();
300-
} finally {
301-
assertSame(testPublisherServiceImpl.getCapturedRequests().size(), 1);
302-
publisher.shutdown();
303-
}
297+
try {
298+
publishFuture1.get();
299+
} finally {
300+
assertSame(testPublisherServiceImpl.getCapturedRequests().size(), 1);
301+
publisher.shutdown();
302+
}
304303
}
305304

306305
@Test
@@ -313,8 +312,7 @@ public void testPublishFailureRetries_maxRetriesSetup() throws Exception {
313312
.toBuilder()
314313
.setTotalTimeout(Duration.ofSeconds(10))
315314
.setMaxAttempts(3)
316-
.build()
317-
)
315+
.build())
318316
.build();
319317

320318
testPublisherServiceImpl.addPublishError(new Throwable("Transiently failing"));
@@ -339,8 +337,7 @@ public void testPublishFailureRetries_maxRetriesSetUnlimited() throws Exception
339337
.toBuilder()
340338
.setTotalTimeout(Duration.ofSeconds(10))
341339
.setMaxAttempts(0)
342-
.build()
343-
)
340+
.build())
344341
.build();
345342

346343
testPublisherServiceImpl.addPublishError(new Throwable("Transiently failing"));
@@ -355,7 +352,6 @@ public void testPublishFailureRetries_maxRetriesSetUnlimited() throws Exception
355352
publisher.shutdown();
356353
}
357354

358-
359355
public void testPublishFailureRetries_exceededsRetryDuration() throws Exception {
360356
Publisher publisher =
361357
getTestPublisherBuilder()
@@ -420,8 +416,6 @@ public void testPublishFailureRetries_nonRetryableFailsImmediately() throws Exce
420416
}
421417
}
422418

423-
424-
425419
@Test
426420
public void testPublisherGetters() throws Exception {
427421
Publisher.Builder builder = Publisher.defaultBuilder(TEST_TOPIC);

0 commit comments

Comments
 (0)