type-constrain all HashMap

Java/sources/org/perl/inline/java/InlineJavaClass.java

@@ -8,7 +8,7 @@ class InlineJavaClass {
 	private InlineJavaServer ijs ;
 	private InlineJavaProtocol ijp ;
 
-	static private HashMap class2jni_code = new HashMap() ;
+	static private HashMap<Class, String> class2jni_code = new HashMap<>() ;
 	static {
 		class2jni_code.put(byte.class, "B") ;
 		class2jni_code.put(short.class, "S") ;
@@ -21,7 +21,7 @@ class InlineJavaClass {
 		class2jni_code.put(void.class, "V") ;
 	} ;
 
-	static private HashMap class2wrapper = new HashMap() ;
+	static private HashMap<Class, Class> class2wrapper = new HashMap<>() ;
 	static {
 		class2wrapper.put(byte.class, java.lang.Byte.class) ;
 		class2wrapper.put(short.class, java.lang.Short.class) ;
@@ -34,7 +34,7 @@ class InlineJavaClass {
 		class2wrapper.put(void.class, java.lang.Void.class) ;
 	} ;
 
-	static private HashMap name2class = new HashMap() ;
+	static private HashMap<String, Class> name2class = new HashMap<>() ;
 	static {
 		name2class.put("byte", byte.class) ;
 		name2class.put("short", short.class) ;
@@ -388,7 +388,7 @@ static boolean ClassIsPrimitive(Class p){
 	/*
 		Determines if class is of numerical type.
 	*/
-	static private HashMap numeric_classes = new HashMap() ;
+	static private HashMap<Class, Boolean> numeric_classes = new HashMap<>() ;
 	static {
 		Class [] list = {
 			java.lang.Byte.class,
@@ -414,7 +414,7 @@ static boolean ClassIsNumeric (Class p){
 	}
 
 
-	static private HashMap double_classes = new HashMap() ;
+	static private HashMap<Class, Boolean> double_classes = new HashMap<>();
 	static {
 		Class [] list = {
 			java.lang.Double.class,
@@ -432,7 +432,7 @@ static boolean ClassIsDouble (Class p){
 	/*
 		Class is String or StringBuffer
 	*/
-	static private HashMap string_classes = new HashMap() ;
+	static private HashMap<Class, Boolean> string_classes = new HashMap<>();
 	static {
 		Class csq = ValidateClassQuiet("java.lang.CharSequence") ;
 		Class [] list = {
@@ -452,7 +452,7 @@ static boolean ClassIsString (Class p){
 	/*
 		Class is Char
 	*/
-	static private HashMap char_classes = new HashMap() ;
+	static private HashMap<Class, Boolean> char_classes = new HashMap<>() ;
 	static {
 		Class [] list = {
 			java.lang.Character.class,
@@ -470,7 +470,7 @@ static boolean ClassIsChar (Class p){
 	/*
 		Class is Bool
 	*/
-	static private HashMap bool_classes = new HashMap() ;
+	static private HashMap<Class, Boolean> bool_classes = new HashMap<>() ;
 	static {
 		Class [] list = {
 			java.lang.Boolean.class,

Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java

@@ -10,7 +10,7 @@
 public class InlineJavaPerlCaller {
 	private InlineJavaServer ijs = InlineJavaServer.GetInstance() ;
 	private Thread creator = null ;
-	static private Map thread_callback_queues = Collections.synchronizedMap(new HashMap()) ;
+	static private Map<Thread, InlineJavaCallbackQueue> thread_callback_queues = Collections.synchronizedMap(new HashMap<Thread, InlineJavaCallbackQueue>()) ;
 	static private ResourceBundle resources = null ;
 	static private boolean inited = false ;
 

Java/sources/org/perl/inline/java/InlineJavaPerlNatives.java

@@ -7,8 +7,8 @@
 
 public class InlineJavaPerlNatives extends InlineJavaPerlCaller {
 	static private boolean inited = false ;
-	static private Map registered_classes = Collections.synchronizedMap(new HashMap()) ;
-	static private Map registered_methods = Collections.synchronizedMap(new HashMap()) ;
+	static private Map<Class, Class> registered_classes = Collections.synchronizedMap(new HashMap<>()) ;
+	static private Map<String, String> registered_methods = Collections.synchronizedMap(new HashMap<>()) ;
 
 
 	protected InlineJavaPerlNatives() throws InlineJavaException {

Java/sources/org/perl/inline/java/InlineJavaProtocol.java

@@ -18,7 +18,7 @@ class InlineJavaProtocol {
 
 	private final String encoding = "UTF-8" ;
 
-	static private Map member_cache = Collections.synchronizedMap(new HashMap()) ;
+	static private Map<String, Member> member_cache = Collections.synchronizedMap(new HashMap<>()) ;
 	static private final String report_version = "V2" ;
 
 	InlineJavaProtocol(InlineJavaServer _ijs, String _cmd) {

Java/sources/org/perl/inline/java/InlineJavaServer.java

@@ -20,7 +20,7 @@ public class InlineJavaServer {
 	private boolean finished = false ;
 	private ServerSocket server_socket = null ;
 	private InlineJavaUserClassLoader ijucl = null ;
-	private HashMap thread_objects = new HashMap() ;
+	private HashMap<Thread, HashMap<Integer, Object>> thread_objects = new HashMap<>();
 	private int objid = 1 ;
 	private boolean jni = false ;
 	private Thread creator = null ;
@@ -218,7 +218,7 @@ synchronized Object GetObject(int id) throws InlineJavaException {
 
 
 	synchronized int PutObject(Object o) throws InlineJavaException {
-		HashMap h = (HashMap)thread_objects.get(Thread.currentThread()) ;
+		HashMap<Integer, Object> h = (HashMap<Integer, Object>)thread_objects.get(Thread.currentThread()) ;
 
 		int id = objid ;
 		if (h == null){
@@ -291,7 +291,7 @@ synchronized void Shutdown(){
 		calls this method also.
 	*/
 	synchronized void AddThread(Thread t){
-		thread_objects.put(t, new HashMap()) ;
+		thread_objects.put(t, new HashMap<Integer, Object>()) ;
 		InlineJavaPerlCaller.AddThread(t) ;
 	}
 

Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java

@@ -12,7 +12,7 @@
 	so that it will execute them.
 */
 class InlineJavaUserClassLoader extends URLClassLoader {
-    private HashMap urls = new HashMap() ;
+    private HashMap<URL, String> urls = new HashMap<>() ;
 
 	private Object link = null ;
 	private Method invoke = null ;

lib/Inline/Java.pod

@@ -480,13 +480,13 @@ are not known to C<Inline::Java>. This is also true for return types:
          }
 
          public HashMap get_hash(){
-            HashMap h = new HashMap() ;
+            HashMap<String, String> h = new HashMap<>() ;
             h.put("key", "value") ;
 
             return h ;
          }
 
-         public String do_stuff_to_hash(HashMap h){
+         public String do_stuff_to_hash(HashMap<String, String> h){
            return (String)h.get("key") ;
          }
       }

t/06_static.t

@@ -60,7 +60,7 @@ import java.util.* ;
 
 public class types6 {
 	public static int i = 5 ;
-	public static HashMap hm = new HashMap() ;
+	public static HashMap<String, String> hm = new HashMap<>() ;
 
 	public types6(String k, String v){
 		hm.put(k, v) ;

t/08_study.t

@@ -101,8 +101,8 @@ public class a8 {
 	}
 
 	public HashMap [] sb(){
-		HashMap h1 = new HashMap() ;
-		HashMap h2 = new HashMap() ;
+		HashMap<String, String> h1 = new HashMap<>() ;
+		HashMap<String, String> h2 = new HashMap<>() ;
 		h1.put("toto", "titi") ;
 		h2.put("tata", "tete") ;
 

t/types.java

@@ -12,7 +12,7 @@ public String func(){
 	}
 
 	public HashMap hm(){
-		HashMap hm = new HashMap() ;
+		HashMap<String, String> hm = new HashMap<>() ;
 		hm.put("key", "value") ;
 
 		return hm ;