add-max-retry-property-support

AntonZarutsky · AntonZarutsky · commit 779f5262a937 · 2017-05-15T19:42:19.000+02:00
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java
@@ -364,7 +364,7 @@ public void onFailure(Throwable t) {
                 computeNextBackoffDelayMs(outstandingBatch, retrySettings, longRandom);
 
             if (!isRetryable(t)
-                || (retrySettings.getMaxAttempts() > 0 && outstandingBatch.getAttempt() > retrySettings.getMaxAttempts())
+                || retrySettings.getMaxAttempts() > 0 && outstandingBatch.getAttempt() > retrySettings.getMaxAttempts()
                 || System.currentTimeMillis() + nextBackoffDelay
                     > outstandingBatch.creationTime
                         + retrySettings.getTotalTimeout().toMillis()) {
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java
@@ -298,10 +298,9 @@ public void testPublishFailureRetries_retriesDisabled() throws Exception {
       try {
           publishFuture1.get();
       } finally {
-          assertTrue(testPublisherServiceImpl.getCapturedRequests().size() == 1);
+          assertSame(testPublisherServiceImpl.getCapturedRequests().size(), 1);
           publisher.shutdown();
       }
-    publisher.shutdown();
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -298,10 +298,9 @@ public void testPublishFailureRetries_retriesDisabled() throws Exception {`
`298`	`298`	`try {`
`299`	`299`	`publishFuture1.get();`
`300`	`300`	`} finally {`
`301`		`- assertTrue(testPublisherServiceImpl.getCapturedRequests().size() == 1);`
	`301`	`+ assertSame(testPublisherServiceImpl.getCapturedRequests().size(), 1);`
`302`	`302`	`publisher.shutdown();`
`303`	`303`	`}`
`304`		`- publisher.shutdown();`
`305`	`304`	`}`
`306`	`305`
`307`	`306`	`@Test`