Add GenericWhitespace checkstyle check (apache#5668)

codestyle/checkstyle.xml

@@ -94,6 +94,7 @@
       <property name="tokens" value="DOT"/>
       <property name="allowLineBreaks" value="false"/>
     </module>
+    <module name="GenericWhitespace"/>
 
     <module name="Indentation">
       <property name="basicOffset" value="2"/>

extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java

@@ -182,7 +182,7 @@ public int getMaxIntermediateSize()
   @Override
   public List<AggregatorFactory> getRequiredColumns()
   {
-    return Collections.<AggregatorFactory> singletonList(
+    return Collections.singletonList(
         new DoublesSketchAggregatorFactory(
             fieldName,
             fieldName,

extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchModule.java

@@ -19,18 +19,17 @@
 
 package io.druid.query.aggregation.datasketches.quantiles;
 
-import java.util.Arrays;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.inject.Binder;
 import com.yahoo.sketches.quantiles.DoublesSketch;
-
 import io.druid.initialization.DruidModule;
 import io.druid.segment.serde.ComplexMetrics;
 
+import java.util.Collections;
+import java.util.List;
+
 public class DoublesSketchModule implements DruidModule
 {
 
@@ -53,15 +52,17 @@ public void configure(final Binder binder)
   @Override
   public List<? extends Module> getJacksonModules()
   {
-    return Arrays.<Module> asList(
-        new SimpleModule("DoublesQuantilesSketchModule").registerSubtypes(
-            new NamedType(DoublesSketchAggregatorFactory.class, DOUBLES_SKETCH),
-            new NamedType(DoublesSketchMergeAggregatorFactory.class, DOUBLES_SKETCH_MERGE),
-            new NamedType(DoublesSketchToHistogramPostAggregator.class, DOUBLES_SKETCH_HISTOGRAM_POST_AGG),
-            new NamedType(DoublesSketchToQuantilePostAggregator.class, DOUBLES_SKETCH_QUANTILE_POST_AGG),
-            new NamedType(DoublesSketchToQuantilesPostAggregator.class, DOUBLES_SKETCH_QUANTILES_POST_AGG),
-            new NamedType(DoublesSketchToStringPostAggregator.class, DOUBLES_SKETCH_TO_STRING_POST_AGG))
-            .addSerializer(DoublesSketch.class, new DoublesSketchJsonSerializer()));
+    return Collections.<Module>singletonList(
+        new SimpleModule("DoublesQuantilesSketchModule")
+            .registerSubtypes(
+                new NamedType(DoublesSketchAggregatorFactory.class, DOUBLES_SKETCH),
+                new NamedType(DoublesSketchMergeAggregatorFactory.class, DOUBLES_SKETCH_MERGE),
+                new NamedType(DoublesSketchToHistogramPostAggregator.class, DOUBLES_SKETCH_HISTOGRAM_POST_AGG),
+                new NamedType(DoublesSketchToQuantilePostAggregator.class, DOUBLES_SKETCH_QUANTILE_POST_AGG),
+                new NamedType(DoublesSketchToQuantilesPostAggregator.class, DOUBLES_SKETCH_QUANTILES_POST_AGG),
+                new NamedType(DoublesSketchToStringPostAggregator.class, DOUBLES_SKETCH_TO_STRING_POST_AGG)
+            ).addSerializer(DoublesSketch.class, new DoublesSketchJsonSerializer())
+    );
   }
 
 }

indexing-service/src/main/java/io/druid/indexing/overlord/TaskLockbox.java

@@ -636,7 +636,7 @@ public void unlock(final Task task, final Interval interval)
         return;
       }
 
-      final List<TaskLockPosse > possesHolder = dsRunning.get(interval);
+      final List<TaskLockPosse> possesHolder = dsRunning.get(interval);
       if (possesHolder == null || possesHolder.isEmpty()) {
         return;
       }

indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordResourceTest.java

@@ -203,7 +203,7 @@ public void testSecuredGetCompleteTasks()
     expectAuthorizationTokenCheck();
 
     List<String> tasksIds = ImmutableList.of("id_1", "id_2", "id_3");
-    EasyMock.<Collection<? extends TaskRunnerWorkItem>> expect(taskRunner.getRunningTasks()).andReturn(
+    EasyMock.<Collection<? extends TaskRunnerWorkItem>>expect(taskRunner.getRunningTasks()).andReturn(
         ImmutableList.of(
             new MockTaskRunnerWorkItem(tasksIds.get(0), null),
             new MockTaskRunnerWorkItem(tasksIds.get(1), null),
@@ -373,7 +373,7 @@ public void testGetRunningTasksByDataSource()
   {
 
     List<String> tasksIds = ImmutableList.of("id_1", "id_2");
-    EasyMock.<Collection<? extends TaskRunnerWorkItem>> expect(taskRunner.getRunningTasks()).andReturn(
+    EasyMock.<Collection<? extends TaskRunnerWorkItem>>expect(taskRunner.getRunningTasks()).andReturn(
         ImmutableList.of(
             new MockTaskRunnerWorkItem(tasksIds.get(0), null),
             new MockTaskRunnerWorkItem(tasksIds.get(1), null)));
@@ -398,7 +398,7 @@ public void testGetRunningTasksByDataSourceNeg()
     expectAuthorizationTokenCheck();
 
     List<String> tasksIds = ImmutableList.of("id_1", "id_2");
-    EasyMock.<Collection<? extends TaskRunnerWorkItem>> expect(taskRunner.getRunningTasks()).andReturn(
+    EasyMock.<Collection<? extends TaskRunnerWorkItem>>expect(taskRunner.getRunningTasks()).andReturn(
         ImmutableList.of(
             new MockTaskRunnerWorkItem(tasksIds.get(0), null),
             new MockTaskRunnerWorkItem(tasksIds.get(1), null)));

java-util/src/main/java/io/druid/java/util/common/guava/Sequences.java

@@ -113,7 +113,7 @@ public static <T> Sequence<T> wrap(Sequence<T> seq, SequenceWrapper wrapper)
     return new WrappingSequence<>(seq, wrapper);
   }
 
-  public static <T> Sequence<T> withEffect(final Sequence <T> seq, final Runnable effect, final Executor exec)
+  public static <T> Sequence<T> withEffect(final Sequence<T> seq, final Runnable effect, final Executor exec)
   {
     // Uses YieldingSequenceBase to be able to execute the effect if all elements of the wrapped seq are processed
     // (i. e. it "is done"), but the yielder of the underlying seq throws some exception from close(). This logic could

java-util/src/test/java/io/druid/java/util/common/guava/ConcatSequenceTest.java

@@ -279,7 +279,7 @@ public Integer accumulate(Integer accumulated, Integer in)
   }
 
   @SuppressWarnings("unchecked")
-  public void testAll(Iterable <List<Integer>> vals) throws IOException
+  public void testAll(Iterable<List<Integer>> vals) throws IOException
   {
     final Iterable<TestSequence<Integer>> theSequences = Iterables.transform(
         vals,

processing/src/test/java/io/druid/query/filter/ColumnComparisonDimFilterTest.java

@@ -21,7 +21,6 @@
 
 import com.google.common.collect.ImmutableList;
 import io.druid.query.dimension.DefaultDimensionSpec;
-import io.druid.query.dimension.DimensionSpec;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -32,16 +31,16 @@ public class ColumnComparisonDimFilterTest
   @Test
   public void testGetCacheKey()
   {
-    ColumnComparisonDimFilter columnComparisonDimFilter = new ColumnComparisonDimFilter(ImmutableList.<DimensionSpec> of(
+    ColumnComparisonDimFilter columnComparisonDimFilter = new ColumnComparisonDimFilter(ImmutableList.of(
         DefaultDimensionSpec.of("abc"),
         DefaultDimensionSpec.of("d")
     ));
-    ColumnComparisonDimFilter columnComparisonDimFilter2 = new ColumnComparisonDimFilter(ImmutableList.<DimensionSpec> of(
+    ColumnComparisonDimFilter columnComparisonDimFilter2 = new ColumnComparisonDimFilter(ImmutableList.of(
         DefaultDimensionSpec.of("d"),
         DefaultDimensionSpec.of("abc")
     ));
     ColumnComparisonDimFilter columnComparisonDimFilter3 = new ColumnComparisonDimFilter(
-        ImmutableList.<DimensionSpec> of(
+        ImmutableList.of(
             DefaultDimensionSpec.of("d"),
             DefaultDimensionSpec.of("e")
         )
@@ -61,19 +60,19 @@ ImmutableList.<DimensionSpec> of(
   public void testHashCode()
   {
     ColumnComparisonDimFilter columnComparisonDimFilter = new ColumnComparisonDimFilter(
-        ImmutableList.<DimensionSpec> of(
+        ImmutableList.of(
             DefaultDimensionSpec.of("abc"),
             DefaultDimensionSpec.of("d")
         )
     );
     ColumnComparisonDimFilter columnComparisonDimFilter2 = new ColumnComparisonDimFilter(
-        ImmutableList.<DimensionSpec> of(
+        ImmutableList.of(
             DefaultDimensionSpec.of("d"),
             DefaultDimensionSpec.of("abc")
         )
     );
     ColumnComparisonDimFilter columnComparisonDimFilter3 = new ColumnComparisonDimFilter(
-        ImmutableList.<DimensionSpec> of(
+        ImmutableList.of(
             DefaultDimensionSpec.of("d"),
             DefaultDimensionSpec.of("e")
         )

server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java

@@ -19,22 +19,19 @@
 package io.druid.segment.realtime.appenderator;
 
 import io.druid.data.input.InputRow;
-import io.druid.query.SegmentDescriptor;
 import io.druid.segment.indexing.RealtimeTuningConfig;
 import io.druid.segment.realtime.SegmentPublisher;
 import io.druid.segment.realtime.plumber.IntervalStartVersioningPolicy;
 import io.druid.segment.realtime.plumber.NoopRejectionPolicyFactory;
 import io.druid.segment.realtime.plumber.SegmentHandoffNotifier;
 import io.druid.segment.realtime.plumber.SegmentHandoffNotifierFactory;
 import io.druid.server.coordination.DataSegmentAnnouncer;
-import io.druid.timeline.DataSegment;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
 
 public class AppenderatorPlumberTest
 {
@@ -46,7 +43,7 @@ public AppenderatorPlumberTest() throws Exception
     this.appenderatorTester = new AppenderatorTester(10);
     DataSegmentAnnouncer segmentAnnouncer = EasyMock
         .createMock(DataSegmentAnnouncer.class);
-    segmentAnnouncer.announceSegment(EasyMock.<DataSegment> anyObject());
+    segmentAnnouncer.announceSegment(EasyMock.anyObject());
     EasyMock.expectLastCall().anyTimes();
 
     SegmentPublisher segmentPublisher = EasyMock
@@ -62,9 +59,9 @@ public AppenderatorPlumberTest() throws Exception
     EasyMock
         .expect(
             handoffNotifier.registerSegmentHandoffCallback(
-                EasyMock.<SegmentDescriptor> anyObject(),
-                EasyMock.<Executor> anyObject(),
-                EasyMock.<Runnable> anyObject())).andReturn(true).anyTimes();
+                EasyMock.anyObject(),
+                EasyMock.anyObject(),
+                EasyMock.anyObject())).andReturn(true).anyTimes();
 
     RealtimeTuningConfig tuningConfig = new RealtimeTuningConfig(
         1,