Skip to content

Commit 57a8d87

Browse files
committed
Fix checkstyle unused imports and update compressed bulk request size expectations
Remove unused imports (ScriptConfiguration, HashMap, Map) from OpenSearchSink. Update expected compressed bulk request sizes in integration tests to account for the additional resolvedScriptParameters field in SerializedJsonImpl. Signed-off-by: Dinu John <86094133+dinujoh@users.noreply.github.com>
1 parent 9eef437 commit 57a8d87

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

  • data-prepper-plugins/opensearch/src

data-prepper-plugins/opensearch/src/integrationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ void testOutputRawSpanDefault(final boolean estimateBulkSizeUsingCompression,
529529
.add(OpenSearchSink.BULKREQUEST_SIZE_BYTES).toString());
530530
assertThat(bulkRequestSizeBytesMetrics.size(), equalTo(3));
531531
assertThat(bulkRequestSizeBytesMetrics.get(0).getValue(), closeTo(1.0, 0));
532-
final double expectedBulkRequestSizeBytes = isRequestCompressionEnabled && estimateBulkSizeUsingCompression ? 799.0 : 2058.0;
532+
final double expectedBulkRequestSizeBytes = isRequestCompressionEnabled && estimateBulkSizeUsingCompression ? 830.0 : 2058.0;
533533
assertThat(bulkRequestSizeBytesMetrics.get(1).getValue(), closeTo(expectedBulkRequestSizeBytes, 0));
534534
assertThat(bulkRequestSizeBytesMetrics.get(2).getValue(), closeTo(expectedBulkRequestSizeBytes, 0));
535535
}
@@ -615,7 +615,7 @@ void testOutputRawSpanWithDLQ(final boolean estimateBulkSizeUsingCompression,
615615
.add(OpenSearchSink.BULKREQUEST_SIZE_BYTES).toString());
616616
assertThat(bulkRequestSizeBytesMetrics.size(), equalTo(3));
617617
assertThat(bulkRequestSizeBytesMetrics.get(0).getValue(), closeTo(1.0, 0));
618-
final double expectedBulkRequestSizeBytes = isRequestCompressionEnabled && estimateBulkSizeUsingCompression ? 1085.0 : 2072.0;
618+
final double expectedBulkRequestSizeBytes = isRequestCompressionEnabled && estimateBulkSizeUsingCompression ? 1114.0 : 2072.0;
619619
assertThat(bulkRequestSizeBytesMetrics.get(1).getValue(), closeTo(expectedBulkRequestSizeBytes, 0));
620620
assertThat(bulkRequestSizeBytesMetrics.get(2).getValue(), closeTo(expectedBulkRequestSizeBytes, 0));
621621

@@ -677,7 +677,7 @@ void testOutputServiceMapDefault(final boolean estimateBulkSizeUsingCompression,
677677
.add(OpenSearchSink.BULKREQUEST_SIZE_BYTES).toString());
678678
assertThat(bulkRequestSizeBytesMetrics.size(), equalTo(3));
679679
assertThat(bulkRequestSizeBytesMetrics.get(0).getValue(), closeTo(1.0, 0));
680-
final double expectedBulkRequestSizeBytes = isRequestCompressionEnabled && estimateBulkSizeUsingCompression ? 376.0 : 265.0;
680+
final double expectedBulkRequestSizeBytes = isRequestCompressionEnabled && estimateBulkSizeUsingCompression ? 410.0 : 265.0;
681681
assertThat(bulkRequestSizeBytesMetrics.get(1).getValue(), closeTo(expectedBulkRequestSizeBytes, 0));
682682
assertThat(bulkRequestSizeBytesMetrics.get(2).getValue(), closeTo(expectedBulkRequestSizeBytes, 0));
683683

data-prepper-plugins/opensearch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.JavaClientAccumulatingUncompressedBulkRequest;
6262
import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.SerializedJson;
6363
import org.opensearch.dataprepper.plugins.sink.opensearch.configuration.ActionConfiguration;
64-
import org.opensearch.dataprepper.plugins.sink.opensearch.configuration.ScriptConfiguration;
6564
import org.opensearch.dataprepper.plugins.sink.opensearch.configuration.DlqConfiguration;
6665
import org.opensearch.dataprepper.plugins.sink.opensearch.configuration.OpenSearchSinkConfig;
6766
import org.opensearch.dataprepper.plugins.sink.opensearch.dlq.FailedBulkOperation;
@@ -91,10 +90,8 @@
9190
import java.util.ArrayList;
9291
import java.util.Collection;
9392
import java.util.Collections;
94-
import java.util.HashMap;
9593
import java.util.HashSet;
9694
import java.util.List;
97-
import java.util.Map;
9895
import java.util.Objects;
9996
import java.util.Optional;
10097
import java.util.Set;

0 commit comments

Comments
 (0)