From 1259e8f0efb5b1f2a56d8d049541401f29cc9f55 Mon Sep 17 00:00:00 2001
From: Shivani Shukla <sshkamz@amazon.com>
Date: Mon, 8 Feb 2021 16:30:17 -0600
Subject: [PATCH] Updating all usages of BlockingBuffer with the new path

---
 .../amazon/dataprepper/parser/model/PipelineConfiguration.java  | 2 +-
 .../src/main/java/com/amazon/dataprepper/pipeline/Pipeline.java | 2 +-
 .../dataprepper/parser/model/PipelineConfigurationTests.java    | 2 +-
 .../java/com/amazon/dataprepper/pipeline/PipelineTests.java     | 2 +-
 .../amazon/dataprepper/plugins/buffer/BufferFactoryTests.java   | 2 ++
 .../com/amazon/dataprepper/plugins/source/FileSourceTests.java  | 2 +-
 .../plugins/source/oteltrace/OTelTraceSourceTest.java           | 2 +-
 .../amazon/dataprepper/research/zipkin/ZipkinElasticToOtel.java | 2 +-
 settings.gradle                                                 | 2 ++
 9 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/data-prepper-core/src/main/java/com/amazon/dataprepper/parser/model/PipelineConfiguration.java b/data-prepper-core/src/main/java/com/amazon/dataprepper/parser/model/PipelineConfiguration.java
index be561a1be..6500f1b0f 100644
--- a/data-prepper-core/src/main/java/com/amazon/dataprepper/parser/model/PipelineConfiguration.java
+++ b/data-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
index f21739a98..45d660e16 100644
--- 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/data-prepper-core/src/test/java/com/amazon/dataprepper/parser/model/PipelineConfigurationTests.java b/data-prepper-core/src/test/java/com/amazon/dataprepper/parser/model/PipelineConfigurationTests.java
index 7ea12eae9..2acaec23c 100644
--- a/data-prepper-core/src/test/java/com/amazon/dataprepper/parser/model/PipelineConfigurationTests.java
+++ b/data-prepper-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
index 043ac6d0f..eca525f84 100644
--- 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/data-prepper-plugins/common/src/test/java/com/amazon/dataprepper/plugins/buffer/BufferFactoryTests.java b/data-prepper-plugins/common/src/test/java/com/amazon/dataprepper/plugins/buffer/BufferFactoryTests.java
index 76e2b78cd..cf9af3d08 100644
--- a/data-prepper-plugins/common/src/test/java/com/amazon/dataprepper/plugins/buffer/BufferFactoryTests.java
+++ b/data-prepper-plugins/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/data-prepper-plugins/common/src/test/java/com/amazon/dataprepper/plugins/source/FileSourceTests.java b/data-prepper-plugins/common/src/test/java/com/amazon/dataprepper/plugins/source/FileSourceTests.java
index 694afe1ad..8202d890e 100644
--- a/data-prepper-plugins/common/src/test/java/com/amazon/dataprepper/plugins/source/FileSourceTests.java
+++ b/data-prepper-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/data-prepper-plugins/otel-trace-source/src/test/java/com/amazon/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java b/data-prepper-plugins/otel-trace-source/src/test/java/com/amazon/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java
index ecf7693ab..99b09130e 100644
--- a/data-prepper-plugins/otel-trace-source/src/test/java/com/amazon/dataprepper/plugins/source/oteltrace/OTelTraceSourceTest.java
+++ b/data-prepper-plugins/otel-trace-source/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/research/zipkin-elastic-to-otel/src/main/java/com/amazon/dataprepper/research/zipkin/ZipkinElasticToOtel.java b/research/zipkin-elastic-to-otel/src/main/java/com/amazon/dataprepper/research/zipkin/ZipkinElasticToOtel.java
index 462a6bbcc..cdb36e2ee 100644
--- a/research/zipkin-elastic-to-otel/src/main/java/com/amazon/dataprepper/research/zipkin/ZipkinElasticToOtel.java
+++ b/research/zipkin-elastic-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
index bfa25fe10..99acf7059 100644
--- 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'