---

chingor13 · web-flow · commit cab910281f4d · 2019-01-07T11:05:08.000-08:00
yaml --- r: 12611 b: refs/heads/master c: f28bbcc h: refs/heads/master i: 12609: 9ecd83b 12607: 38224ce
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 978f3b7aa6a1bf74641af684aa4aaff4468178e3
+refs/heads/master: f28bbcce35c6d178e36cd50d3e4daf4f81717919
 refs/heads/gh-pages: ab77ca69261397678c6addc69a7f9dd7c17c7b08
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
diff --git a/trunk/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java b/trunk/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/trunk/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/trunk/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/trunk/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java b/trunk/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`	`}`