---

chingor13 · web-flow · commit d7d85db71867 · 2019-01-07T11:05:08.000-08:00
yaml --- r: 15389 b: refs/heads/autosynth-containeranalysis c: f28bbcc h: refs/heads/master i: 15387: 8b20f20
diff --git a/[refs] b/[refs]
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigquerydatatransfer: a6667617707608b1dbfb02d59c22b5152f208
 refs/heads/autosynth-bigquerystorage: 14ab055598b943ae3f33f484e9fb1653355d08e7
 refs/heads/autosynth-bigtable: 2fbcb15847e0e89e79d6dc07420e28d7dfcea894
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
-refs/heads/autosynth-containeranalysis: 978f3b7aa6a1bf74641af684aa4aaff4468178e3
+refs/heads/autosynth-containeranalysis: f28bbcce35c6d178e36cd50d3e4daf4f81717919
 refs/heads/autosynth-datastore: af1fb76aa3eee02fe6f31f8fa1c72a4f048d149b
 refs/heads/autosynth-dialogflow: ebdd13c445b9674ff9ad4601f78d7ecd6f9c3660
 refs/heads/autosynth-errorreporting: 3d0566d6bebcc187f148bbed463b5a8e75b1edf6
diff --git a/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java b/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java
@@ -29,6 +29,4 @@ public interface AckReplyConsumer {
    * message.
    */
   void nack();
-
-  void abandon();
 }
diff --git a/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
@@ -133,7 +133,6 @@ private class AckHandler implements ApiFutureCallback<AckReply> {
     private final int outstandingBytes;
     private final long receivedTimeMillis;
     private final Instant totalExpiration;
-    private boolean extending = true;
 
     AckHandler(String ackId, int outstandingBytes, Instant totalExpiration) {
       this.ackId = ackId;
@@ -152,7 +151,6 @@ private void forget() {
          */
         return;
       }
-      extending = false;
       flowController.release(1, outstandingBytes);
       messagesWaiter.incrementPendingMessages(-1);
       processOutstandingBatches();
@@ -419,11 +417,6 @@ public void ack() {
             public void nack() {
               response.set(AckReply.NACK);
             }
-
-            @Override
-            public void abandon() {
-              ackHandler.forget();
-            }
           };
       ApiFutures.addCallback(response, ackHandler, MoreExecutors.directExecutor());
       executor.execute(
@@ -478,9 +471,6 @@ void extendDeadlines() {
     Instant extendTo = now.plusSeconds(extendSeconds);
 
     for (Map.Entry<String, AckHandler> entry : pendingMessages.entrySet()) {
-      if (!entry.getValue().extending) {
-        continue;
-      }
       String ackId = entry.getKey();
       Instant totalExpiration = entry.getValue().totalExpiration;
       if (totalExpiration.isAfter(extendTo)) {
diff --git a/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java b/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java
@@ -148,14 +148,6 @@ public void testNack() throws Exception {
     assertThat(sentModAcks).contains(ModAckItem.of(TEST_MESSAGE.getAckId(), 0));
   }
 
-  @Test
-  public void testAbandon() throws Exception {
-    dispatcher.processReceivedMessages(Collections.singletonList(TEST_MESSAGE), NOOP_RUNNABLE);
-    consumers.take().abandon();
-    dispatcher.extendDeadlines();
-    assertThat(sentModAcks).doesNotContain(TEST_MESSAGE.getAckId());
-  }
-
   @Test
   public void testExtension() throws Exception {
     dispatcher.processReceivedMessages(Collections.singletonList(TEST_MESSAGE), NOOP_RUNNABLE);

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,4 @@ public interface AckReplyConsumer {`
`29`	`29`	`* message.`
`30`	`30`	`*/`
`31`	`31`	`void nack();`
`32`		`-`
`33`		`- void abandon();`
`34`	`32`	`}`