Updating all usages of BlockingBuffer with the new path

opendistro-for-elasticsearch · Feb 8, 2021 · 1259e8f · 1259e8f
1 parent 67d2d94
commit 1259e8f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 7 deletions.
diff --git a/...prepper-core/src/main/java/com/amazon/dataprepper/parser/model/PipelineConfiguration.java b/...prepper-core/src/main/java/com/amazon/dataprepper/parser/model/PipelineConfiguration.java
@@ -1,7 +1,7 @@
 package com.amazon.dataprepper.parser.model;
 
 import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.plugins.buffer.BlockingBuffer;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/data-prepper-core/src/main/java/com/amazon/dataprepper/pipeline/Pipeline.java b/data-prepper-core/src/main/java/com/amazon/dataprepper/pipeline/Pipeline.java
@@ -7,7 +7,7 @@
 import com.amazon.dataprepper.model.source.Source;
 import com.amazon.dataprepper.pipeline.common.PipelineThreadFactory;
 import com.amazon.dataprepper.pipeline.common.PipelineThreadPoolExecutor;
-import com.amazon.dataprepper.plugins.buffer.BlockingBuffer;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...er-core/src/test/java/com/amazon/dataprepper/parser/model/PipelineConfigurationTests.java b/...er-core/src/test/java/com/amazon/dataprepper/parser/model/PipelineConfigurationTests.java
@@ -1,7 +1,7 @@
 package com.amazon.dataprepper.parser.model;
 
 import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.plugins.buffer.BlockingBuffer;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import org.junit.Test;
 
 import java.util.ArrayList;

diff --git a/data-prepper-core/src/test/java/com/amazon/dataprepper/pipeline/PipelineTests.java b/data-prepper-core/src/test/java/com/amazon/dataprepper/pipeline/PipelineTests.java
@@ -7,7 +7,7 @@
 import com.amazon.dataprepper.plugins.TestPrepper;
 import com.amazon.dataprepper.plugins.TestSink;
 import com.amazon.dataprepper.plugins.TestSource;
-import com.amazon.dataprepper.plugins.buffer.BlockingBuffer;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import org.junit.After;
 import org.junit.Test;
 

diff --git a/...lugins/common/src/test/java/com/amazon/dataprepper/plugins/buffer/BufferFactoryTests.java b/...lugins/common/src/test/java/com/amazon/dataprepper/plugins/buffer/BufferFactoryTests.java
@@ -3,6 +3,7 @@
 import com.amazon.dataprepper.model.buffer.Buffer;
 import com.amazon.dataprepper.model.configuration.PluginSetting;
 import com.amazon.dataprepper.plugins.PluginException;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -17,6 +18,7 @@
 @SuppressWarnings("rawtypes")
 public class BufferFactoryTests {
     private static String TEST_PIPELINE = "test-pipeline";
+
     /**
      * Tests if BufferFactory is able to retrieve default Source plugins by name
      */

diff --git a/...r-plugins/common/src/test/java/com/amazon/dataprepper/plugins/source/FileSourceTests.java b/...r-plugins/common/src/test/java/com/amazon/dataprepper/plugins/source/FileSourceTests.java
@@ -3,7 +3,7 @@
 import com.amazon.dataprepper.model.CheckpointState;
 import com.amazon.dataprepper.model.configuration.PluginSetting;
 import com.amazon.dataprepper.model.record.Record;
-import com.amazon.dataprepper.plugins.buffer.BlockingBuffer;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import com.amazon.dataprepper.plugins.buffer.TestBuffer;
 import com.google.common.collect.ImmutableMap;
 import org.junit.Test;

diff --git a/...ce/src/test/java/com/amazon/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java b/...ce/src/test/java/com/amazon/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java
@@ -3,7 +3,7 @@
 import com.amazon.dataprepper.model.CheckpointState;
 import com.amazon.dataprepper.model.configuration.PluginSetting;
 import com.amazon.dataprepper.model.record.Record;
-import com.amazon.dataprepper.plugins.buffer.BlockingBuffer;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import com.linecorp.armeria.client.Clients;

diff --git a/...tic-to-otel/src/main/java/com/amazon/dataprepper/research/zipkin/ZipkinElasticToOtel.java b/...tic-to-otel/src/main/java/com/amazon/dataprepper/research/zipkin/ZipkinElasticToOtel.java
@@ -2,7 +2,7 @@
 
 import com.amazon.dataprepper.model.configuration.PluginSetting;
 import com.amazon.dataprepper.model.record.Record;
-import com.amazon.dataprepper.plugins.buffer.BlockingBuffer;
+import com.amazon.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 import com.amazon.dataprepper.plugins.sink.elasticsearch.ConnectionConfiguration;
 import com.amazon.dataprepper.plugins.source.oteltrace.OTelTraceSource;
 import com.linecorp.armeria.client.Clients;

diff --git a/settings.gradle b/settings.gradle
@@ -24,4 +24,6 @@ include 'data-prepper-benchmarks:service-map-stateful-benchmarks'
 include 'data-prepper-plugins:otel-trace-raw-prepper'
 include 'data-prepper-plugins:otel-trace-source'
 include 'data-prepper-plugins:peer-forwarder'
+include 'data-prepper-plugins:blocking-buffer'
+findProject(':data-prepper-plugins:blocking-buffer')?.name = 'blocking-buffer'