Lang: resolve unchecked generics

And suppress deprecation warnings for now.

Author: dsmiley

pom.xml

@@ -200,7 +200,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <optimize>true</optimize>
-          <showDeprecation>true</showDeprecation>
+          <showDeprecation>false</showDeprecation><!-- for time being -->
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
         </configuration>
       </plugin>
 

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

@@ -99,7 +99,7 @@ public static SpatialContext makeSpatialContext(Map<String,String> args, ClassLo
       instance = new SpatialContextFactory();
     else {
       try {
-        Class c = classLoader.loadClass(cname);
+        Class<?> c = classLoader.loadClass(cname);
         instance = (SpatialContextFactory) c.newInstance();
       } catch (Exception e) {
         throw new RuntimeException(e);
@@ -129,6 +129,7 @@ protected void init(Map<String, String> args, ClassLoader classLoader) {
   }
 
   /** Gets {@code name} from args and populates a field by the same name with the value. */
+  @SuppressWarnings("unchecked")
   protected void initField(String name) {
     //  note: java.beans API is more verbose to use correctly (?) but would arguably be better
     Field field;
@@ -295,14 +296,13 @@ public BinaryCodec makeBinaryCodec(SpatialContext ctx) {
     return makeClassInstance(binaryCodecClass, ctx, this);
   }
 
-  @SuppressWarnings("unchecked")
   private <T> T makeClassInstance(Class<? extends T> clazz, Object... ctorArgs) {
     try {
       Constructor<?> empty = null;
 
       //can't simply lookup constructor by arg type because might be subclass type
       ctorLoop: for (Constructor<?> ctor : clazz.getConstructors()) {
-        Class[] parameterTypes = ctor.getParameterTypes();
+        Class<?>[] parameterTypes = ctor.getParameterTypes();
         if (parameterTypes.length == 0) {
           empty = ctor; // the empty constructor;
         }

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

@@ -119,7 +119,7 @@ public void write(Encoder enc, Shape shape) throws IOException {
       return;
     }
     if (shape instanceof ShapeCollection) {
-      ShapeCollection v = (ShapeCollection) shape;
+      @SuppressWarnings("unchecked") ShapeCollection<Shape> v = (ShapeCollection<Shape>) shape;
       Iterator<Shape> iter = v.iterator();
       while(iter.hasNext()) {
         write(enc, iter.next());

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

@@ -37,7 +37,7 @@ public void testCircle() throws Exception {
 
   @Test
   public void testCollection() throws Exception {
-    ShapeCollection s = ctx.makeCollection(
+    ShapeCollection<Shape> s = ctx.makeCollection(
         Arrays.asList(
             randomShape(),
             randomShape(),

src/test/java/org/locationtech/spatial4j/shape/RandomizedShapeTest.java

@@ -41,8 +41,8 @@ public RandomizedShapeTest(SpatialContext ctx) {
     this.ctx = ctx;
   }
 
-  public static void checkShapesImplementEquals( Class[] classes ) {
-    for( Class clazz : classes ) {
+  public static void checkShapesImplementEquals( Class<?>[] classes ) {
+    for( Class<?> clazz : classes ) {
       try {
         clazz.getDeclaredMethod( "equals", Object.class );
       } catch (Exception e) {

src/test/java/org/locationtech/spatial4j/shape/ShapeCollectionTest.java

@@ -96,7 +96,7 @@ protected ShapeCollection generateRandomShape(Point nearP) {
         //1st 2 are near nearP, the others are anywhere
         shapes.add(randomRectangle( i < 2 ? nearP : null));
       }
-      ShapeCollection shapeCollection = new ShapeCollection<>(shapes, ctx);
+      ShapeCollection<Rectangle> shapeCollection = new ShapeCollection<>(shapes, ctx);
 
       //test shapeCollection.getBoundingBox();
       Rectangle msBbox = shapeCollection.getBoundingBox();

src/test/java/org/locationtech/spatial4j/util/Geom.java

@@ -303,6 +303,7 @@ public static Polygon first(MultiPolygon mp) {
     /**
      * Returns the geometries of a geometry collection as an array.
      */
+    @SuppressWarnings("unchecked")
     public static <T extends Geometry> T[] array(GeometryCollection gc, T[] array) {
         for (int i =0 ; i < gc.getNumGeometries(); i++) {
             array[i] = (T) gc.getGeometryN(i);
@@ -320,34 +321,33 @@ public static <T extends Geometry> T[] array(GeometryCollection gc, T[] array) {
      *
      * @see {@link GeometryFactory#buildGeometry(Collection)}
      */
-    public static <T extends Geometry> T narrow(GeometryCollection gc) {
+    public static Geometry narrow(GeometryCollection gc) {
 
         if (gc.getNumGeometries() == 0) {
-            return (T) gc;
+            return gc;
         }
 
         List<Geometry> objects = new ArrayList<>(gc.getNumGeometries());
         for (Geometry g : iterate(gc)) {
             objects.add(g);
         }
 
-        return (T) gc.getFactory().buildGeometry(objects);
+        return gc.getFactory().buildGeometry(objects);
     }
 
     /**
      * Recursively flattens a geometry collection into it's constituent geometry objects.
      */
-    public static <T extends Geometry> List<T> flatten(GeometryCollection gc) {
-        return flatten(Collections.singletonList((Geometry)gc));
+    public static List<Geometry> flatten(GeometryCollection gc) {
+        return flatten(Collections.singletonList(gc));
     }
 
     /**
      * Recursively flattens a list of geometries into it's constituent geometry objects.
      */
-    public static <T extends Geometry> List<T> flatten(List<Geometry> gl) {
-        List<T> flat = new ArrayList<>();
-        LinkedList<Geometry> q = new LinkedList<>();
-        q.addAll(gl);
+    public static List<Geometry> flatten(List<Geometry> gl) {
+        List<Geometry> flat = new ArrayList<>();
+        LinkedList<Geometry> q = new LinkedList<>(gl);
 
         while (!q.isEmpty()) {
             Geometry g = q.removeFirst();
@@ -357,7 +357,7 @@ public static <T extends Geometry> List<T> flatten(List<Geometry> gl) {
                 }
             }
             else {
-                flat.add((T) g);
+                flat.add(g);
             }
         }
 

src/test/java/org/locationtech/spatial4j/util/GeomBuilder.java

@@ -391,9 +391,9 @@ <T extends Geometry> T[] gpop(int n, Class<T> clazz) {
                 + "but found %d", n, gstack.size()));
         }
 
-        T[] l = (T[]) Array.newInstance(clazz, n);
+        @SuppressWarnings("unchecked") T[] l = (T[]) Array.newInstance(clazz, n);
         for (int i = 0; i < n; i++) {
-            Object g = gstack.pop();
+            Geometry g = gstack.pop();
             if (!clazz.isInstance(g)) {
                 throw new IllegalStateException(String.format(Locale.ROOT,"Expected %s on geometry stack, but "
                     + "found %s", clazz.getSimpleName(), g.getClass().getSimpleName()));