adapt to the new constructor for DimensionsSpec

kkonstantine · Sep 1, 2022 · 65d665a · 65d665a
1 parent d161d22
commit 65d665a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/...confluent-extensions/src/test/java/io/confluent/druid/transform/ExtractTransformTest.java b/...confluent-extensions/src/test/java/io/confluent/druid/transform/ExtractTransformTest.java
@@ -28,11 +28,7 @@ public class ExtractTransformTest
   private static final MapInputRowParser PARSER = new MapInputRowParser(
       new TimeAndDimsParseSpec(
           new TimestampSpec("t", "auto", DateTimes.of("2020-01-01")),
-          new DimensionsSpec(
-              DimensionsSpec.getDefaultSchemas(ImmutableList.of("topic", "tenant")),
-              null,
-              null
-          )
+          new DimensionsSpec( DimensionsSpec.getDefaultSchemas(ImmutableList.of("topic", "tenant")))
       )
   );
 

diff --git a/...ns/src/test/java/org/apache/druid/data/input/opencensus/protobuf/OpenCensusBenchmark.java b/...ns/src/test/java/org/apache/druid/data/input/opencensus/protobuf/OpenCensusBenchmark.java
@@ -41,6 +41,7 @@
 
 import java.nio.ByteBuffer;
 import java.time.Instant;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,7 +55,7 @@ public class OpenCensusBenchmark
 
   private static final JSONParseSpec PARSE_SPEC = new JSONParseSpec(
       new TimestampSpec("timestamp", "millis", null),
-      new DimensionsSpec(null, null, null),
+      new DimensionsSpec(Collections.emptyList()),
       new JSONPathSpec(
           true,
           Lists.newArrayList(

diff --git a/...org/apache/druid/data/input/opencensus/protobuf/OpenCensusProtobufInputRowParserTest.java b/...org/apache/druid/data/input/opencensus/protobuf/OpenCensusProtobufInputRowParserTest.java
@@ -63,7 +63,7 @@ public class OpenCensusProtobufInputRowParserTest
 
   static final JSONParseSpec PARSE_SPEC = new JSONParseSpec(
       new TimestampSpec("timestamp", "millis", null),
-      new DimensionsSpec(null, null, null),
+      new DimensionsSpec(Collections.emptyList()),
       new JSONPathSpec(
           true,
           Lists.newArrayList(
@@ -79,7 +79,7 @@ public class OpenCensusProtobufInputRowParserTest
       new DimensionsSpec(ImmutableList.of(
           new StringDimensionSchema("foo_key"),
           new StringDimensionSchema("env_key")
-      ), null, null),
+      )),
       new JSONPathSpec(
           true,
           Lists.newArrayList(

diff --git a/...g/apache/druid/data/input/opencensus/protobuf/OpenTelemetryMetricsProtobufReaderTest.java b/...g/apache/druid/data/input/opencensus/protobuf/OpenTelemetryMetricsProtobufReaderTest.java
@@ -81,7 +81,7 @@ public class OpenTelemetryMetricsProtobufReaderTest
       new StringDimensionSchema("descriptor." + METRIC_ATTRIBUTE_FOO_KEY),
       new StringDimensionSchema("custom." + RESOURCE_ATTRIBUTE_ENV),
       new StringDimensionSchema("custom." + RESOURCE_ATTRIBUTE_COUNTRY)
-  ), null, null);
+  ));
 
   public static final String TOPIC = "telemetry.metrics.otel";
   public static final int PARTITION = 2;
@@ -291,11 +291,11 @@ public void testDimensionSpecExclusions() throws IOException
             .setKey(METRIC_ATTRIBUTE_FOO_KEY)
             .setValue(AnyValue.newBuilder().setStringValue(METRIC_ATTRIBUTE_FOO_VAL).build()).build()));
 
-    DimensionsSpec dimensionsSpecWithExclusions = new DimensionsSpec(null,
+    DimensionsSpec dimensionsSpecWithExclusions = DimensionsSpec.builder().setDimensionExclusions(
         ImmutableList.of(
           "descriptor." + METRIC_ATTRIBUTE_COLOR,
           "custom." + RESOURCE_ATTRIBUTE_COUNTRY
-        ), null);
+        )).build();
 
     MetricsData metricsData = metricsDataBuilder.build();
     ConsumerRecord consumerRecord = new ConsumerRecord(TOPIC, PARTITION, OFFSET, TS, TSTYPE,

diff --git a/.../test/java/org/apache/druid/data/input/opentelemetry/protobuf/OpenTelemetryBenchmark.java b/.../test/java/org/apache/druid/data/input/opentelemetry/protobuf/OpenTelemetryBenchmark.java
@@ -72,8 +72,7 @@ public class OpenTelemetryBenchmark
       new DimensionsSpec(ImmutableList.of(
           new StringDimensionSchema("name"),
           new StringDimensionSchema("value"),
-          new StringDimensionSchema("foo_key")),
-          null, null),
+          new StringDimensionSchema("foo_key"))),
       null);
 
   private static final OpenTelemetryMetricsProtobufInputFormat INPUT_FORMAT =

diff --git a/...pache/druid/data/input/opentelemetry/protobuf/OpenTelemetryMetricsProtobufReaderTest.java b/...pache/druid/data/input/opentelemetry/protobuf/OpenTelemetryMetricsProtobufReaderTest.java
@@ -70,7 +70,7 @@ public class OpenTelemetryMetricsProtobufReaderTest
       new StringDimensionSchema("descriptor." + METRIC_ATTRIBUTE_FOO_KEY),
       new StringDimensionSchema("custom." + RESOURCE_ATTRIBUTE_ENV),
       new StringDimensionSchema("custom." + RESOURCE_ATTRIBUTE_COUNTRY)
-  ), null, null);
+  ));
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
@@ -256,11 +256,10 @@ public void testDimensionSpecExclusions()
 
     MetricsData metricsData = metricsDataBuilder.build();
 
-    DimensionsSpec dimensionsSpecWithExclusions = new DimensionsSpec(null,
-        ImmutableList.of(
+    DimensionsSpec dimensionsSpecWithExclusions = DimensionsSpec.builder().setDimensionExclusions(ImmutableList.of(
             "descriptor." + METRIC_ATTRIBUTE_COLOR,
             "custom." + RESOURCE_ATTRIBUTE_COUNTRY
-        ), null);
+    )).build();
 
     CloseableIterator<InputRow> rows = new OpenTelemetryMetricsProtobufReader(
         dimensionsSpecWithExclusions,