Use generics internally

Author: garydgregory

pom.xml

@@ -57,7 +57,7 @@
     <commons.osgi.import>*;resolution:=optional</commons.osgi.import>
     <!-- JaCoCo: Don't make code coverage worse than: -->
     <commons.jacoco.haltOnFailure>true</commons.jacoco.haltOnFailure>
-    <commons.jacoco.classRatio>0.92</commons.jacoco.classRatio>
+    <commons.jacoco.classRatio>0.91</commons.jacoco.classRatio>
     <commons.jacoco.instructionRatio>0.74</commons.jacoco.instructionRatio>
     <commons.jacoco.methodRatio>0.82</commons.jacoco.methodRatio>
     <commons.jacoco.branchRatio>0.68</commons.jacoco.branchRatio>

src/main/java/org/apache/commons/jxpath/servlet/PageContextHandler.java

@@ -43,24 +43,24 @@ public Object getProperty(final Object pageContext, final String property) {
 
     @Override
     public String[] getPropertyNames(final Object pageContext) {
-        final HashSet list = new HashSet();
-        Enumeration e = ((PageContext) pageContext).getAttributeNamesInScope(PageContext.PAGE_SCOPE);
+        final HashSet<String> set = new HashSet<>();
+        Enumeration<String> e = ((PageContext) pageContext).getAttributeNamesInScope(PageContext.PAGE_SCOPE);
         while (e.hasMoreElements()) {
-            list.add(e.nextElement());
+            set.add(e.nextElement());
         }
         e = ((PageContext) pageContext).getAttributeNamesInScope(PageContext.REQUEST_SCOPE);
         while (e.hasMoreElements()) {
-            list.add(e.nextElement());
+            set.add(e.nextElement());
         }
         e = ((PageContext) pageContext).getAttributeNamesInScope(PageContext.SESSION_SCOPE);
         while (e.hasMoreElements()) {
-            list.add(e.nextElement());
+            set.add(e.nextElement());
         }
         e = ((PageContext) pageContext).getAttributeNamesInScope(PageContext.APPLICATION_SCOPE);
         while (e.hasMoreElements()) {
-            list.add(e.nextElement());
+            set.add(e.nextElement());
         }
-        return (String[]) list.toArray(new String[list.size()]);
+        return set.toArray(new String[set.size()]);
     }
 
     @Override

src/main/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java

@@ -33,7 +33,7 @@ public class ClassLoaderUtil {
     /**
      * Maps a primitive class name to its corresponding abbreviation used in array class names.
      */
-    private static Map abbreviationMap = new HashMap();
+    private static Map<String, String> abbreviationMap = new HashMap<>();
     /**
      * Feed abbreviation maps
      */

src/main/java/org/apache/commons/jxpath/util/TypeUtils.java

@@ -25,20 +25,17 @@
 public class TypeUtils {
 
     private static TypeConverter typeConverter = new BasicTypeConverter();
-    private static final HashMap PRIMITIVE_TYPE_MAP = new HashMap() {
-
-        private static final long serialVersionUID = 1L;
-        {
-            put(int.class, Integer.class);
-            put(byte.class, Byte.class);
-            put(short.class, Short.class);
-            put(char.class, Character.class);
-            put(long.class, Long.class);
-            put(float.class, Float.class);
-            put(double.class, Double.class);
-            put(boolean.class, Boolean.class);
-        }
-    };
+    private static final HashMap<Class, Class> PRIMITIVE_TYPE_MAP = new HashMap<>();
+    static {
+        PRIMITIVE_TYPE_MAP.put(int.class, Integer.class);
+        PRIMITIVE_TYPE_MAP.put(byte.class, Byte.class);
+        PRIMITIVE_TYPE_MAP.put(short.class, Short.class);
+        PRIMITIVE_TYPE_MAP.put(char.class, Character.class);
+        PRIMITIVE_TYPE_MAP.put(long.class, Long.class);
+        PRIMITIVE_TYPE_MAP.put(float.class, Float.class);
+        PRIMITIVE_TYPE_MAP.put(double.class, Double.class);
+        PRIMITIVE_TYPE_MAP.put(boolean.class, Boolean.class);
+    }
 
     /**
      * Returns true if the global converter can convert the supplied object to the specified type.

src/main/java/org/apache/commons/jxpath/util/ValueUtils.java

@@ -40,7 +40,7 @@
  */
 public class ValueUtils {
 
-    private static Map dynamicPropertyHandlerMap = new HashMap();
+    private static Map<Class, DynamicPropertyHandler> dynamicPropertyHandlerMap = new HashMap<>();
     private static final int UNKNOWN_LENGTH_MAX_COUNT = 16000;
 
     /**