DefaultFactory#create(Class<T>):

Reinstated use of `Class#newInstance()` instead of `Constructor#newInstance()`. Only use `Constructor#setAccessible(true)` if `IllegalAccessException` thrown.
remkop · Dec 15, 2021 · 2c6747e · 2c6747e
1 parent 4e06c96
commit 2c6747e
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -5505,12 +5505,19 @@ public <T> T create(Class<T> cls) throws Exception {
                     return cls.cast(new LinkedHashMap<Object, Object>());
                 }
             }
-            Constructor<T> constructor = cls.getDeclaredConstructor();
             try {
-                return constructor.newInstance();
-            } catch (IllegalAccessException ex) {
-                constructor.setAccessible(true);
-                return constructor.newInstance();
+                @SuppressWarnings("deprecation") // Class.newInstance is deprecated in Java 9
+                T result = cls.newInstance();
+                return result;
+            } catch (Exception ex) {
+                // TODO log the error at debug level
+                Constructor<T> constructor = cls.getDeclaredConstructor();
+                try {
+                    return constructor.newInstance();
+                } catch (IllegalAccessException iaex) {
+                    constructor.setAccessible(true);
+                    return constructor.newInstance();
+                }
             }
         }
         private static ITypeConverter<?>[] createConverter(IFactory factory, Class<? extends ITypeConverter<?>>[] classes) {