Move getDrainTimeout to default method in the interface, add test for…

… it, disable SNS sink

Signed-off-by: Chase Engelbrecht <[email protected]>

.gitignore

@@ -13,5 +13,3 @@ gradle/tools
 # Ignore config file generated by test
 data-prepper-main/src/test/resources/logstash-filter.yaml
 data-prepper-main/src/test/resources/logstash-conf/logstash-filter.yaml
-data-prepper-plugins/sns-sink/C:\\Work\\dlq.txt
-data-prepper-plugins/sns-sink/local_dlq_file

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/AbstractBuffer.java

@@ -13,7 +13,6 @@
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
 import org.opensearch.dataprepper.model.record.Record;
 
-import java.time.Duration;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -181,9 +180,4 @@ protected int getRecordsInFlight() {
     public void postProcess(final Long recordsInBuffer) {
 
     }
-
-    @Override
-    public Duration getDrainTimeout() {
-        return Duration.ZERO;
-    }
 }

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/Buffer.java

@@ -55,5 +55,7 @@ public interface Buffer<T extends Record<?>> {
 
     boolean isEmpty();
 
-    Duration getDrainTimeout();
+    default Duration getDrainTimeout() {
+        return Duration.ZERO;
+    }
 }

data-prepper-api/src/test/java/org/opensearch/dataprepper/model/buffer/AbstractBufferTest.java

@@ -16,7 +16,6 @@
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
 import org.opensearch.dataprepper.model.record.Record;
 
-import java.time.Duration;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -260,13 +259,6 @@ public void testWriteAllRuntimeException() {
         Assert.assertThrows(NullPointerException.class, () -> abstractBuffer.writeAll(testRecords, 1000));
     }
 
-    @Test
-    public void testGetDrainTimeout() {
-        final AbstractBuffer<Record<String>> abstractBuffer = new AbstractBufferImpl(testPluginSetting);
-
-        Assert.assertEquals(Duration.ZERO, abstractBuffer.getDrainTimeout());
-    }
-
     public static class AbstractBufferImpl extends AbstractBuffer<Record<String>> {
         private final Queue<Record<String>> queue;
         public AbstractBufferImpl(PluginSetting pluginSetting) {

data-prepper-api/src/test/java/org/opensearch/dataprepper/model/buffer/BufferTest.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.model.buffer;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.opensearch.dataprepper.model.event.Event;
+import org.opensearch.dataprepper.model.record.Record;
+
+import java.time.Duration;
+
+import static org.mockito.Mockito.spy;
+
+public class BufferTest {
+
+    @Test
+    public void testGetDrainTimeout() {
+        final Buffer<Record<Event>> buffer = spy(Buffer.class);
+
+        Assert.assertEquals(Duration.ZERO, buffer.getDrainTimeout());
+    }
+}

data-prepper-plugins/common/src/test/java/org/opensearch/dataprepper/plugins/buffer/TestBuffer.java

@@ -12,7 +12,6 @@
 import org.opensearch.dataprepper.model.event.Event;
 import org.opensearch.dataprepper.model.record.Record;
 
-import java.time.Duration;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -93,8 +92,4 @@ public int size() {
         return buffer.size();
     }
 
-    @Override
-    public Duration getDrainTimeout() {
-        return Duration.ZERO;
-    }
 }

settings.gradle

@@ -139,7 +139,7 @@ include 'data-prepper-plugins:buffer-common'
 include 'data-prepper-plugins:sqs-source'
 include 'data-prepper-plugins:cloudwatch-logs'
 include 'data-prepper-plugins:http-sink'
-include 'data-prepper-plugins:sns-sink'
+//include 'data-prepper-plugins:sns-sink'
 include 'data-prepper-plugins:prometheus-sink'
 include 'data-prepper-plugins:dissect-processor'
 include 'data-prepper-plugins:dynamodb-source'