Remove redundant type parameters and enforce some other style and inspection rules

api/src/main/java/io/druid/data/input/impl/DimensionsSpec.java

@@ -75,15 +75,15 @@ public DimensionsSpec(
   )
   {
     this.dimensions = dimensions == null
-                      ? Lists.<DimensionSchema>newArrayList()
+                      ? Lists.newArrayList()
                       : Lists.newArrayList(dimensions);
 
     this.dimensionExclusions = (dimensionExclusions == null)
-                               ? Sets.<String>newHashSet()
+                               ? Sets.newHashSet()
                                : Sets.newHashSet(dimensionExclusions);
 
     List<SpatialDimensionSchema> spatialDims = (spatialDimensions == null)
-                                               ? Lists.<SpatialDimensionSchema>newArrayList()
+                                               ? Lists.newArrayList()
                                                : spatialDimensions;
 
     verify(spatialDims);

api/src/main/java/io/druid/guice/ConditionalMultibind.java

@@ -60,7 +60,7 @@ public class ConditionalMultibind<T>
    */
   public static <T> ConditionalMultibind<T> create(Properties properties, Binder binder, Class<T> type)
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.<T>newSetBinder(binder, type));
+    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type));
   }
 
   /**
@@ -81,7 +81,7 @@ public static <T> ConditionalMultibind<T> create(
       Class<? extends Annotation> annotationType
   )
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.<T>newSetBinder(binder, type, annotationType));
+    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type, annotationType));
   }
 
   /**
@@ -96,7 +96,7 @@ public static <T> ConditionalMultibind<T> create(
    */
   public static <T> ConditionalMultibind<T> create(Properties properties, Binder binder, TypeLiteral<T> type)
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.<T>newSetBinder(binder, type));
+    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type));
   }
 
   /**
@@ -117,7 +117,7 @@ public static <T> ConditionalMultibind<T> create(
       Class<? extends Annotation> annotationType
   )
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.<T>newSetBinder(binder, type, annotationType));
+    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type, annotationType));
   }
 
 

api/src/main/java/io/druid/guice/JsonConfigProvider.java

@@ -154,7 +154,7 @@ public static <T> void bindInstance(
       supplierKey = Key.get(supType);
     }
 
-    binder.bind(supplierKey).toInstance(Suppliers.<T>ofInstance(instance));
+    binder.bind(supplierKey).toInstance(Suppliers.ofInstance(instance));
   }
 
   public static <T> JsonConfigProvider<T> of(String propertyBase, Class<T> classToProvide)

api/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java

@@ -39,8 +39,8 @@ public void testColumnMissing()
         ),
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "b")),
-            Lists.<String>newArrayList(),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList(),
+            Lists.newArrayList()
         ),
         ",",
         Collections.singletonList("a"),
@@ -61,8 +61,8 @@ public void testComma()
         ),
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("a,", "b")),
-            Lists.<String>newArrayList(),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList(),
+            Lists.newArrayList()
         ),
         ",",
         Collections.singletonList("a"),

api/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java

@@ -70,8 +70,8 @@ public void testColumnMissing()
         ),
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "b")),
-            Lists.<String>newArrayList(),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList(),
+            Lists.newArrayList()
         ),
         ",",
         " ",
@@ -93,8 +93,8 @@ public void testComma()
         ),
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("a,", "b")),
-            Lists.<String>newArrayList(),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList(),
+            Lists.newArrayList()
         ),
         ",",
         null,
@@ -116,8 +116,8 @@ public void testDefaultColumnList()
         ),
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "b")),
-            Lists.<String>newArrayList(),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList(),
+            Lists.newArrayList()
         ),
         ",",
         null,

api/src/test/java/io/druid/data/input/impl/InputRowParserSerdeTest.java

@@ -106,7 +106,7 @@ public void testMapInputRowParserSerde() throws Exception
         InputRowParser.class
     );
     final InputRow parsed = parser2.parseBatch(
-        ImmutableMap.<String, Object>of(
+        ImmutableMap.of(
             "foo", "x",
             "bar", "y",
             "qux", "z",
@@ -139,7 +139,7 @@ public void testMapInputRowParserNumbersSerde() throws Exception
         InputRowParser.class
     );
     final InputRow parsed = parser2.parseBatch(
-        ImmutableMap.<String, Object>of(
+        ImmutableMap.of(
             "timemillis", 1412705931123L,
             "toobig", 123E64,
             "value", 123.456,

api/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java

@@ -40,8 +40,8 @@ public void testLowercasing()
         ),
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("A", "B")),
-            Lists.<String>newArrayList(),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList(),
+            Lists.newArrayList()
         )
     );
     Parser parser = spec.makeParser();

api/src/test/java/io/druid/data/input/impl/JSONParseSpecTest.java

@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -98,7 +99,7 @@ public void testParseRowWithConditional()
 
     final Map<String, Object> expected = new HashMap<>();
     expected.put("foo", new ArrayList());
-    expected.put("bar", Arrays.asList("test"));
+    expected.put("bar", Collections.singletonList("test"));
 
     final Parser<String, Object> parser = parseSpec.makeParser();
     final Map<String, Object> parsedRow = parser.parseToMap("{\"something_else\": {\"foo\": \"test\"}}");

api/src/test/java/io/druid/data/input/impl/ParseSpecTest.java

@@ -45,8 +45,8 @@ public void testDuplicateNames()
         ),
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "b", "a")),
-            Lists.<String>newArrayList(),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList(),
+            Lists.newArrayList()
         ),
         ",",
         " ",
@@ -69,7 +69,7 @@ public void testDimAndDimExcluOverlap()
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Arrays.asList("a", "B")),
             Lists.newArrayList("B"),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList()
         ),
         ",",
         null,
@@ -92,7 +92,7 @@ public void testDimExclusionDuplicate()
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Collections.singletonList("a")),
             Lists.newArrayList("B", "B"),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList()
         ),
         ",",
         null,
@@ -113,7 +113,7 @@ public void testDefaultTimestampSpec()
         new DimensionsSpec(
             DimensionsSpec.getDefaultSchemas(Collections.singletonList("a")),
             Lists.newArrayList("B", "B"),
-            Lists.<SpatialDimensionSchema>newArrayList()
+            Lists.newArrayList()
         ),
         ",",
         null,

api/src/test/java/io/druid/data/input/impl/TimestampSpecTest.java

@@ -34,7 +34,7 @@ public void testExtractTimestamp()
     TimestampSpec spec = new TimestampSpec("TIMEstamp", "yyyy-MM-dd", null);
     Assert.assertEquals(
         DateTimes.of("2014-03-01"),
-        spec.extractTimestamp(ImmutableMap.<String, Object>of("TIMEstamp", "2014-03-01"))
+        spec.extractTimestamp(ImmutableMap.of("TIMEstamp", "2014-03-01"))
     );
   }
 
@@ -44,7 +44,7 @@ public void testExtractTimestampWithMissingTimestampColumn()
     TimestampSpec spec = new TimestampSpec(null, null, DateTimes.EPOCH);
     Assert.assertEquals(
         DateTimes.of("1970-01-01"),
-        spec.extractTimestamp(ImmutableMap.<String, Object>of("dim", "foo"))
+        spec.extractTimestamp(ImmutableMap.of("dim", "foo"))
     );
   }
 
@@ -64,7 +64,7 @@ public void testContextualTimestampList()
     DateTimes.UtcFormatter formatter = DateTimes.wrapFormatter(ISODateTimeFormat.dateHourMinuteSecond());
 
     for (String date : dates) {
-      DateTime dateTime = spec.extractTimestamp(ImmutableMap.<String, Object>of("TIMEstamp", date));
+      DateTime dateTime = spec.extractTimestamp(ImmutableMap.of("TIMEstamp", date));
       DateTime expectedDateTime = formatter.parse(date);
       Assert.assertEquals(expectedDateTime, dateTime);
     }

api/src/test/java/io/druid/guice/ConditionalMultibindTest.java

@@ -101,7 +101,7 @@ public void configure(Binder binder)
     }));
 
     Assert.assertEquals(2, animalSet.size());
-    Assert.assertEquals(animalSet, ImmutableSet.<Animal>of(new Cat(), new Dog()));
+    Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog()));
   }
 
   @Test
@@ -128,7 +128,7 @@ public void configure(Binder binder)
     }));
 
     Assert.assertEquals(2, animalSet.size());
-    Assert.assertEquals(animalSet, ImmutableSet.<Animal>of(new Cat(), new Dog()));
+    Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog()));
   }
 
   @Test
@@ -164,7 +164,7 @@ public void configure(Binder binder)
     }));
 
     Assert.assertEquals(3, animalSet.size());
-    Assert.assertEquals(animalSet, ImmutableSet.<Animal>of(new Cat(), new Dog(), new Fish()));
+    Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog(), new Fish()));
   }
 
   @Test
@@ -202,7 +202,7 @@ public void configure(Binder binder)
     {
     }, SanDiego.class));
     Assert.assertEquals(4, animalSet_1.size());
-    Assert.assertEquals(animalSet_1, ImmutableSet.<Animal>of(new Bird(), new Cat(), new Dog(), new Tiger()));
+    Assert.assertEquals(animalSet_1, ImmutableSet.of(new Bird(), new Cat(), new Dog(), new Tiger()));
 
     Set<Animal> animalSet_2 = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
     {
@@ -244,17 +244,17 @@ public void configure(Binder binder)
     injector.injectMembers(shop);
 
     Assert.assertEquals(4, shop.animals.size());
-    Assert.assertEquals(shop.animals, ImmutableSet.<Animal>of(new Bird(), new Cat(), new Dog(), new Fish()));
+    Assert.assertEquals(shop.animals, ImmutableSet.of(new Bird(), new Cat(), new Dog(), new Fish()));
   }
 
   @Test
   public void testMultiConditionalBind_typeLiteral()
   {
     props.setProperty("animal.type", "pets");
 
-    final Set<Animal> set1 = ImmutableSet.<Animal>of(new Dog(), new Tiger());
-    final Set<Animal> set2 = ImmutableSet.<Animal>of(new Cat(), new Fish());
-    final Set<Animal> set3 = ImmutableSet.<Animal>of(new Cat());
+    final Set<Animal> set1 = ImmutableSet.of(new Dog(), new Tiger());
+    final Set<Animal> set2 = ImmutableSet.of(new Cat(), new Fish());
+    final Set<Animal> set3 = ImmutableSet.of(new Cat());
     final Set<Animal> union = new HashSet<>();
     union.addAll(set1);
     union.addAll(set2);

api/src/test/java/io/druid/guice/JsonConfiguratorTest.java

@@ -94,12 +94,12 @@ public ExecutableValidator forExecutables()
   public void testTest()
   {
     Assert.assertEquals(
-        new MappableObject("p1", ImmutableList.<String>of("p2"), "p2"),
-        new MappableObject("p1", ImmutableList.<String>of("p2"), "p2")
+        new MappableObject("p1", ImmutableList.of("p2"), "p2"),
+        new MappableObject("p1", ImmutableList.of("p2"), "p2")
     );
     Assert.assertEquals(
         new MappableObject("p1", null, null),
-        new MappableObject("p1", ImmutableList.<String>of(), null)
+        new MappableObject("p1", ImmutableList.of(), null)
     );
   }
 
@@ -175,7 +175,7 @@ protected MappableObject(
   )
   {
     this.prop1 = prop1;
-    this.prop1List = prop1List == null ? ImmutableList.<String>of() : prop1List;
+    this.prop1List = prop1List == null ? ImmutableList.of() : prop1List;
     this.prop2 = prop2;
   }
 

api/src/test/java/io/druid/timeline/DataSegmentTest.java

@@ -102,7 +102,7 @@ public void testV1Serialization() throws Exception
   {
 
     final Interval interval = Intervals.of("2011-10-01/2011-10-02");
-    final ImmutableMap<String, Object> loadSpec = ImmutableMap.<String, Object>of("something", "or_other");
+    final ImmutableMap<String, Object> loadSpec = ImmutableMap.of("something", "or_other");
 
     DataSegment segment = new DataSegment(
         "something",