From 508734c8b028ade5d3b366d072ae9bee3cd28078 Mon Sep 17 00:00:00 2001 From: Charles Allen Date: Mon, 11 Jan 2016 15:26:39 -0800 Subject: [PATCH] Long constant reformatting in tests `l` --> `L` --- .../src/main/java/io/druid/data/input/MapPopulator.java | 2 +- .../cache/NamespaceExtractionCacheManagerExecutorsTest.java | 2 +- .../io/druid/query/aggregation/LongMaxAggregationTest.java | 4 ++-- .../io/druid/query/aggregation/LongMinAggregationTest.java | 4 ++-- .../test/java/io/druid/query/topn/TopNQueryRunnerTest.java | 2 +- .../src/test/java/io/druid/segment/IndexMergerTest.java | 2 +- .../io/druid/server/coordinator/DruidCoordinatorTest.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/namespace-lookup/src/main/java/io/druid/data/input/MapPopulator.java b/extensions/namespace-lookup/src/main/java/io/druid/data/input/MapPopulator.java index 70df656d273..509d9016b01 100644 --- a/extensions/namespace-lookup/src/main/java/io/druid/data/input/MapPopulator.java +++ b/extensions/namespace-lookup/src/main/java/io/druid/data/input/MapPopulator.java @@ -59,7 +59,7 @@ public class MapPopulator return source.asCharSource(Charsets.UTF_8).readLines( new LineProcessor() { - private long count = 0l; + private long count = 0L; @Override public boolean processLine(String line) throws IOException diff --git a/extensions/namespace-lookup/src/test/java/io/druid/server/namespace/cache/NamespaceExtractionCacheManagerExecutorsTest.java b/extensions/namespace-lookup/src/test/java/io/druid/server/namespace/cache/NamespaceExtractionCacheManagerExecutorsTest.java index a6fdceef3a9..bde0f303b3e 100644 --- a/extensions/namespace-lookup/src/test/java/io/druid/server/namespace/cache/NamespaceExtractionCacheManagerExecutorsTest.java +++ b/extensions/namespace-lookup/src/test/java/io/druid/server/namespace/cache/NamespaceExtractionCacheManagerExecutorsTest.java @@ -482,7 +482,7 @@ public class NamespaceExtractionCacheManagerExecutorsTest new URIExtractionNamespace.ObjectMapperFlatDataParser( URIExtractionNamespaceTest.registerTypes(new ObjectMapper()) ), - new Period(5l), + new Period(5L), null ); diff --git a/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java index 4c62857a674..803afe3a29d 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java @@ -37,7 +37,7 @@ public class LongMaxAggregationTest private ColumnSelectorFactory colSelectorFactory; private TestLongColumnSelector selector; - private long[] values = {9223372036854775802l, 9223372036854775803l, 9223372036854775806l, 9223372036854775805l}; + private long[] values = {9223372036854775802L, 9223372036854775803L, 9223372036854775806L, 9223372036854775805L}; public LongMaxAggregationTest() throws Exception { @@ -95,7 +95,7 @@ public class LongMaxAggregationTest @Test public void testCombine() { - Assert.assertEquals(9223372036854775803l, longMaxAggFactory.combine(9223372036854775800l, 9223372036854775803l)); + Assert.assertEquals(9223372036854775803L, longMaxAggFactory.combine(9223372036854775800L, 9223372036854775803L)); } @Test diff --git a/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java index 32bb1cb2b00..bf111e2d1f3 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java @@ -37,7 +37,7 @@ public class LongMinAggregationTest private ColumnSelectorFactory colSelectorFactory; private TestLongColumnSelector selector; - private long[] values = {-9223372036854775802l, -9223372036854775803l, -9223372036854775806l, -9223372036854775805l}; + private long[] values = {-9223372036854775802L, -9223372036854775803L, -9223372036854775806L, -9223372036854775805L}; public LongMinAggregationTest() throws Exception { @@ -95,7 +95,7 @@ public class LongMinAggregationTest @Test public void testCombine() { - Assert.assertEquals(-9223372036854775803l, longMinAggFactory.combine(-9223372036854775800l, -9223372036854775803l)); + Assert.assertEquals(-9223372036854775803L, longMinAggFactory.combine(-9223372036854775800L, -9223372036854775803L)); } @Test diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java b/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java index ccd8420c82e..a77d4e41d36 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java @@ -1495,7 +1495,7 @@ public class TopNQueryRunnerTest "index", 503332.5071372986D, QueryRunnerTestHelper.marketDimension, "POTATO", "uniques", QueryRunnerTestHelper.UNIQUES_9, - "rows", 1209l + "rows", 1209L ) ) ) diff --git a/processing/src/test/java/io/druid/segment/IndexMergerTest.java b/processing/src/test/java/io/druid/segment/IndexMergerTest.java index b32051760c8..4f3562dd10f 100644 --- a/processing/src/test/java/io/druid/segment/IndexMergerTest.java +++ b/processing/src/test/java/io/druid/segment/IndexMergerTest.java @@ -1450,7 +1450,7 @@ public class IndexMergerTest new LongSumAggregatorFactory("A", "A"), new LongSumAggregatorFactory("C", "C") }); - index2.add(new MapBasedInputRow(1l, Lists.newArrayList("d2"), ImmutableMap.of("d2", "z", "A", 2, "C", 100))); + index2.add(new MapBasedInputRow(1L, Lists.newArrayList("d2"), ImmutableMap.of("d2", "z", "A", 2, "C", 100))); closer.closeLater(index2); Interval interval = new Interval(0, new DateTime().getMillis()); diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java index a179eb73e36..75c2bc75066 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java +++ b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java @@ -348,7 +348,7 @@ public class DruidCoordinatorTest extends CuratorTestBase } Map segmentAvailability = coordinator.getSegmentAvailability().snapshot(); Assert.assertEquals(1, segmentAvailability.size()); - Assert.assertEquals(0l, segmentAvailability.get(dataSource)); + Assert.assertEquals(0L, segmentAvailability.get(dataSource)); while (coordinator.getLoadPendingDatasources().get(dataSource).get() > 0) { Thread.sleep(50); @@ -367,7 +367,7 @@ public class DruidCoordinatorTest extends CuratorTestBase Assert.assertNotNull(dataSourceMap.get(dataSource)); // Simulated the adding of segment to druidServer during SegmentChangeRequestLoad event // The load rules asks for 2 replicas, therefore 1 replica should still be pending - Assert.assertEquals(1l, dataSourceMap.get(dataSource).get()); + Assert.assertEquals(1L, dataSourceMap.get(dataSource).get()); coordinator.stop(); leaderUnannouncerLatch.await(); Assert.assertFalse(coordinator.isLeader());