From 3691237d89d46119f155436f5c7b4c6c47560e4e Mon Sep 17 00:00:00 2001 From: jushkem <20001595+jushkem@users.noreply.github.com> Date: Mon, 10 Feb 2020 10:40:09 -0800 Subject: [PATCH] Adding default. --- .../amazon/kinesis/retrieval/RecordsPublisher.java | 8 ++++++-- .../retrieval/fanout/FanOutRecordsPublisher.java | 10 ---------- .../retrieval/polling/BlockingRecordsPublisher.java | 10 ---------- .../retrieval/polling/PrefetchRecordsPublisher.java | 10 ---------- .../kinesis/lifecycle/ShardConsumerSubscriberTest.java | 10 ---------- .../amazon/kinesis/lifecycle/ShardConsumerTest.java | 10 ---------- 6 files changed, 6 insertions(+), 52 deletions(-) diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RecordsPublisher.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RecordsPublisher.java index 63cd0588..6634b2fa 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RecordsPublisher.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/RecordsPublisher.java @@ -68,14 +68,18 @@ public interface RecordsPublisher extends Publisher { * * @return requestId associated with last succesful response. */ - String getLastSuccessfulResponseRequestId(); + default String getLastSuccessfulResponseRequestId() { + return getLastSuccessfulResponseDetails().map(RequestDetails::requestId).orElse(NONE); + } /** * Gets last successful response's timestamp. * * @return timestamp associated with last successful response. */ - String getLastSuccessfulResponseTimestamp(); + default String getLastSuccessfulResponseTimestamp() { + return getLastSuccessfulResponseDetails().map(RequestDetails::timestamp).orElse(NONE); + } /** * Notify the publisher on receipt of a data event. diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutRecordsPublisher.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutRecordsPublisher.java index 4e8e2205..d9d30108 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutRecordsPublisher.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutRecordsPublisher.java @@ -156,16 +156,6 @@ public class FanOutRecordsPublisher implements RecordsPublisher { lastSuccessfulRequestDetails = Optional.of(requestDetails); } - @Override - public String getLastSuccessfulResponseRequestId() { - return getLastSuccessfulResponseDetails().map(RequestDetails::requestId).orElse(NONE); - } - - @Override - public String getLastSuccessfulResponseTimestamp() { - return getLastSuccessfulResponseDetails().map(RequestDetails::timestamp).orElse(NONE); - } - // This method is not thread-safe. You need to acquire a lock in the caller in order to execute this. @VisibleForTesting RecordFlow evictAckedEventAndScheduleNextEvent(RecordsDeliveryAck recordsDeliveryAck) { diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/BlockingRecordsPublisher.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/BlockingRecordsPublisher.java index 7cdea6c9..484a8b2b 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/BlockingRecordsPublisher.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/BlockingRecordsPublisher.java @@ -77,16 +77,6 @@ public class BlockingRecordsPublisher implements RecordsPublisher { return Optional.empty(); } - @Override - public String getLastSuccessfulResponseRequestId() { - return NONE; - } - - @Override - public String getLastSuccessfulResponseTimestamp() { - return NONE; - } - @Override public void subscribe(Subscriber s) { subscriber = s; diff --git a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java index c8202d05..82fd0e7d 100644 --- a/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java +++ b/amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/polling/PrefetchRecordsPublisher.java @@ -267,16 +267,6 @@ public class PrefetchRecordsPublisher implements RecordsPublisher { return Optional.empty(); } - @Override - public String getLastSuccessfulResponseRequestId() { - return NONE; - } - - @Override - public String getLastSuccessfulResponseTimestamp() { - return NONE; - } - @Override public void restartFrom(RecordsRetrieved recordsRetrieved) { if (!(recordsRetrieved instanceof PrefetchRecordsRetrieved)) { diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerSubscriberTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerSubscriberTest.java index c98ebfe7..eeb68c0a 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerSubscriberTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerSubscriberTest.java @@ -563,16 +563,6 @@ public class ShardConsumerSubscriberTest { return Optional.empty(); } - @Override - public String getLastSuccessfulResponseRequestId() { - return NONE; - } - - @Override - public String getLastSuccessfulResponseTimestamp() { - return NONE; - } - @Override public void subscribe(Subscriber s) { subscriber = s; diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java index e16e4b51..a679a66d 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/lifecycle/ShardConsumerTest.java @@ -215,16 +215,6 @@ public class ShardConsumerTest { return Optional.empty(); } - @Override - public String getLastSuccessfulResponseRequestId() { - return NONE; - } - - @Override - public String getLastSuccessfulResponseTimestamp() { - return NONE; - } - @Override public void subscribe(Subscriber s) { subscriber = s;