Remove usages of deprecated (in Java 9 and above) Class#newInstance (…

…#558)
jenkinsci · Jun 13, 2024 · 6b249de · 6b249de
1 parent 16643b7
commit 6b249de
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 8 deletions.
diff --git a/core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java b/core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java
@@ -24,6 +24,7 @@
 package org.kohsuke.stapler;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
 import javax.servlet.ServletException;
 import org.apache.commons.beanutils.Converter;
 
@@ -82,8 +83,11 @@ protected AnnotationHandler computeValue(Class<?> at) {
             InjectedParameter ip = at.getAnnotation(InjectedParameter.class);
             if (ip != null) {
                 try {
-                    return ip.value().newInstance();
-                } catch (InstantiationException | IllegalAccessException e) {
+                    return ip.value().getDeclaredConstructor().newInstance();
+                } catch (NoSuchMethodException
+                        | InstantiationException
+                        | IllegalAccessException
+                        | InvocationTargetException e) {
                     throw new RuntimeException("Failed to instantiate parameter injector for " + at, e);
                 }
             } else {

diff --git a/core/src/main/java/org/kohsuke/stapler/Facet.java b/core/src/main/java/org/kohsuke/stapler/Facet.java
@@ -27,6 +27,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -103,8 +104,11 @@ public static <T> List<T> discoverExtensions(Class<T> type, ClassLoader... cls)
                     continue;
                 }
                 try {
-                    r.add(c.newInstance());
-                } catch (InstantiationException | IllegalAccessException e) {
+                    r.add(c.getDeclaredConstructor().newInstance());
+                } catch (NoSuchMethodException
+                        | InstantiationException
+                        | IllegalAccessException
+                        | InvocationTargetException e) {
                     LOGGER.log(Level.WARNING, "Failed to instantiate " + c, e);
                 }
             }

diff --git a/core/src/main/java/org/kohsuke/stapler/Function.java b/core/src/main/java/org/kohsuke/stapler/Function.java
@@ -24,6 +24,7 @@
 package org.kohsuke.stapler;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.WrongMethodTypeException;
@@ -285,7 +286,7 @@ final Function wrapByInterceptors(AnnotatedElement m) {
                 final InterceptorAnnotation ia = a.annotationType().getAnnotation(InterceptorAnnotation.class);
                 if (ia != null) {
                     try {
-                        Interceptor i = ia.value().newInstance();
+                        Interceptor i = ia.value().getDeclaredConstructor().newInstance();
                         switch (ia.stage()) {
                             case SELECTION:
                                 f = new SelectionInterceptedFunction(f, i);
@@ -296,6 +297,10 @@ final Function wrapByInterceptors(AnnotatedElement m) {
                             default:
                                 throw new IllegalArgumentException("Unknown Stage: " + ia.stage());
                         }
+                    } catch (NoSuchMethodException e) {
+                        throw (Error)
+                                new NoSuchMethodError("Failed to instantiate interceptor for " + f.getDisplayName())
+                                        .initCause(e);
                     } catch (InstantiationException e) {
                         throw (Error)
                                 new InstantiationError("Failed to instantiate interceptor for " + f.getDisplayName())
@@ -304,6 +309,19 @@ final Function wrapByInterceptors(AnnotatedElement m) {
                         throw (Error)
                                 new IllegalAccessError("Failed to instantiate interceptor for " + f.getDisplayName())
                                         .initCause(e);
+                    } catch (InvocationTargetException e) {
+                        Throwable t = e.getCause();
+                        if (t instanceof RuntimeException) {
+                            throw (RuntimeException) t;
+                        } else if (t instanceof IOException) {
+                            throw new UncheckedIOException((IOException) t);
+                        } else if (t instanceof Exception) {
+                            throw new RuntimeException(t);
+                        } else if (t instanceof Error) {
+                            throw (Error) t;
+                        } else {
+                            throw new Error(e);
+                        }
                     }
                 }
             }

diff --git a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
@@ -521,7 +521,7 @@ public <T> List<T> bindParametersToList(Class<T> type, String prefix) {
             // no designated data binding constructor. use reflection
             try {
                 for (int i = 0; i < len; i++) {
-                    T t = type.newInstance();
+                    T t = type.getDeclaredConstructor().newInstance();
                     r.add(t);
 
                     e = getParameterNames();
@@ -532,10 +532,25 @@ public <T> List<T> bindParametersToList(Class<T> type, String prefix) {
                         }
                     }
                 }
+            } catch (NoSuchMethodException x) {
+                throw new NoSuchMethodError(x.getMessage());
             } catch (InstantiationException x) {
                 throw new InstantiationError(x.getMessage());
             } catch (IllegalAccessException x) {
                 throw new IllegalAccessError(x.getMessage());
+            } catch (InvocationTargetException x) {
+                Throwable t = x.getCause();
+                if (t instanceof RuntimeException) {
+                    throw (RuntimeException) t;
+                } else if (t instanceof IOException) {
+                    throw new UncheckedIOException((IOException) t);
+                } else if (t instanceof Exception) {
+                    throw new RuntimeException(t);
+                } else if (t instanceof Error) {
+                    throw (Error) t;
+                } else {
+                    throw new Error(x);
+                }
             }
         }
 

diff --git a/core/src/main/java/org/kohsuke/stapler/Stapler.java b/core/src/main/java/org/kohsuke/stapler/Stapler.java
@@ -31,6 +31,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.JarURLConnection;
 import java.net.MalformedURLException;
@@ -1188,7 +1189,7 @@ public static Converter lookupConverter(Class type) {
                 return null;
             }
             Class<?> cl = type.getClassLoader().loadClass(type.getName() + "$StaplerConverterImpl");
-            c = (Converter) cl.newInstance();
+            c = (Converter) cl.getDeclaredConstructor().newInstance();
             CONVERT_UTILS.register(c, type);
             return c;
         } catch (ClassNotFoundException e) {
@@ -1197,10 +1198,27 @@ public static Converter lookupConverter(Class type) {
             IllegalAccessError x = new IllegalAccessError();
             x.initCause(e);
             throw x;
+        } catch (NoSuchMethodException e) {
+            NoSuchMethodError x = new NoSuchMethodError();
+            x.initCause(e);
+            throw x;
         } catch (InstantiationException e) {
             InstantiationError x = new InstantiationError();
             x.initCause(e);
             throw x;
+        } catch (InvocationTargetException e) {
+            Throwable t = e.getCause();
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else if (t instanceof IOException) {
+                throw new UncheckedIOException((IOException) t);
+            } else if (t instanceof Exception) {
+                throw new RuntimeException(t);
+            } else if (t instanceof Error) {
+                throw (Error) t;
+            } else {
+                throw new Error(e);
+            }
         }
 
         // bean utils doesn't check the super type, so converters that apply to multiple types

diff --git a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java
@@ -86,7 +86,8 @@ public final class JellyBuilder extends GroovyObjectSupport {
         @Override
         protected GroovyClosureScript computeValue(Class<?> type) {
             try {
-                GroovyClosureScript o = (GroovyClosureScript) type.newInstance();
+                GroovyClosureScript o =
+                        (GroovyClosureScript) type.getDeclaredConstructor().newInstance();
                 o.setDelegate(JellyBuilder.this);
                 adjunct(type.getName());
                 return o;