From 427429fc7ae52eac57cd094daed7c6a3fcc0ba77 Mon Sep 17 00:00:00 2001 From: Krishna Kondaka Date: Wed, 13 Mar 2024 16:18:28 +0000 Subject: [PATCH] Renamed JsonObjDecoder to JsonObjectDecoder Signed-off-by: Krishna Kondaka --- ...nObjDecoder.java => JsonObjectDecoder.java} | 2 +- ...derTest.java => JsonObjectDecoderTest.java} | 18 +++++++++--------- .../plugins/source/loghttp/HTTPSource.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) rename data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/{JsonObjDecoder.java => JsonObjectDecoder.java} (97%) rename data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/{JsonObjDecoderTest.java => JsonObjectDecoderTest.java} (79%) diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonObjDecoder.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonObjectDecoder.java similarity index 97% rename from data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonObjDecoder.java rename to data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonObjectDecoder.java index 008041c16a..6485de0e87 100644 --- a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonObjDecoder.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/codec/JsonObjectDecoder.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.function.Consumer; -public class JsonObjDecoder implements ByteDecoder { +public class JsonObjectDecoder implements ByteDecoder { private final ObjectMapper objectMapper = new ObjectMapper(); private final JsonFactory jsonFactory = new JsonFactory(); diff --git a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonObjDecoderTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonObjectDecoderTest.java similarity index 79% rename from data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonObjDecoderTest.java rename to data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonObjectDecoderTest.java index ec65f30ecd..3f9aff511d 100644 --- a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonObjDecoderTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/codec/JsonObjectDecoderTest.java @@ -17,29 +17,29 @@ import org.junit.jupiter.api.BeforeEach; -public class JsonObjDecoderTest { - private JsonObjDecoder jsonObjDecoder; +public class JsonObjectDecoderTest { + private JsonObjectDecoder jsonObjectDecoder; private Record receivedRecord; private Instant receivedTime; - private JsonObjDecoder createObjectUnderTest() { - return new JsonObjDecoder(); + private JsonObjectDecoder createObjectUnderTest() { + return new JsonObjectDecoder(); } @BeforeEach void setup() { - jsonObjDecoder = createObjectUnderTest(); + jsonObjectDecoder = createObjectUnderTest(); receivedRecord = null; } @Test - void test_basicJsonObjDecoder() { + void test_basicJsonObjectDecoder() { String stringValue = UUID.randomUUID().toString(); Random r = new Random(); int intValue = r.nextInt(); String inputString = "{\"key1\":\""+stringValue+"\", \"key2\":"+intValue+"}"; try { - jsonObjDecoder.parse(new ByteArrayInputStream(inputString.getBytes()), null, (record) -> { + jsonObjectDecoder.parse(new ByteArrayInputStream(inputString.getBytes()), null, (record) -> { receivedRecord = record; }); } catch (Exception e){} @@ -51,7 +51,7 @@ void test_basicJsonObjDecoder() { } @Test - void test_basicJsonObjDecoder_withTimeReceived() { + void test_basicJsonObjectDecoder_withTimeReceived() { String stringValue = UUID.randomUUID().toString(); Random r = new Random(); int intValue = r.nextInt(); @@ -59,7 +59,7 @@ void test_basicJsonObjDecoder_withTimeReceived() { String inputString = "{\"key1\":\""+stringValue+"\", \"key2\":"+intValue+"}"; final Instant now = Instant.now(); try { - jsonObjDecoder.parse(new ByteArrayInputStream(inputString.getBytes()), now, (record) -> { + jsonObjectDecoder.parse(new ByteArrayInputStream(inputString.getBytes()), now, (record) -> { receivedRecord = record; receivedTime = ((DefaultEventHandle)(((Event)record.getData()).getEventHandle())).getInternalOriginationTime(); }); diff --git a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java index 3771436423..5dd7292417 100644 --- a/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java +++ b/data-prepper-plugins/http-source/src/main/java/org/opensearch/dataprepper/plugins/source/loghttp/HTTPSource.java @@ -20,7 +20,7 @@ import org.opensearch.dataprepper.model.record.Record; import org.opensearch.dataprepper.model.source.Source; import org.opensearch.dataprepper.model.codec.ByteDecoder; -import org.opensearch.dataprepper.model.codec.JsonObjDecoder; +import org.opensearch.dataprepper.model.codec.JsonObjectDecoder; import com.linecorp.armeria.server.HttpService; import com.linecorp.armeria.server.Server; import com.linecorp.armeria.server.ServerBuilder; @@ -64,7 +64,7 @@ public HTTPSource(final HTTPSourceConfig sourceConfig, final PluginMetrics plugi this.sourceConfig = sourceConfig; this.pluginMetrics = pluginMetrics; this.pipelineName = pipelineDescription.getPipelineName(); - this.byteDecoder = new JsonObjDecoder(); + this.byteDecoder = new JsonObjectDecoder(); this.certificateProviderFactory = new CertificateProviderFactory(sourceConfig); final PluginModel authenticationConfiguration = sourceConfig.getAuthentication(); final PluginSetting authenticationPluginSetting;