use valueOf or parse* instead of deprecated constructors

12 files changed, 47 insertions, 48 deletions

diff --git a/Java/PerlInterpreter/t/02_perl_interpreter.t b/Java/PerlInterpreter/t/02_perl_interpreter.t
index d4a364c..722738d 100644
--- a/Java/PerlInterpreter/t/02_perl_interpreter.t
+++ b/Java/PerlInterpreter/t/02_perl_interpreter.t
@@ -121,7 +121,7 @@ class InlineJavaPerlInterpreterTests implements Runnable {
 			pi.require("Carp") ;
 			ok("1", "1") ;
 			Integer sum = (Integer)pi.eval("34 + 56", Integer.class) ;
-			ok(sum, new Integer(90)) ;
+			ok(sum, Integer.valueOf(90)) ;
 			String name = (String)pi.CallPerlSub("whats_your_name", null, String.class) ;
 			ok(name, "perl") ;
 	
@@ -134,10 +134,10 @@ class InlineJavaPerlInterpreterTests implements Runnable {
 
 			ArrayList a = new ArrayList() ;
 			for (int i = 0 ; i < 100 ; i++){
-				a.add(new Integer(i * 2)) ;
+				a.add(Integer.valueOf(i * 2)) ;
 			}
 			sum = (Integer)pi.CallPerlSub("sum_array_list", new Object [] {a}, Integer.class) ;
-			ok(sum, new Integer(9900)) ;
+			ok(sum, Integer.valueOf(9900)) ;
 
 			pi.destroy() ;
 			ok("1", "1") ;
diff --git a/Java/sources/org/perl/inline/java/InlineJavaCallback.java b/Java/sources/org/perl/inline/java/InlineJavaCallback.java
index da23afe..f946d95 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaCallback.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaCallback.java
@@ -128,7 +128,7 @@ class InlineJavaCallback {
 				StringTokenizer st = new StringTokenizer(resp, " ") ;
 				String c = st.nextToken() ;
 				if (c.equals("callback")){
-					boolean thrown = new Boolean(st.nextToken()).booleanValue() ;
+					boolean thrown = Boolean.parseBoolean(st.nextToken()) ;
 					String arg = st.nextToken() ;
 					InlineJavaClass ijc = new InlineJavaClass(ijs, ijp) ;
 					ret = ijc.CastArgument(cast, arg) ;
diff --git a/Java/sources/org/perl/inline/java/InlineJavaClass.java b/Java/sources/org/perl/inline/java/InlineJavaClass.java
index b7103a7..7cd19b0 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaClass.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaClass.java
@@ -186,7 +186,7 @@ class InlineJavaClass {
 					l += (((long)c[i]) << (8 * i)) ;
 				}
 				double d = Double.longBitsToDouble(l) ;
-				ret = new Double(d) ;
+				ret = Double.valueOf(d) ;
 			}
 			else {
 				throw new InlineJavaCastException("Can't convert reference to " + p.getName()) ;
@@ -195,7 +195,7 @@ class InlineJavaClass {
 		else if (ClassIsBool(p)){
 			if (type.equals("undef")){
 				InlineJavaUtils.debug(4, "args is undef -> forcing to bool false") ;
-				ret = new Boolean("false") ;
+				ret = Boolean.FALSE;
 				InlineJavaUtils.debug(4, " result is " + ret.toString()) ;
 			}
 			else if (type.equals("scalar")){
@@ -207,7 +207,7 @@ class InlineJavaClass {
 				else{
 					arg = "true" ;
 				}
-				ret = new Boolean(arg) ;
+				ret = Boolean.valueOf(arg) ;
 				InlineJavaUtils.debug(4, " result is " + ret.toString()) ;
 			}
 			else{
@@ -217,7 +217,7 @@ class InlineJavaClass {
 		else if (ClassIsChar(p)){
 			if (type.equals("undef")){
 				InlineJavaUtils.debug(4, "args is undef -> forcing to char '\0'") ;
-				ret = new Character('\0') ;
+				ret = Character.valueOf('\0') ;
 				InlineJavaUtils.debug(4, " result is " + ret.toString()) ;
 			}
 			else if (type.equals("scalar")){
@@ -230,7 +230,7 @@ class InlineJavaClass {
 				else if (arg.length() > 1){
 					throw new InlineJavaCastException("Can't convert " + arg + " to " + p.getName()) ;
 				}
-				ret = new Character(c) ;
+				ret = Character.valueOf(c) ;
 				InlineJavaUtils.debug(4, " result is " + ret.toString()) ;
 			}
 			else{
@@ -406,7 +406,7 @@ class InlineJavaClass {
 			double.class,
 		} ;
 		for (int i = 0 ; i < list.length ; i++){
-			numeric_classes.put(list[i], new Boolean(true)) ;
+			numeric_classes.put(list[i], Boolean.TRUE) ;
 		}
 	}
 	static boolean ClassIsNumeric (Class p){
@@ -421,7 +421,7 @@ class InlineJavaClass {
 			double.class,
 		} ;
 		for (int i = 0 ; i < list.length ; i++){
-			double_classes.put(list[i], new Boolean(true)) ;
+			double_classes.put(list[i], Boolean.TRUE) ;
 		}
 	}
 	static boolean ClassIsDouble (Class p){
@@ -441,7 +441,7 @@ class InlineJavaClass {
 			csq
 		} ;
 		for (int i = 0 ; i < list.length ; i++){
-			string_classes.put(list[i], new Boolean(true)) ;
+			string_classes.put(list[i], Boolean.TRUE) ;
 		}
 	}
 	static boolean ClassIsString (Class p){
@@ -459,7 +459,7 @@ class InlineJavaClass {
 			char.class,
 		} ;
 		for (int i = 0 ; i < list.length ; i++){
-			char_classes.put(list[i], new Boolean(true)) ;
+			char_classes.put(list[i], Boolean.TRUE) ;
 		}
 	}
 	static boolean ClassIsChar (Class p){
@@ -477,7 +477,7 @@ class InlineJavaClass {
 			boolean.class,
 		} ;
 		for (int i = 0 ; i < list.length ; i++){
-			bool_classes.put(list[i], new Boolean(true)) ;
+			bool_classes.put(list[i], Boolean.TRUE) ;
 		}
 	}
 	static boolean ClassIsBool (Class p){
diff --git a/Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java b/Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java
index c389358..616cb5a 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java
@@ -128,12 +128,12 @@ public class InlineJavaPerlCaller {
 
 
 	public Object require_file(String file) throws InlineJavaPerlException, InlineJavaException {
-		return CallPerlSub("Inline::Java::Callback::java_require", new Object [] {file, new Boolean("true")}) ;
+		return CallPerlSub("Inline::Java::Callback::java_require", new Object [] {file, Boolean.TRUE}) ;
 	}
 	
 	
 	public Object require_module(String module) throws InlineJavaPerlException, InlineJavaException {
-		return CallPerlSub("Inline::Java::Callback::java_require", new Object [] {module, new Boolean("false")}) ;
+		return CallPerlSub("Inline::Java::Callback::java_require", new Object [] {module, Boolean.FALSE}) ;
 	}
 	
 
diff --git a/Java/sources/org/perl/inline/java/InlineJavaPerlObject.java b/Java/sources/org/perl/inline/java/InlineJavaPerlObject.java
index b57caab..34b45ce 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaPerlObject.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaPerlObject.java
@@ -57,11 +57,10 @@ public class InlineJavaPerlObject extends InlineJavaPerlCaller {
 
 	protected void Dispose(boolean gc) throws InlineJavaPerlException, InlineJavaException {
 		if (id != 0){
-			CallPerlSub("Inline::Java::Callback::java_finalize", new Object [] {new Integer(id), new Boolean(gc)}) ;
+			CallPerlSub("Inline::Java::Callback::java_finalize", new Object [] {Integer.valueOf(id), Boolean.valueOf(gc)}) ;
 		}
 	}
 
-
 	protected void finalize() throws Throwable {
 		try {
 			Dispose(true) ;
diff --git a/Java/sources/org/perl/inline/java/InlineJavaProtocol.java b/Java/sources/org/perl/inline/java/InlineJavaProtocol.java
index 3862ec7..949ae45 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaProtocol.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaProtocol.java
@@ -192,12 +192,12 @@ class InlineJavaProtocol {
 		String is_it_a = st.nextToken() ;
 		Class d = ijc.ValidateClass(is_it_a) ;
 
-		SetResponse(new Integer(ijc.DoesExtend(c, d))) ;
+		SetResponse(Integer.valueOf(ijc.DoesExtend(c, d))) ;
 	}
 
 
 	void ObjectCount(StringTokenizer st) throws InlineJavaException {
-		SetResponse(new Integer(ijs.ObjectCount())) ;
+		SetResponse(Integer.valueOf(ijs.ObjectCount())) ;
 	}
 
 
@@ -271,7 +271,7 @@ class InlineJavaProtocol {
 
 		if ((ijc.ClassIsArray(c))&&(method.equals("getLength"))){
 			int length = Array.getLength(o) ;
-			SetResponse(new Integer(length)) ;
+			SetResponse(Integer.valueOf(length)) ;
 		}
 		else{
 			ArrayList f = ValidateMethod(false, c, method, st) ;
@@ -374,10 +374,10 @@ class InlineJavaProtocol {
 			ret = InlineJavaHandle.makeBuffered(o) ;
 			if (ret != o){
 				int buf_id = ijs.PutObject(ret) ;
-				ret = new Integer(buf_id) ;
+				ret = Integer.valueOf(buf_id) ;
 			}
 			else {
-				ret = new Integer(id) ;
+				ret = Integer.valueOf(id) ;
 			}
 		}
 		catch (java.io.IOException e){
@@ -412,7 +412,7 @@ class InlineJavaProtocol {
 		Object ret = null ;
 		try {
 			int len = InlineJavaHandle.write(o, arg.toString()) ;
-			ret = new Integer(len) ;
+			ret = Integer.valueOf(len) ;
 		}
 		catch (java.io.IOException e){
 			ret = new InlineJavaThrown(e) ;
diff --git a/Java/sources/org/perl/inline/java/InlineJavaServer.java b/Java/sources/org/perl/inline/java/InlineJavaServer.java
index 1c62ef9..1d11a17 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaServer.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaServer.java
@@ -207,7 +207,7 @@ public class InlineJavaServer {
 			throw new InlineJavaException("Can't find thread " + Thread.currentThread().getName() + "!") ;
 		}
 		else{
-			o = h.get(new Integer(id)) ;
+			o = h.get(Integer.valueOf(id)) ;
 			if (o == null){
 				throw new InlineJavaException("Can't find object " + id + " for thread " +Thread.currentThread().getName()) ;
 			}
@@ -225,7 +225,7 @@ public class InlineJavaServer {
 			throw new InlineJavaException("Can't find thread " + Thread.currentThread().getName() + "!") ;
 		}
 		else{
-			h.put(new Integer(objid), o) ;
+			h.put(Integer.valueOf(objid), o) ;
 			objid++ ;
 		}
 
@@ -241,7 +241,7 @@ public class InlineJavaServer {
 			throw new InlineJavaException("Can't find thread " + Thread.currentThread().getName() + "!") ;
 		}
 		else{
-			o = h.remove(new Integer(id)) ;
+			o = h.remove(Integer.valueOf(id)) ;
 			if (o == null){
 				throw new InlineJavaException("Can't find object " + id + " for thread " + Thread.currentThread().getName()) ;
 			}
@@ -310,9 +310,9 @@ public class InlineJavaServer {
 		int debug = Integer.parseInt(argv[0]) ;
 		String host = argv[1] ;
 		int port = Integer.parseInt(argv[2]) ;
-		boolean shared_jvm = new Boolean(argv[3]).booleanValue() ;
-		boolean priv = new Boolean(argv[4]).booleanValue() ;
-		boolean native_doubles = new Boolean(argv[5]).booleanValue() ;
+		boolean shared_jvm = Boolean.parseBoolean(argv[3]) ;
+		boolean priv = Boolean.parseBoolean(argv[4]) ;
+		boolean native_doubles = Boolean.parseBoolean(argv[5]) ;
 
 		InlineJavaServer ijs = new InlineJavaServer(debug, host, port, shared_jvm, priv, native_doubles) ;
 		ijs.RunMainLoop() ;
diff --git a/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java b/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java
index 0f2d97a..21e83e4 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java
@@ -35,7 +35,7 @@ public class InlineJavaUserClassLink {
 	public Object create(Class p, Object args[], Class proto[]) throws NoSuchMethodException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
 		// This will allow usage of the default no-arg constructor
 		if (proto.length == 0){
-			return p.newInstance() ;
+			return p.getDeclaredConstructor().newInstance() ;
 		}
 		else{
 			Constructor con = (Constructor)p.getConstructor(proto) ;
diff --git a/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java b/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java
index 0105872..a6d7adf 100644
--- a/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java
+++ b/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java
@@ -51,7 +51,7 @@ class InlineJavaUserClassLoader extends URLClassLoader {
 			try {
 				InlineJavaUtils.debug(1, "loading InlineJavaUserClassLink via InlineJavaUserClassLoader") ;
 				Class c = Class.forName("InlineJavaUserClassLink", true, this) ;
-				link = c.newInstance() ;
+				link = c.getDeclaredConstructor().newInstance() ;
 
 				invoke = find_method(c, "invoke") ;
 				get = find_method(c, "get") ;
@@ -162,7 +162,7 @@ class InlineJavaUserClassLoader extends URLClassLoader {
 	public Object array_get(Object o, int idx) throws InlineJavaException {
 		check_link() ;
 		try {
-			return invoke_via_link(array_get, new Object [] {o, new Integer(idx)}) ;
+			return invoke_via_link(array_get, new Object [] {o, Integer.valueOf(idx)}) ;
 		}
 		catch (NoSuchMethodException me){/* Impossible */}
 		catch (InstantiationException ie){/* Impossible */}
@@ -176,7 +176,7 @@ class InlineJavaUserClassLoader extends URLClassLoader {
 	public void array_set(Object o, int idx, Object elem) throws IllegalArgumentException, InlineJavaException {
 		check_link() ;
 		try {
-			invoke_via_link(array_set, new Object [] {o, new Integer(idx), elem}) ;
+			invoke_via_link(array_set, new Object [] {o, Integer.valueOf(idx), elem}) ;
 		}
 		catch (NoSuchMethodException me){/* Impossible */}
 		catch (InstantiationException ie){/* Impossible */}
diff --git a/lib/Inline/Java/Callback.pod b/lib/Inline/Java/Callback.pod
index d361964..05b2e43 100644
--- a/lib/Inline/Java/Callback.pod
+++ b/lib/Inline/Java/Callback.pod
@@ -96,7 +96,7 @@ Calls the specified subroutine with the supplied arguments and tries
 to create an object of type 'cast' with the result.
 
    /* Example */
-   Integer sum = (Integer)CallPerlSub("main::add", new Object [] {new Integer(5), new Integer(3)}, Integer.class) ;
+   Integer sum = (Integer)CallPerlSub("main::add", new Object [] {Integer.valueOf(5), Integer.valueOf(3)}, Integer.class) ;
       
 =item public Object CallPerlStaticMethod(String pkg, String method,
 Object args[], Class cast)
@@ -107,7 +107,7 @@ notation) with the supplied arguments and tries to create an object
 of type 'cast' with the result.
 
    /* Example */
-   Integer sum = (Integer)CallPerlStaticMethod("main", "add", new Object [] {new Integer(5), new Integer(3)}, Integer.class) ;
+   Integer sum = (Integer)CallPerlStaticMethod("main", "add", new Object [] {Integer.valueOf(5), Integer.valueOf(3)}, Integer.class) ;
 
 =item public Object eval(String code, Class cast) 
 throws InlineJavaPerlException, InlineJavaException
diff --git a/t/03_objects.t b/t/03_objects.t
index efd6085..63ab246 100644
--- a/t/03_objects.t
+++ b/t/03_objects.t
@@ -147,6 +147,6 @@ class types3 {
 	}
 
 	public Object _olong(){
-		return new Long("12345") ;
+		return Long.valueOf("12345") ;
 	}
 }
diff --git a/t/12_1_callbacks.t b/t/12_1_callbacks.t
index 13850c3..29617c3 100755
--- a/t/12_1_callbacks.t
+++ b/t/12_1_callbacks.t
@@ -289,9 +289,9 @@ class t15 extends InlineJavaPerlCaller {
 
 	public int add_via_perl(int a, int b) throws InlineJavaException, InlineJavaPerlException {
 		String val = (String)CallPerlSub("main::add", 
-			new Object [] {new Integer(a), new Integer(b)}) ;
+			new Object [] {Integer.valueOf(a), Integer.valueOf(b)}) ;
 
-		return new Integer(val).intValue() ;
+		return Integer.valueOf(val).intValue() ;
 	}
 
 	public int [] incr_via_perl(int a[]) throws InlineJavaException, InlineJavaPerlException {
@@ -319,24 +319,24 @@ class t15 extends InlineJavaPerlCaller {
 
 	public int mul_via_perl(int a, int b) throws InlineJavaException, InlineJavaPerlException {
 		String val = (String)CallPerlSub("main::mul", 
-			new Object [] {new Integer(a), new Integer(b)}) ;
+			new Object [] {Integer.valueOf(a), Integer.valueOf(b)}) ;
 
-		return new Integer(val).intValue() ;
+		return Integer.parseInt(val) ;
 	}
 
 	public int add_via_perl_via_java(int a, int b) throws InlineJavaException, InlineJavaPerlException {
 		String val = (String)CallPerlSub("main::add_via_java", 
-			new Object [] {new Integer(a), new Integer(b)}) ;
+			new Object [] {Integer.valueOf(a), Integer.valueOf(b)}) ;
 
-		return new Integer(val).intValue() ;
+		return Integer.parseInt(val);
 	}
 
 	static public int add_via_perl_via_java_t(t15 t, int a, int b) throws InlineJavaException, InlineJavaPerlException {
 		InlineJavaPerlCaller c = new InlineJavaPerlCaller() ;
 		String val = (String)c.CallPerlSub("main::add_via_java_t", 
-			new Object [] {t, new Integer(a), new Integer(b)}) ;
+			new Object [] {t, Integer.valueOf(a), Integer.valueOf(b)}) ;
 
-		return new Integer(val).intValue() ;
+		return Integer.parseInt(val);
 	}
 
 
@@ -344,8 +344,8 @@ class t15 extends InlineJavaPerlCaller {
 		int ret = 0 ;
 		for (int i = 0 ; i < b ; i++){
 			String val = (String)CallPerlSub("add_via_java", 
-				new Object [] {new Integer(ret), new Integer(a)}) ;
-			ret = new Integer(val).intValue() ;
+				new Object [] {Integer.valueOf(ret), Integer.valueOf(a)}) ;
+			ret = Integer.parseInt(val);
 		}
 		return ret ;
 	}
@@ -369,7 +369,7 @@ class t15 extends InlineJavaPerlCaller {
 		}
 		else{
 			return (String)CallPerlSub("twister", 
-				new Object [] {new Integer(max), new Integer(cnt+1), new Integer(explode)}) ;
+				new Object [] {Integer.valueOf(max), Integer.valueOf(cnt+1), Integer.valueOf(explode)}) ;
 		}
 	}