Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved DefaultFactory#create(Class<T>) #1499

Merged
merged 3 commits into from
Dec 15, 2021
Merged

Improved DefaultFactory#create(Class<T>) #1499

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0911ac5
DefaultFactory#create(Class<T>):
rgoldberg Nov 30, 2021
4872dbd
DefaultFactory#create(Class<T>):
rgoldberg Nov 30, 2021
e43ccf0
DefaultFactory#create(Class<T>):
rgoldberg Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 26 additions & 20 deletions src/main/java/picocli/CommandLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.net.URL;
import java.nio.ByteOrder;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.text.BreakIterator;
import java.text.ParseException;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -5484,34 +5483,41 @@ public <T> T create(Class<T> cls) throws Exception {
Callable<?> callable = Callable.class.cast(cls.getConstructor(Object.class, Object.class).newInstance(null, null));
try { return (T) callable.call(); }
catch (Exception ex) { throw new InitializationException("Error in Groovy closure: " + ex); }

}
if (cls.isInterface() && Collection.class.isAssignableFrom(cls)) {
if (List.class.isAssignableFrom(cls)) {
return cls.cast(new ArrayList<Object>());
} else if (SortedSet.class.isAssignableFrom(cls)) {
return cls.cast(new TreeSet<Object>());
} else if (Set.class.isAssignableFrom(cls)) {
return cls.cast(new LinkedHashSet<Object>());
} else if (Queue.class.isAssignableFrom(cls)) {
return cls.cast(new LinkedList<Object>()); // ArrayDeque is only available since 1.6
if (cls.isInterface()) {
if (Collection.class.isAssignableFrom(cls)) {
if (List.class.isAssignableFrom(cls)) {
return cls.cast(new ArrayList<Object>());
} else if (SortedSet.class.isAssignableFrom(cls)) {
return cls.cast(new TreeSet<Object>());
} else if (Set.class.isAssignableFrom(cls)) {
return cls.cast(new LinkedHashSet<Object>());
} else if (Queue.class.isAssignableFrom(cls)) {
return cls.cast(new LinkedList<Object>()); // ArrayDeque is only available since 1.6
} else {
return cls.cast(new ArrayList<Object>());
}
}
if (SortedMap.class.isAssignableFrom(cls)) {
return cls.cast(new TreeMap<Object, Object>());
}
if (Map.class.isAssignableFrom(cls)) {
return cls.cast(new LinkedHashMap<Object, Object>());
}
return cls.cast(new ArrayList<Object>());
}
if (Map.class.isAssignableFrom(cls)) {
try { // if it is an implementation class, instantiate it
return cls.cast(cls.getDeclaredConstructor().newInstance());
} catch (Exception ignored) { }
return cls.cast(new LinkedHashMap<Object, Object>());
}
try {
@SuppressWarnings("deprecation") // Class.newInstance is deprecated in Java 9
T result = cls.newInstance();
rgoldberg marked this conversation as resolved.
Show resolved Hide resolved
return result;
rgoldberg marked this conversation as resolved.
Show resolved Hide resolved
} catch (Exception ex) {
// TODO log the error at debug level
Constructor<T> constructor = cls.getDeclaredConstructor();
constructor.setAccessible(true);
return constructor.newInstance();
try {
return constructor.newInstance();
} catch (IllegalAccessException iaex) {
constructor.setAccessible(true);
return constructor.newInstance();
}
}
}
private static ITypeConverter<?>[] createConverter(IFactory factory, Class<? extends ITypeConverter<?>>[] classes) {
Expand Down