You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2018/10/03 20:55:26 UTC
[GitHub] leventov closed pull request #6386: Prohibit jackson
ObjectMapper#reader methods which are deprecated
leventov closed pull request #6386: Prohibit jackson ObjectMapper#reader methods which are deprecated
URL: https://github.com/apache/incubator-druid/pull/6386
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/codestyle/druid-forbidden-apis.txt b/codestyle/druid-forbidden-apis.txt
index 5a459f4154e..49b00fd49ee 100644
--- a/codestyle/druid-forbidden-apis.txt
+++ b/codestyle/druid-forbidden-apis.txt
@@ -8,4 +8,7 @@ org.apache.commons.io.FileUtils#getTempDirectory() @ Use org.junit.rules.Tempora
java.util.LinkedList @ Use ArrayList or ArrayDeque instead
com.google.common.collect.Lists#newLinkedList() @ Use ArrayList or ArrayDeque instead
com.google.common.collect.Lists#newLinkedList(java.lang.Iterable) @ Use ArrayList or ArrayDeque instead
-java.util.Random#<init>() @ Use ThreadLocalRandom.current() or the constructor with a seed (the latter in tests only!)
\ No newline at end of file
+java.util.Random#<init>() @ Use ThreadLocalRandom.current() or the constructor with a seed (the latter in tests only!)
+com.fasterxml.jackson.databind.ObjectMapper#reader(com.fasterxml.jackson.databind.JavaType) @ Use ObjectMapper#readerFor instead
+com.fasterxml.jackson.databind.ObjectMapper#reader(java.lang.Class) @ Use ObjectMapper#readerFor instead
+com.fasterxml.jackson.databind.ObjectMapper#reader(com.fasterxml.jackson.core.type.TypeReference) @ Use ObjectMapper#readerFor instead
\ No newline at end of file
diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java
index 12e6008adb4..ef1ab6ed28d 100644
--- a/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java
+++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverter.java
@@ -218,7 +218,7 @@ public TimelineMetric druidEventToTimelineMetric(ServiceMetricEvent serviceMetri
} else {
fileContent = Files.asCharSource(new File(mapPath), StandardCharsets.UTF_8).read();
}
- return mapper.reader(new TypeReference<ImmutableSortedMap<String, ImmutableList<String>>>()
+ return mapper.readerFor(new TypeReference<ImmutableSortedMap<String, ImmutableList<String>>>()
{
}).readValue(fileContent);
}
diff --git a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java
index e67d52d691c..83fad58ade7 100644
--- a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java
+++ b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterConfigTest.java
@@ -60,7 +60,7 @@ public void testSerDeAmbariMetricsEmitterConfig() throws IOException
500L,
400L
);
- AmbariMetricsEmitterConfig serde = mapper.reader(AmbariMetricsEmitterConfig.class).readValue(
+ AmbariMetricsEmitterConfig serde = mapper.readerFor(AmbariMetricsEmitterConfig.class).readValue(
mapper.writeValueAsBytes(config)
);
Assert.assertEquals(config, serde);
@@ -70,8 +70,8 @@ public void testSerDeAmbariMetricsEmitterConfig() throws IOException
public void testSerDeDruidToTimelineEventConverter() throws IOException
{
SendAllTimelineEventConverter sendAllConverter = new SendAllTimelineEventConverter("prefix", "druid");
- DruidToTimelineMetricConverter serde = mapper.reader(DruidToTimelineMetricConverter.class)
- .readValue(mapper.writeValueAsBytes(sendAllConverter));
+ DruidToTimelineMetricConverter serde = mapper.readerFor(DruidToTimelineMetricConverter.class)
+ .readValue(mapper.writeValueAsBytes(sendAllConverter));
Assert.assertEquals(sendAllConverter, serde);
WhiteListBasedDruidToTimelineEventConverter whiteListBasedDruidToTimelineEventConverter = new WhiteListBasedDruidToTimelineEventConverter(
@@ -80,9 +80,9 @@ public void testSerDeDruidToTimelineEventConverter() throws IOException
"",
new DefaultObjectMapper()
);
- serde = mapper.reader(DruidToTimelineMetricConverter.class)
- .readValue(mapper.writeValueAsBytes(
- whiteListBasedDruidToTimelineEventConverter));
+ serde = mapper.readerFor(DruidToTimelineMetricConverter.class)
+ .readValue(mapper.writeValueAsBytes(
+ whiteListBasedDruidToTimelineEventConverter));
Assert.assertEquals(whiteListBasedDruidToTimelineEventConverter, serde);
}
}
diff --git a/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/WhiteListBasedConverter.java b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/WhiteListBasedConverter.java
index 6d97c9e2ec3..2528a7b5363 100644
--- a/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/WhiteListBasedConverter.java
+++ b/extensions-contrib/graphite-emitter/src/main/java/org/apache/druid/emitter/graphite/WhiteListBasedConverter.java
@@ -282,7 +282,7 @@ public int hashCode()
} else {
fileContent = Files.asCharSource(new File(mapPath), Charset.forName("UTF-8")).read();
}
- return mapper.reader(new TypeReference<ImmutableSortedMap<String, ImmutableSet<String>>>()
+ return mapper.readerFor(new TypeReference<ImmutableSortedMap<String, ImmutableSet<String>>>()
{
}).readValue(fileContent);
}
diff --git a/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfigTest.java b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfigTest.java
index 4368fe1163c..a1ebdaaeafe 100644
--- a/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfigTest.java
+++ b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/GraphiteEmitterConfigTest.java
@@ -59,7 +59,7 @@ public void testSerDeserGraphiteEmitterConfig() throws IOException
null
);
String graphiteEmitterConfigString = mapper.writeValueAsString(graphiteEmitterConfig);
- GraphiteEmitterConfig graphiteEmitterConfigExpected = mapper.reader(GraphiteEmitterConfig.class).readValue(
+ GraphiteEmitterConfig graphiteEmitterConfigExpected = mapper.readerFor(GraphiteEmitterConfig.class).readValue(
graphiteEmitterConfigString
);
Assert.assertEquals(graphiteEmitterConfigExpected, graphiteEmitterConfig);
@@ -75,7 +75,7 @@ public void testSerDeserDruidToGraphiteEventConverter() throws IOException
false
);
String noopGraphiteEventConverterString = mapper.writeValueAsString(sendAllGraphiteEventConverter);
- DruidToGraphiteEventConverter druidToGraphiteEventConverter = mapper.reader(DruidToGraphiteEventConverter.class)
+ DruidToGraphiteEventConverter druidToGraphiteEventConverter = mapper.readerFor(DruidToGraphiteEventConverter.class)
.readValue(noopGraphiteEventConverterString);
Assert.assertEquals(druidToGraphiteEventConverter, sendAllGraphiteEventConverter);
@@ -88,7 +88,7 @@ public void testSerDeserDruidToGraphiteEventConverter() throws IOException
new DefaultObjectMapper()
);
String whiteListBasedConverterString = mapper.writeValueAsString(whiteListBasedConverter);
- druidToGraphiteEventConverter = mapper.reader(DruidToGraphiteEventConverter.class)
+ druidToGraphiteEventConverter = mapper.readerFor(DruidToGraphiteEventConverter.class)
.readValue(whiteListBasedConverterString);
Assert.assertEquals(druidToGraphiteEventConverter, whiteListBasedConverter);
}
diff --git a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
index 40f13a29901..761cbc4160f 100644
--- a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
+++ b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
@@ -48,7 +48,7 @@ public void testSerDeserKafkaEmitterConfig() throws IOException
.put("testKey", "testValue").build()
);
String kafkaEmitterConfigString = mapper.writeValueAsString(kafkaEmitterConfig);
- KafkaEmitterConfig kafkaEmitterConfigExpected = mapper.reader(KafkaEmitterConfig.class)
+ KafkaEmitterConfig kafkaEmitterConfigExpected = mapper.readerFor(KafkaEmitterConfig.class)
.readValue(kafkaEmitterConfigString);
Assert.assertEquals(kafkaEmitterConfigExpected, kafkaEmitterConfig);
}
diff --git a/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/EventConverter.java b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/EventConverter.java
index c29045722ab..0ef231d29de 100644
--- a/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/EventConverter.java
+++ b/extensions-contrib/opentsdb-emitter/src/main/java/org/apache/druid/emitter/opentsdb/EventConverter.java
@@ -104,7 +104,7 @@ public OpentsdbEvent convert(ServiceMetricEvent serviceMetricEvent)
log.info("Using default metric map located at [%s]", metricMapPath);
is = new FileInputStream(new File(metricMapPath));
}
- return mapper.reader(new TypeReference<Map<String, Set<String>>>()
+ return mapper.readerFor(new TypeReference<Map<String, Set<String>>>()
{
}).readValue(is);
}
diff --git a/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java
index 11ccb9de571..92a69e0599e 100644
--- a/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java
+++ b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEmitterConfigTest.java
@@ -41,7 +41,7 @@ public void testSerDeserOpentsdbEmitterConfig() throws Exception
{
OpentsdbEmitterConfig opentsdbEmitterConfig = new OpentsdbEmitterConfig("localhost", 9999, 2000, 2000, 200, 2000, 10000L, null);
String opentsdbEmitterConfigString = mapper.writeValueAsString(opentsdbEmitterConfig);
- OpentsdbEmitterConfig expectedOpentsdbEmitterConfig = mapper.reader(OpentsdbEmitterConfig.class)
+ OpentsdbEmitterConfig expectedOpentsdbEmitterConfig = mapper.readerFor(OpentsdbEmitterConfig.class)
.readValue(opentsdbEmitterConfigString);
Assert.assertEquals(expectedOpentsdbEmitterConfig, opentsdbEmitterConfig);
}
diff --git a/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEventTest.java b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEventTest.java
index 4b9c80ee566..4e19a256261 100644
--- a/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEventTest.java
+++ b/extensions-contrib/opentsdb-emitter/src/test/java/org/apache/druid/emitter/opentsdb/OpentsdbEventTest.java
@@ -47,7 +47,7 @@ public void testSerDeserOpentsdbEvent() throws Exception
tags.put("baz", 1);
OpentsdbEvent opentsdbEvent = new OpentsdbEvent("foo.bar", 1000L, 20, tags);
String opentsdbString = mapper.writeValueAsString(opentsdbEvent);
- OpentsdbEvent expectedOpentsdbEvent = mapper.reader(OpentsdbEvent.class)
+ OpentsdbEvent expectedOpentsdbEvent = mapper.readerFor(OpentsdbEvent.class)
.readValue(opentsdbString);
Assert.assertEquals(expectedOpentsdbEvent, opentsdbEvent);
}
diff --git a/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/DimensionConverter.java b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/DimensionConverter.java
index 5ce5c10d4f4..053797895b2 100644
--- a/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/DimensionConverter.java
+++ b/extensions-contrib/statsd-emitter/src/main/java/org/apache/druid/emitter/statsd/DimensionConverter.java
@@ -86,7 +86,7 @@ public StatsDMetric addFilteredUserDims(
log.info("Using metric dimensions at types at [%s]", dimensionMapPath);
is = new FileInputStream(new File(dimensionMapPath));
}
- return mapper.reader(new TypeReference<Map<String, StatsDMetric>>()
+ return mapper.readerFor(new TypeReference<Map<String, StatsDMetric>>()
{
}).readValue(is);
}
diff --git a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsKerberosConfigTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsKerberosConfigTest.java
index 0ad484207ef..f8de9575135 100644
--- a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsKerberosConfigTest.java
+++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsKerberosConfigTest.java
@@ -35,7 +35,7 @@ public void testSerDesr() throws IOException
HdfsKerberosConfig hdfsKerberosConfig = new HdfsKerberosConfig("principal", "keytab");
Assert.assertEquals(
hdfsKerberosConfig,
- mapper.reader(HdfsKerberosConfig.class).readValue(mapper.writeValueAsString(hdfsKerberosConfig))
+ mapper.readerFor(HdfsKerberosConfig.class).readValue(mapper.writeValueAsString(hdfsKerberosConfig))
);
}
diff --git a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
index e920c8bb998..810686f7f89 100644
--- a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
+++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
@@ -126,7 +126,7 @@ public void testSerDeser() throws IOException
mapper.registerSubtypes(LoadingLookupFactory.class);
Assert.assertEquals(
loadingLookupFactory,
- mapper.reader(LookupExtractorFactory.class)
+ mapper.readerFor(LookupExtractorFactory.class)
.readValue(mapper.writeValueAsString(loadingLookupFactory))
);
}
diff --git a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java
index 937ac4de338..350acb59451 100644
--- a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java
+++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/PollingLookupSerDeserTest.java
@@ -67,7 +67,7 @@ public void testSerDeser() throws IOException
PollingLookupFactory pollingLookupFactory = new PollingLookupFactory(Period.ZERO, dataFetcher, cacheFactory);
mapper.registerSubtypes(MockDataFetcher.class);
mapper.registerSubtypes(PollingLookupFactory.class);
- Assert.assertEquals(pollingLookupFactory, mapper.reader(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(pollingLookupFactory)));
+ Assert.assertEquals(pollingLookupFactory, mapper.readerFor(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(pollingLookupFactory)));
}
@JsonTypeName("mock")
diff --git a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java
index 49a89593a3a..f0fc6aff287 100644
--- a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java
+++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/cache/loading/LoadingCacheTest.java
@@ -160,8 +160,8 @@ public void testIsClosed()
public void testSerDeser() throws IOException
{
ObjectMapper mapper = new DefaultObjectMapper();
- Assert.assertEquals(loadingCache, mapper.reader(LoadingCache.class).readValue(mapper.writeValueAsString(loadingCache)));
- Assert.assertTrue(loadingCache.hashCode() == mapper.reader(LoadingCache.class).readValue(mapper.writeValueAsString(loadingCache)).hashCode());
+ Assert.assertEquals(loadingCache, mapper.readerFor(LoadingCache.class).readValue(mapper.writeValueAsString(loadingCache)));
+ Assert.assertEquals(loadingCache.hashCode(), mapper.readerFor(LoadingCache.class).readValue(mapper.writeValueAsString(loadingCache)).hashCode());
}
}
diff --git a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcherTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcherTest.java
index 8154b1cff84..5f1571e7212 100644
--- a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcherTest.java
+++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/jdbc/JdbcDataFetcherTest.java
@@ -145,7 +145,7 @@ public void testSerDesr() throws IOException
100);
DefaultObjectMapper mapper = new DefaultObjectMapper();
String jdbcDataFetcherSer = mapper.writeValueAsString(jdbcDataFetcher);
- Assert.assertEquals(jdbcDataFetcher, mapper.reader(DataFetcher.class).readValue(jdbcDataFetcherSer));
+ Assert.assertEquals(jdbcDataFetcher, mapper.readerFor(DataFetcher.class).readValue(jdbcDataFetcherSer));
}
private void assertMapLookup(Map<String, String> map, DataFetcher dataFetcher)
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopKerberosConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopKerberosConfigTest.java
index 157feaca7e6..c174451dfbb 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopKerberosConfigTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopKerberosConfigTest.java
@@ -35,7 +35,7 @@ public void testSerDesr() throws IOException
HadoopKerberosConfig hadoopKerberosConfig = new HadoopKerberosConfig("principal", "keytab");
Assert.assertEquals(
hadoopKerberosConfig,
- mapper.reader(HadoopKerberosConfig.class).readValue(mapper.writeValueAsString(hadoopKerberosConfig))
+ mapper.readerFor(HadoopKerberosConfig.class).readValue(mapper.writeValueAsString(hadoopKerberosConfig))
);
}
}
diff --git a/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractionFnSerDeTest.java b/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractionFnSerDeTest.java
index a5132bfb344..c143b464926 100644
--- a/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractionFnSerDeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/extraction/MapLookupExtractionFnSerDeTest.java
@@ -55,7 +55,7 @@ public static void setup()
@Test
public void testDeserialization() throws IOException
{
- final DimExtractionFn fn = mapper.reader(DimExtractionFn.class).readValue(
+ final DimExtractionFn fn = mapper.readerFor(DimExtractionFn.class).readValue(
StringUtils.format(
"{\"type\":\"lookup\",\"lookup\":{\"type\":\"map\", \"map\":%s}}",
mapper.writeValueAsString(renames)
@@ -68,7 +68,7 @@ public void testDeserialization() throws IOException
Assert.assertEquals(null, fn.apply(crazyString));
Assert.assertEquals(
- crazyString, mapper.reader(DimExtractionFn.class).<DimExtractionFn>readValue(
+ crazyString, mapper.readerFor(DimExtractionFn.class).<DimExtractionFn>readValue(
StringUtils.format(
"{\"type\":\"lookup\",\"lookup\":{\"type\":\"map\", \"map\":%s}, \"retainMissingValue\":true}",
mapper.writeValueAsString(renames)
diff --git a/processing/src/test/java/org/apache/druid/query/filter/BoundDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/BoundDimFilterTest.java
index e07d70cb747..c9e18de4bee 100644
--- a/processing/src/test/java/org/apache/druid/query/filter/BoundDimFilterTest.java
+++ b/processing/src/test/java/org/apache/druid/query/filter/BoundDimFilterTest.java
@@ -82,7 +82,7 @@ public void testSerDesBoundFilter() throws IOException
Injector defaultInjector = GuiceInjectors.makeStartupInjector();
ObjectMapper mapper = defaultInjector.getInstance(Key.get(ObjectMapper.class, Json.class));
String serBetweenDimFilter = mapper.writeValueAsString(boundDimFilter);
- BoundDimFilter actualBoundDimFilter = mapper.reader(DimFilter.class).readValue(serBetweenDimFilter);
+ BoundDimFilter actualBoundDimFilter = mapper.readerFor(DimFilter.class).readValue(serBetweenDimFilter);
Assert.assertEquals(boundDimFilter, actualBoundDimFilter);
}
diff --git a/processing/src/test/java/org/apache/druid/query/filter/InDimFilterSerDesrTest.java b/processing/src/test/java/org/apache/druid/query/filter/InDimFilterSerDesrTest.java
index 1306a66f683..d16fb3240d9 100644
--- a/processing/src/test/java/org/apache/druid/query/filter/InDimFilterSerDesrTest.java
+++ b/processing/src/test/java/org/apache/druid/query/filter/InDimFilterSerDesrTest.java
@@ -48,7 +48,7 @@ public void setUp()
@Test
public void testDeserialization() throws IOException
{
- final InDimFilter actualInDimFilter = mapper.reader(DimFilter.class).readValue(actualInFilter);
+ final InDimFilter actualInDimFilter = mapper.readerFor(DimFilter.class).readValue(actualInFilter);
final InDimFilter expectedInDimFilter = new InDimFilter("dimTest", Arrays.asList("good", "bad"), null);
Assert.assertEquals(expectedInDimFilter, actualInDimFilter);
}
diff --git a/processing/src/test/java/org/apache/druid/query/filter/IntervalDimFilterTest.java b/processing/src/test/java/org/apache/druid/query/filter/IntervalDimFilterTest.java
index 8a1903b05ee..579da8747aa 100644
--- a/processing/src/test/java/org/apache/druid/query/filter/IntervalDimFilterTest.java
+++ b/processing/src/test/java/org/apache/druid/query/filter/IntervalDimFilterTest.java
@@ -58,7 +58,7 @@ public void testSerde() throws IOException
null
);
String filterStr = mapper.writeValueAsString(intervalFilter);
- IntervalDimFilter actualFilter = mapper.reader(DimFilter.class).readValue(filterStr);
+ IntervalDimFilter actualFilter = mapper.readerFor(DimFilter.class).readValue(filterStr);
Assert.assertEquals(intervalFilter, actualFilter);
intervalFilter = new IntervalDimFilter(
@@ -71,7 +71,7 @@ public void testSerde() throws IOException
);
filterStr = mapper.writeValueAsString(intervalFilter);
- actualFilter = mapper.reader(DimFilter.class).readValue(filterStr);
+ actualFilter = mapper.readerFor(DimFilter.class).readValue(filterStr);
Assert.assertEquals(intervalFilter, actualFilter);
}
diff --git a/processing/src/test/java/org/apache/druid/query/lookup/LookupConfigTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupConfigTest.java
index 9479c221fc3..6c268d92103 100644
--- a/processing/src/test/java/org/apache/druid/query/lookup/LookupConfigTest.java
+++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupConfigTest.java
@@ -41,7 +41,7 @@ public void TestSerDesr() throws IOException
LookupConfig lookupConfig = new LookupConfig(temporaryFolder.newFile().getAbsolutePath());
Assert.assertEquals(
lookupConfig,
- mapper.reader(LookupConfig.class).readValue(mapper.writeValueAsString(lookupConfig))
+ mapper.readerFor(LookupConfig.class).readValue(mapper.writeValueAsString(lookupConfig))
);
}
diff --git a/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorTest.java
index db976e0f6d6..e138199ba78 100644
--- a/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupExtractorTest.java
@@ -61,7 +61,7 @@
public void testSerDes() throws IOException
{
ObjectMapper mapper = new DefaultObjectMapper();
- Assert.assertEquals(lookupExtractor, mapper.reader(LookupExtractor.class).readValue(mapper.writeValueAsBytes(lookupExtractor)));
+ Assert.assertEquals(lookupExtractor, mapper.readerFor(LookupExtractor.class).readValue(mapper.writeValueAsBytes(lookupExtractor)));
}
@Test
diff --git a/server/src/test/java/org/apache/druid/query/dimension/LookupDimensionSpecTest.java b/server/src/test/java/org/apache/druid/query/dimension/LookupDimensionSpecTest.java
index 9412266d565..029900b1d7e 100644
--- a/server/src/test/java/org/apache/druid/query/dimension/LookupDimensionSpecTest.java
+++ b/server/src/test/java/org/apache/druid/query/dimension/LookupDimensionSpecTest.java
@@ -78,7 +78,7 @@ public void testSerDesr(DimensionSpec lookupDimSpec) throws IOException
LOOKUP_REF_MANAGER
);
String serLookup = mapper.writeValueAsString(lookupDimSpec);
- Assert.assertEquals(lookupDimSpec, mapper.reader(DimensionSpec.class).with(injectableValues).readValue(serLookup));
+ Assert.assertEquals(lookupDimSpec, mapper.readerFor(DimensionSpec.class).with(injectableValues).readValue(serLookup));
}
private Object[] parametersForTestSerDesr()
diff --git a/server/src/test/java/org/apache/druid/query/lookup/MapLookupExtractorFactoryTest.java b/server/src/test/java/org/apache/druid/query/lookup/MapLookupExtractorFactoryTest.java
index 20b8a6782db..75be6d48da7 100644
--- a/server/src/test/java/org/apache/druid/query/lookup/MapLookupExtractorFactoryTest.java
+++ b/server/src/test/java/org/apache/druid/query/lookup/MapLookupExtractorFactoryTest.java
@@ -57,6 +57,6 @@ public void testSerDeserMapLookupExtractorFactory() throws IOException
ObjectMapper mapper = new DefaultObjectMapper();
mapper.registerSubtypes(MapLookupExtractorFactory.class);
LookupExtractorFactory lookupExtractorFactory = new MapLookupExtractorFactory(ImmutableMap.of("key", "value"), true);
- Assert.assertEquals(lookupExtractorFactory, mapper.reader(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(lookupExtractorFactory)));
+ Assert.assertEquals(lookupExtractorFactory, mapper.readerFor(LookupExtractorFactory.class).readValue(mapper.writeValueAsString(lookupExtractorFactory)));
}
}
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java
index 8e072804ee1..60df9f722d3 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java
@@ -106,7 +106,7 @@ public int columnCacheSizeBytes()
)
);
ObjectMapper objectMapper = injector.getInstance(ObjectMapper.class);
- AppenderatorFactory defaultOfflineAppenderatorFactory = objectMapper.reader(AppenderatorFactory.class)
+ AppenderatorFactory defaultOfflineAppenderatorFactory = objectMapper.readerFor(AppenderatorFactory.class)
.readValue("{\"type\":\"offline\"}");
final Map<String, Object> parserMap = objectMapper.convertValue(
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org