Replace deprecated Class#newInstance calls

matthiasblaesing · matthiasblaesing · commit 80847e476e7e · 2018-10-31T22:53:28.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -14,6 +14,7 @@ Bug Fixes
 ---------
 * [#1025](https://github.com/java-native-access/jna/issues/1025): Restore java 6 compatibility and introduce animal-sniffer to prevent regressions - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#1027](https://github.com/java-native-access/jna/issues/1027): Fix Linux LibC.Sysinfo FieldOrder - [@dbwiddis](https://github.com/dbwiddis).
+* [#1033](https://github.com/java-native-access/jna/pull/1033): Replace deprecated Class#newInstance calls
 
 Release 5.0.0
 =============
diff --git a/contrib/platform/test/com/sun/jna/platform/win32/WinspoolTest.java b/contrib/platform/test/com/sun/jna/platform/win32/WinspoolTest.java
@@ -118,7 +118,7 @@ public void testCorrectDeclarationOfMembers() throws InstantiationException, Ill
             if(Structure.class.isAssignableFrom(klass)) {
                 boolean writeWorked = false;
                 try {
-                    Structure struct = (Structure) klass.newInstance();
+                    Structure struct = Structure.newInstance((Class<? extends Structure>) klass);
                     struct.write();
                     writeWorked = true;
                 } catch (java.lang.Throwable ex) {
diff --git a/src/com/sun/jna/IntegerType.java b/src/com/sun/jna/IntegerType.java
@@ -24,6 +24,8 @@
 
 package com.sun.jna;
 
+import java.lang.reflect.InvocationTargetException;
+
 /**
  * Represents a native integer value, which may have a platform-specific size
  * (e.g. <code>long</code> on unix-based platforms).
@@ -117,17 +119,37 @@ public Object fromNative(Object nativeValue, FromNativeContext context) {
         long value = nativeValue == null
             ? 0 : ((Number) nativeValue).longValue();
         try {
-            IntegerType number = getClass().newInstance();
+            IntegerType number = getClass().getDeclaredConstructor().newInstance();
             number.setValue(value);
             return number;
-        }
-        catch (InstantiationException e) {
-            throw new IllegalArgumentException("Can't instantiate "
-                    + getClass());
-        }
-        catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Not allowed to instantiate "
-                    + getClass());
+        } catch (IllegalAccessException e) {
+            String msg = "Can't create an instance of " + getClass()
+                + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (IllegalArgumentException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (InstantiationException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (NoSuchMethodException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (SecurityException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (InvocationTargetException e) {
+            if(e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            } else {
+                String msg = "Can't create an instance of " + getClass()
+                        + ", requires a public no-arg constructor: " + e;
+                throw new IllegalArgumentException(msg, e);
+            }
         }
     }
 
diff --git a/src/com/sun/jna/NativeMappedConverter.java b/src/com/sun/jna/NativeMappedConverter.java
@@ -25,6 +25,7 @@
 
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 import java.util.WeakHashMap;
 
@@ -62,15 +63,37 @@ public NativeMapped defaultValue() {
         }
 
         try {
-            return (NativeMapped)type.newInstance();
+            return (NativeMapped)type
+                    .getDeclaredConstructor()
+                    .newInstance();
+        } catch (IllegalAccessException e) {
+            String msg = "Can't create an instance of " + type
+                + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (IllegalArgumentException e) {
+            String msg = "Can't create an instance of " + type
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
         } catch (InstantiationException e) {
             String msg = "Can't create an instance of " + type
-                + ", requires a no-arg constructor: " + e;
-            throw new IllegalArgumentException(msg);
-        } catch (IllegalAccessException e) {
-            String msg = "Not allowed to create an instance of " + type
-                + ", requires a public, no-arg constructor: " + e;
-            throw new IllegalArgumentException(msg);
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (NoSuchMethodException e) {
+            String msg = "Can't create an instance of " + type
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (SecurityException e) {
+            String msg = "Can't create an instance of " + type
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (InvocationTargetException e) {
+            if(e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            } else {
+                String msg = "Can't create an instance of " + type
+                        + ", requires a public no-arg constructor: " + e;
+                throw new IllegalArgumentException(msg, e);
+            }
         }
     }
     @Override
diff --git a/src/com/sun/jna/PointerType.java b/src/com/sun/jna/PointerType.java
@@ -23,6 +23,8 @@
  */
 package com.sun.jna;
 
+import java.lang.reflect.InvocationTargetException;
+
 /** Type representing a type-safe native pointer.
  * Derived classes may override the {@link NativeMapped#fromNative} method,
  * which should instantiate a new object (or look up an existing one)
@@ -79,15 +81,37 @@ public Object fromNative(Object nativeValue, FromNativeContext context) {
             return null;
         }
         try {
-            PointerType pt = getClass().newInstance();
+            PointerType pt = getClass().getDeclaredConstructor().newInstance();
             pt.pointer = (Pointer)nativeValue;
             return pt;
-        }
-        catch (InstantiationException e) {
-            throw new IllegalArgumentException("Can't instantiate " + getClass());
-        }
-        catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Not allowed to instantiate " + getClass());
+        } catch (IllegalAccessException e) {
+            String msg = "Can't create an instance of " + getClass()
+                + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (IllegalArgumentException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (InstantiationException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (NoSuchMethodException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (SecurityException e) {
+            String msg = "Can't create an instance of " + getClass()
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (InvocationTargetException e) {
+            if(e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            } else {
+                String msg = "Can't create an instance of " + getClass()
+                        + ", requires a public no-arg constructor: " + e;
+                throw new IllegalArgumentException(msg, e);
+            }
         }
     }
 
diff --git a/src/com/sun/jna/Structure.java b/src/com/sun/jna/Structure.java
@@ -1871,20 +1871,40 @@ public static <T extends Structure> T newInstance(Class<T> type, Pointer init) t
      */
     public static <T extends Structure> T newInstance(Class<T> type) throws IllegalArgumentException {
         try {
-            T s = type.newInstance();
+            Constructor<T> constructor = type.getDeclaredConstructor();
+            T s = constructor.newInstance();
             if (s instanceof ByValue) {
                 s.allocateMemory();
             }
             return s;
-        }
-        catch(InstantiationException e) {
-            String msg = "Can't instantiate " + type;
+       } catch (IllegalAccessException e) {
+            String msg = "Can't create an instance of " + type
+                + ", requires a public no-arg constructor: " + e;
             throw new IllegalArgumentException(msg, e);
-        }
-        catch(IllegalAccessException e) {
-            String msg = "Instantiation of " + type
-                + " not allowed, is it public?";
+        } catch (IllegalArgumentException e) {
+            String msg = "Can't create an instance of " + type
+                    + ", requires a public no-arg constructor: " + e;
             throw new IllegalArgumentException(msg, e);
+        } catch (InstantiationException e) {
+            String msg = "Can't create an instance of " + type
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (NoSuchMethodException e) {
+            String msg = "Can't create an instance of " + type
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (SecurityException e) {
+            String msg = "Can't create an instance of " + type
+                    + ", requires a public no-arg constructor: " + e;
+            throw new IllegalArgumentException(msg, e);
+        } catch (InvocationTargetException e) {
+            if(e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            } else {
+                String msg = "Can't create an instance of " + type
+                        + ", requires a public no-arg constructor: " + e;
+                throw new IllegalArgumentException(msg, e);
+            }
         }
     }
 
diff --git a/test/com/sun/jna/StructureTest.java b/test/com/sun/jna/StructureTest.java
@@ -390,7 +390,7 @@ private void testAlignStruct(String prefix,int index) {
             IntByReference offset = new IntByReference();
             LongByReference value = new LongByReference();
             Class<?> cls = Class.forName(getClass().getName() + "$" + prefix + "TestStructure" + index);
-            Structure s = (Structure)cls.newInstance();
+            Structure s = Structure.newInstance((Class<? extends Structure>) cls);
             int result = lib.testStructureAlignment(s, index, offset, value);
             assertEquals("Wrong native value at field " + result
                          + "=0x" + Long.toHexString(value.getValue())
diff --git a/test/com/sun/jna/WebStartTest.java b/test/com/sun/jna/WebStartTest.java
@@ -417,7 +417,7 @@ private static void sendResults(Throwable t, int port) throws IOException {
     }
 
     private static Throwable runTestCaseTest(String testClass, String method, int port) throws Exception {
-        TestCase test = (TestCase)Class.forName(testClass).newInstance();
+        TestCase test = (TestCase)Class.forName(testClass).getConstructor().newInstance();
         test.setName(method);
         TestResult result = new TestResult();
         test.run(result);

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ private static void sendResults(Throwable t, int port) throws IOException {`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`private static Throwable runTestCaseTest(String testClass, String method, int port) throws Exception {`
`420`		`- TestCase test = (TestCase)Class.forName(testClass).newInstance();`
	`420`	`+ TestCase test = (TestCase)Class.forName(testClass).getConstructor().newInstance();`
`421`	`421`	`test.setName(method);`
`422`	`422`	`TestResult result = new TestResult();`
`423`	`423`	`test.run(result);`