diff --git a/benchmarks/src/main/java/io/druid/benchmark/IncrementalIndexRowTypeBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/IncrementalIndexRowTypeBenchmark.java index 41685f84ac5..cf00f91fa62 100644 --- a/benchmarks/src/main/java/io/druid/benchmark/IncrementalIndexRowTypeBenchmark.java +++ b/benchmarks/src/main/java/io/druid/benchmark/IncrementalIndexRowTypeBenchmark.java @@ -148,7 +148,6 @@ public class IncrementalIndexRowTypeBenchmark @Setup(Level.Iteration) public void setup2() throws IOException { - ; incIndex = makeIncIndex(); incFloatIndex = makeIncIndex(); incStrIndex = makeIncIndex(); diff --git a/benchmarks/src/main/java/io/druid/benchmark/datagen/BenchmarkSchemaInfo.java b/benchmarks/src/main/java/io/druid/benchmark/datagen/BenchmarkSchemaInfo.java index b83a4c9e46c..28c8c6a2de2 100644 --- a/benchmarks/src/main/java/io/druid/benchmark/datagen/BenchmarkSchemaInfo.java +++ b/benchmarks/src/main/java/io/druid/benchmark/datagen/BenchmarkSchemaInfo.java @@ -31,7 +31,7 @@ public class BenchmarkSchemaInfo private Interval dataInterval; private boolean withRollup; - public BenchmarkSchemaInfo ( + public BenchmarkSchemaInfo( List columnSchemas, List aggs, Interval dataInterval, diff --git a/codestyle/checkstyle-suppressions.xml b/codestyle/checkstyle-suppressions.xml index 1026e6dce88..b09b85d577e 100644 --- a/codestyle/checkstyle-suppressions.xml +++ b/codestyle/checkstyle-suppressions.xml @@ -50,6 +50,8 @@ + + diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml index a38d63c4e30..5596e3f9105 100644 --- a/codestyle/checkstyle.xml +++ b/codestyle/checkstyle.xml @@ -99,6 +99,12 @@ + + + + + + diff --git a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingCuratorConfig.java b/integration-tests/src/main/java/io/druid/testing/IntegrationTestingCuratorConfig.java index c2457e46e43..14b4fac3efe 100644 --- a/integration-tests/src/main/java/io/druid/testing/IntegrationTestingCuratorConfig.java +++ b/integration-tests/src/main/java/io/druid/testing/IntegrationTestingCuratorConfig.java @@ -32,7 +32,7 @@ public class IntegrationTestingCuratorConfig extends CuratorConfig private IntegrationTestingConfig config; @Inject - public IntegrationTestingCuratorConfig (IntegrationTestingConfig config) + public IntegrationTestingCuratorConfig(IntegrationTestingConfig config) { this.config = config; } diff --git a/integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java b/integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java index d41729d592e..c9c0176c4d7 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java +++ b/integration-tests/src/main/java/io/druid/testing/clients/EventReceiverFirehoseTestClient.java @@ -154,7 +154,7 @@ public class EventReceiverFirehoseTestClient ? MediaType.APPLICATION_JSON : SmileMediaTypes.APPLICATION_JACKSON_SMILE; totalEventsPosted += postEvents(events, mapper, mediaType); - ; + expectedEventsPosted += events.size(); events = new ArrayList<>(); } diff --git a/integration-tests/src/main/java/io/druid/testing/utils/LoggerListener.java b/integration-tests/src/main/java/io/druid/testing/utils/LoggerListener.java index 9bb880f66c4..676ff02798b 100644 --- a/integration-tests/src/main/java/io/druid/testing/utils/LoggerListener.java +++ b/integration-tests/src/main/java/io/druid/testing/utils/LoggerListener.java @@ -31,25 +31,25 @@ public class LoggerListener extends TestListenerAdapter @Override public void onTestFailure(ITestResult tr) { - LOG.info ("[%s] -- Test method failed", tr.getName()); + LOG.info("[%s] -- Test method failed", tr.getName()); } @Override public void onTestSkipped(ITestResult tr) { - LOG.info ("[%s] -- Test method skipped", tr.getName()); + LOG.info("[%s] -- Test method skipped", tr.getName()); } @Override public void onTestSuccess(ITestResult tr) { - LOG.info ("[%s] -- Test method passed", tr.getName()); + LOG.info("[%s] -- Test method passed", tr.getName()); } @Override public void onTestStart(ITestResult tr) { - LOG.info ("[%s] -- TEST START", tr.getName()); + LOG.info("[%s] -- TEST START", tr.getName()); } } diff --git a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java index bece170369d..bcc121b97c7 100644 --- a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java +++ b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java @@ -87,7 +87,7 @@ public class DruidTestRunnerFactory implements ITestRunnerFactory Injector injector = DruidTestModuleFactory.getInjector(); IntegrationTestingConfig config = injector.getInstance(IntegrationTestingConfig.class); HttpClient client = injector.getInstance(Key.get(HttpClient.class, TestClient.class)); - ; + waitUntilInstanceReady(client, config.getCoordinatorUrl()); waitUntilInstanceReady(client, config.getIndexerUrl()); waitUntilInstanceReady(client, config.getBrokerUrl()); diff --git a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractIndexerTest.java b/integration-tests/src/test/java/io/druid/tests/indexer/AbstractIndexerTest.java index 57e13f4e4d0..adb64e4b691 100644 --- a/integration-tests/src/test/java/io/druid/tests/indexer/AbstractIndexerTest.java +++ b/integration-tests/src/test/java/io/druid/tests/indexer/AbstractIndexerTest.java @@ -62,10 +62,10 @@ public abstract class AbstractIndexerTest // we'll sort the list (ISO dates have lexicographic order) // then delete segments from the 1st date in the first string // to the 2nd date in the last string - Collections.sort (intervals); + Collections.sort(intervals); String first = intervals.get(0).split("/")[0]; String last = intervals.get(intervals.size() - 1).split("/")[1]; - unloadAndKillData (dataSource, first, last); + unloadAndKillData(dataSource, first, last); } protected void unloadAndKillData(final String dataSource, String start, String end) throws Exception diff --git a/processing/src/main/java/io/druid/query/TimewarpOperator.java b/processing/src/main/java/io/druid/query/TimewarpOperator.java index cee9047e5bf..bba083a41ab 100644 --- a/processing/src/main/java/io/druid/query/TimewarpOperator.java +++ b/processing/src/main/java/io/druid/query/TimewarpOperator.java @@ -152,7 +152,7 @@ public class TimewarpOperator implements PostProcessingOperator if (startOffset < 0) { startOffset += periodMillis; } - ; + start -= startOffset; // tOffset is the offset time t within the last period diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryMergeBufferTest.java b/processing/src/test/java/io/druid/query/groupby/GroupByQueryMergeBufferTest.java index 95b48980216..f318463b431 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryMergeBufferTest.java +++ b/processing/src/test/java/io/druid/query/groupby/GroupByQueryMergeBufferTest.java @@ -180,7 +180,7 @@ public class GroupByQueryMergeBufferTest new Supplier() { @Override - public ByteBuffer get () + public ByteBuffer get() { return ByteBuffer.allocateDirect(PROCESSING_CONFIG.intermediateComputeSizeBytes()); } diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java index a0afd9ad643..be8bf42be02 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java +++ b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java @@ -144,7 +144,7 @@ public class GroupByQueryRunnerFailureTest new Supplier() { @Override - public ByteBuffer get () + public ByteBuffer get() { return ByteBuffer.allocateDirect(DEFAULT_PROCESSING_CONFIG.intermediateComputeSizeBytes()); } diff --git a/server/src/test/java/io/druid/client/indexing/ClientMergeQueryTest.java b/server/src/test/java/io/druid/client/indexing/ClientMergeQueryTest.java index 0019bd3c136..f5a76b9add2 100644 --- a/server/src/test/java/io/druid/client/indexing/ClientMergeQueryTest.java +++ b/server/src/test/java/io/druid/client/indexing/ClientMergeQueryTest.java @@ -35,11 +35,12 @@ public class ClientMergeQueryTest private static final String DATA_SOURCE = "data_source"; public static final DateTime START = DateTimes.nowUtc(); private static final Interval INTERVAL = new Interval(START, START.plus(1)); - private static final DataSegment DATA_SEGMENT = new DataSegment(DATA_SOURCE, INTERVAL, START.toString(), null, - null, null, null, 0, 0); + private static final DataSegment DATA_SEGMENT = + new DataSegment(DATA_SOURCE, INTERVAL, START.toString(), null, null, null, null, 0, 0); private static final List SEGMENT_LIST = Lists.newArrayList(DATA_SEGMENT); private static final List AGGREGATOR_LIST = Lists.newArrayList(); - private static final ClientMergeQuery CLIENT_MERGE_QUERY = new ClientMergeQuery(DATA_SOURCE, SEGMENT_LIST, AGGREGATOR_LIST);; + private static final ClientMergeQuery CLIENT_MERGE_QUERY = + new ClientMergeQuery(DATA_SOURCE, SEGMENT_LIST, AGGREGATOR_LIST); @Test public void testGetType() diff --git a/server/src/test/java/io/druid/server/lookup/cache/LookupNodeDiscoveryTest.java b/server/src/test/java/io/druid/server/lookup/cache/LookupNodeDiscoveryTest.java index 487afe8fdfb..d3d1b0618db 100644 --- a/server/src/test/java/io/druid/server/lookup/cache/LookupNodeDiscoveryTest.java +++ b/server/src/test/java/io/druid/server/lookup/cache/LookupNodeDiscoveryTest.java @@ -74,7 +74,7 @@ public class LookupNodeDiscoveryTest EasyMock.expect(druidNodeDiscovery.getAllNodes()) .andReturn(ImmutableSet.of(node1, node2, node3)) - .anyTimes();; + .anyTimes(); EasyMock.replay(druidNodeDiscoveryProvider, druidNodeDiscovery); diff --git a/server/src/test/java/io/druid/server/router/TieredBrokerHostSelectorTest.java b/server/src/test/java/io/druid/server/router/TieredBrokerHostSelectorTest.java index 81e0d97d793..6e59efc8c4b 100644 --- a/server/src/test/java/io/druid/server/router/TieredBrokerHostSelectorTest.java +++ b/server/src/test/java/io/druid/server/router/TieredBrokerHostSelectorTest.java @@ -107,7 +107,7 @@ public class TieredBrokerHostSelectorTest }; EasyMock.expect(druidNodeDiscoveryProvider.getForNodeType(DruidNodeDiscoveryProvider.NODE_TYPE_BROKER)) - .andReturn(druidNodeDiscovery);; + .andReturn(druidNodeDiscovery); EasyMock.replay(druidNodeDiscoveryProvider); diff --git a/services/src/main/java/io/druid/cli/ResetCluster.java b/services/src/main/java/io/druid/cli/ResetCluster.java index ccc5971e7e7..2407c20ccb1 100644 --- a/services/src/main/java/io/druid/cli/ResetCluster.java +++ b/services/src/main/java/io/druid/cli/ResetCluster.java @@ -175,7 +175,7 @@ public class ResetCluster extends GuiceRunnable log.info("Deleting all TaskLogs."); log.info("==========================================================================="); - TaskLogKiller taskLogKiller = injector.getInstance(TaskLogKiller.class);; + TaskLogKiller taskLogKiller = injector.getInstance(TaskLogKiller.class); taskLogKiller.killAll(); } catch (Exception ex) {