---

sduskis · web-flow · commit c5ad7a12bbc8 · 2019-04-16T10:59:27.000-04:00
yaml --- r: 35553 b: refs/heads/autosynth-iamcredentials c: e5e7a21 h: refs/heads/master i: 35551: d30cde8
diff --git a/[refs] b/[refs]
@@ -159,7 +159,7 @@ refs/heads/pubsub-ordering-keys: 3ea3dc93288c90e1776339a2c059a076e2e2fd1d
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
-refs/heads/autosynth-iamcredentials: 3c8c8d6104f8b914a7899fbd3258bd7534932664
+refs/heads/autosynth-iamcredentials: e5e7a21bdc829ae207af71388e1a37fe286f2cc1
 refs/heads/release-google-cloud-java-v0.78.0: fae5e980779cf0173a152636b278015b9f60ee55
 refs/tags/v0.78.0: 62d4bd30605ab3578f9a08d84487fb0b33ac2ff5
 refs/tags/v0.79.0: 82287b570708748c411d05c40f3932cff9606feb
diff --git a/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
@@ -376,8 +376,7 @@ public void run() {
   /** Compute the ideal deadline, set subsequent modacks to this deadline, and return it. */
   @InternalApi
   int computeDeadlineSeconds() {
-    long secLong = ackLatencyDistribution.getNthPercentile(PERCENTILE_FOR_ACK_DEADLINE_UPDATES);
-    int sec = Ints.saturatedCast(secLong);
+    int sec = ackLatencyDistribution.getPercentile(PERCENTILE_FOR_ACK_DEADLINE_UPDATES);
 
     // Use Ints.constrainToRange when we get guava 21.
     if (sec < Subscriber.MIN_ACK_DEADLINE_SECONDS) {
diff --git a/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -16,6 +16,8 @@
 
 package com.google.cloud.pubsub.v1;
 
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutureCallback;
@@ -357,7 +359,8 @@ public void onFailure(Throwable t) {
               messagesWaiter.incrementPendingMessages(-outstandingBatch.size());
             }
           }
-        });
+        },
+        directExecutor());
   }
 
   private static final class OutstandingBatch {
diff --git a/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java b/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java
@@ -16,6 +16,8 @@
 
 package com.google.cloud.pubsub.v1;
 
+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+
 import com.google.api.core.AbstractApiService;
 import com.google.api.core.ApiClock;
 import com.google.api.core.ApiFuture;
@@ -291,7 +293,7 @@ public void onFailure(Throwable t) {
                         .addAllAckIds(idChunk)
                         .setAckDeadlineSeconds(modack.deadlineExtensionSeconds)
                         .build());
-        ApiFutures.addCallback(future, loggingCallback);
+        ApiFutures.addCallback(future, loggingCallback, directExecutor());
       }
     }
 
@@ -303,7 +305,7 @@ public void onFailure(Throwable t) {
                       .setSubscription(subscription)
                       .addAllAckIds(idChunk)
                       .build());
-      ApiFutures.addCallback(future, loggingCallback);
+      ApiFutures.addCallback(future, loggingCallback, directExecutor());
     }
   }
 }
diff --git a/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java b/branches/autosynth-iamcredentials/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
@@ -42,8 +42,8 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`package com.google.cloud.pubsub.v1;`
`18`	`18`
	`19`	`+import static com.google.common.util.concurrent.MoreExecutors.directExecutor;`
	`20`	`+`
`19`	`21`	`import com.google.api.core.ApiFunction;`
`20`	`22`	`import com.google.api.core.ApiFuture;`
`21`	`23`	`import com.google.api.core.ApiFutureCallback;`
`@@ -357,7 +359,8 @@ public void onFailure(Throwable t) {`
`357`	`359`	`messagesWaiter.incrementPendingMessages(-outstandingBatch.size());`
`358`	`360`	`}`
`359`	`361`	`}`
`360`		`- });`
	`362`	`+ },`
	`363`	`+ directExecutor());`
`361`	`364`	`}`
`362`	`365`
`363`	`366`	`private static final class OutstandingBatch {`