tiagomlalves commented on code in PR #3931:
URL: https://github.com/apache/cassandra/pull/3931#discussion_r1983137065
##########
src/java/org/apache/cassandra/config/ParameterizedClass.java:
##########
@@ -74,32 +77,53 @@ static public <K> K newInstance(ParameterizedClass
parameterizedClass, List<Stri
if (!searchPackage.isEmpty() && !searchPackage.endsWith("."))
searchPackage = searchPackage + '.';
String name = searchPackage + parameterizedClass.class_name;
- Class<?> providerClass = Class.forName(name);
- try
- {
- Constructor<?> constructor =
providerClass.getConstructor(Map.class);
- K instance = (K)
constructor.newInstance(parameterizedClass.parameters);
- return instance;
- }
- catch (Exception constructorEx)
- {
- //no-op
- }
- // fallback to no arg constructor if no params present
- if (parameterizedClass.parameters == null ||
parameterizedClass.parameters.isEmpty())
- {
- Constructor<?> constructor =
providerClass.getConstructor();
- K instance = (K) constructor.newInstance();
- return instance;
- }
+ providerClass = Class.forName(name);
}
- // there are about 5 checked exceptions that could be thrown here.
- catch (Exception e)
+ catch (ClassNotFoundException e)
{
- last = e;
+ //no-op
}
}
- throw new ConfigurationException("Unable to create parameterized class
" + parameterizedClass.class_name, last);
+
+ if (providerClass == null)
+ {
+ String error = "Unable to find class " +
parameterizedClass.class_name + " in packages [" +
+ searchPackages.stream().map(p -> '"' + p +
'"').collect(Collectors.joining(",")) + ']';
+ throw new ConfigurationException(error);
+ }
+
+ try
+ {
+ Constructor<?>[] declaredConstructors =
providerClass.getDeclaredConstructors();
+
+ Constructor mapConstructor = Arrays.stream(declaredConstructors)
+ .filter(c -> c.getParameterTypes().length == 1 &&
c.getParameterTypes()[0].equals(Map.class))
+ .findFirst().orElse(null);
+ if (mapConstructor != null)
+ return (K)
mapConstructor.newInstance(parameterizedClass.parameters);
+
+ // Falls-back to no-arg constructor if no parameters are present
+ if (parameterizedClass.parameters == null ||
parameterizedClass.parameters.isEmpty())
+ {
+ Constructor emptyConstructor =
Arrays.stream(declaredConstructors)
+ .filter(c -> c.getParameterTypes().length == 0)
+ .findFirst().orElse(null);
+ if (emptyConstructor != null)
+ return (K) emptyConstructor.newInstance();
+ }
+
+ throw new ConfigurationException("No valid constructor found for
class " + parameterizedClass.class_name);
+ }
+ catch
(IllegalAccessException|InstantiationException|ExceptionInInitializerError e)
Review Comment:
fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org
For additional commands, e-mail: pr-h...@cassandra.apache.org
