Lang: Remove redundant generic types

new ArrayList<Shape> with new ArrayList<>
Also removed one "dead store".

Author: dsmiley

src/main/java/org/locationtech/spatial4j/context/SpatialContextFactory.java

@@ -69,8 +69,8 @@ public class SpatialContextFactory {
 
   public Class<? extends ShapeFactory> shapeFactoryClass = ShapeFactoryImpl.class;
   public Class<? extends BinaryCodec> binaryCodecClass = BinaryCodec.class;
-  public final List<Class<? extends ShapeReader>> readers = new ArrayList<Class<? extends ShapeReader>>();
-  public final List<Class<? extends ShapeWriter>> writers = new ArrayList<Class<? extends ShapeWriter>>();
+  public final List<Class<? extends ShapeReader>> readers = new ArrayList<>();
+  public final List<Class<? extends ShapeWriter>> writers = new ArrayList<>();
   public boolean hasFormatConfig = false;
 
   public SpatialContextFactory() {
@@ -218,7 +218,7 @@ protected void initFormats() {
   public SupportedFormats makeFormats(SpatialContext ctx) {
     checkDefaultFormats();  // easy to override
 
-    List<ShapeReader> read = new ArrayList<ShapeReader>(readers.size());
+    List<ShapeReader> read = new ArrayList<>(readers.size());
     for (Class<? extends ShapeReader> clazz : readers) {
       try {
         read.add(makeClassInstance(clazz, ctx, this));
@@ -227,7 +227,7 @@ public SupportedFormats makeFormats(SpatialContext ctx) {
       }
     }
 
-    List<ShapeWriter> write = new ArrayList<ShapeWriter>(writers.size());
+    List<ShapeWriter> write = new ArrayList<>(writers.size());
     for (Class<? extends ShapeWriter> clazz : writers) {
       try {
         write.add(makeClassInstance(clazz, ctx, this));

src/main/java/org/locationtech/spatial4j/io/BinaryCodec.java

@@ -145,7 +145,7 @@ public void writeCircle(DataOutput dataOutput, Circle c) throws IOException {
   public ShapeCollection readCollection(DataInput dataInput) throws IOException {
     byte type = dataInput.readByte();
     int size = dataInput.readInt();
-    ArrayList<Shape> shapes = new ArrayList<Shape>(size);
+    ArrayList<Shape> shapes = new ArrayList<>(size);
     for (int i = 0; i < size; i++) {
       if (type == 0) {
         shapes.add(readShape(dataInput));

src/main/java/org/locationtech/spatial4j/io/GeoJSONReader.java

@@ -249,7 +249,7 @@ protected Shape readShape(JSONParser parser) throws IOException, ParseException
             readUntilEvent(parser, JSONParser.OBJECT_END);
             return shape;
           } else if ("geometries".equals(key)) {
-            List<Shape> shapes = new ArrayList<Shape>();
+            List<Shape> shapes = new ArrayList<>();
             int sub = parser.nextEvent();
             while (sub != JSONParser.EOF) {
               if (sub == JSONParser.OBJECT_START) {

src/main/java/org/locationtech/spatial4j/io/PolyshapeReader.java

@@ -92,7 +92,7 @@ public final Shape read(Reader r) throws ParseException, IOException
 
       if(lastShape!=null) {
         if(shapes==null) {
-          shapes = new ArrayList<Shape>();
+          shapes = new ArrayList<>();
         }
         shapes.add(lastShape);
       }
@@ -174,7 +174,6 @@ protected Shape readPolygon(XReader reader) throws IOException {
     reader.readPoints(polyBuilder);
 
     if(!reader.isDone() && reader.peek()==PolyshapeWriter.KEY_ARG_START) {
-      List<LinearRing> list = new ArrayList<LinearRing>();
       while(reader.isEvent() && reader.peek()==PolyshapeWriter.KEY_ARG_START) {
         reader.readKey(); // eat the event;
         reader.readPoints(polyBuilder.hole()).endHole();

src/main/java/org/locationtech/spatial4j/shape/ShapeCollection.java

@@ -99,7 +99,7 @@ public boolean hasArea() {
 
   @Override
   public ShapeCollection getBuffered(double distance, SpatialContext ctx) {
-    List<Shape> bufColl = new ArrayList<Shape>(size());
+    List<Shape> bufColl = new ArrayList<>(size());
     for (Shape shape : shapes) {
       bufColl.add(shape.getBuffered(distance, ctx));
     }

src/main/java/org/locationtech/spatial4j/shape/impl/BufferedLineString.java

@@ -59,7 +59,7 @@ public BufferedLineString(List<Point> points, double buf, boolean expandBufForLo
     if (points.isEmpty()) {
       this.segments = ctx.makeCollection(Collections.<BufferedLine>emptyList());
     } else {
-      List<BufferedLine> segments = new ArrayList<BufferedLine>(points.size() - 1);
+      List<BufferedLine> segments = new ArrayList<>(points.size() - 1);
 
       Point prevPoint = null;
       for (Point point : points) {

src/main/java/org/locationtech/spatial4j/shape/jts/JtsGeometry.java

@@ -573,7 +573,7 @@ private static Geometry cutUnwrappedGeomInto360(Geometry geom) {
       return geom;
     assert geom.isValid() : "geom";
 
-    List<Geometry> geomList = new ArrayList<Geometry>();
+    List<Geometry> geomList = new ArrayList<>();
     //page 0 is the standard -180 to 180 range
     int startPage = (int) Math.floor((geomEnv.getMinX() + 180) / 360);
     for (int page = startPage; true; page++) {

src/test/java/org/locationtech/spatial4j/TestLog.java

@@ -22,7 +22,7 @@
 public class TestLog extends TestRuleAdapter {
 
   //TODO does this need to be threadsafe (such as via thread-local state)?
-  private static ArrayList<LogEntry> logStack = new ArrayList<LogEntry>();
+  private static ArrayList<LogEntry> logStack = new ArrayList<>();
   private static final int MAX_LOGS = 1000;
 
   public static final TestLog instance = new TestLog();

src/test/java/org/locationtech/spatial4j/context/SpatialContextFactoryTest.java

@@ -36,7 +36,7 @@ public void tearDown() {
   }
 
   private SpatialContext call(String... argsStr) {
-    Map<String,String> args = new HashMap<String,String>();
+    Map<String,String> args = new HashMap<>();
     for (int i = 0; i < argsStr.length; i+=2) {
       String key = argsStr[i];
       String val = argsStr[i+1];

src/test/java/org/locationtech/spatial4j/io/WKTWriterTest.java

@@ -30,7 +30,7 @@ public void testToStringOnEmptyPoint() throws Exception {
   @Test
   public void testToStringOnEmptyShapeCollection() throws Exception {
     ShapeWriter writer = ctx.getFormats().getWktWriter();
-    ShapeCollection<Point> emptyCollection = ctx.makeCollection(new ArrayList<Point>());
+    ShapeCollection<Point> emptyCollection = ctx.makeCollection(new ArrayList<>());
 
     assertEquals("GEOMETRYCOLLECTION EMPTY", writer.toString(emptyCollection));
   }