Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

477757 - Null args in TypeUtil .call & .construct result in confusing exceptions 

+ Not allowing null class references
+ Allowing null argument lists
This commit is contained in:
Joakim Erdfelt 2015-09-17 17:04:50 -07:00
parent 014d021618
commit d39677a635
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
View File

@ -29,6 +29,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import org.eclipse.jetty.util.annotation.Name; import org.eclipse.jetty.util.annotation.Name;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
@ -498,6 +499,13 @@ public class TypeUtil
public static Object call(Class<?> oClass, String methodName, Object obj, Object[] arg) public static Object call(Class<?> oClass, String methodName, Object obj, Object[] arg)
throws InvocationTargetException, NoSuchMethodException throws InvocationTargetException, NoSuchMethodException
{ {
Objects.requireNonNull(oClass,"Class cannot be null");
Objects.requireNonNull(methodName,"Method name cannot be null");
if (StringUtil.isBlank(methodName))
{
throw new IllegalArgumentException("Method name cannot be blank");
}
// Lets just try all methods for now // Lets just try all methods for now
for (Method method : oClass.getMethods()) for (Method method : oClass.getMethods())
{ {
@ -554,9 +562,17 @@ public class TypeUtil
public static Object construct(Class<?> klass, Object[] arguments) throws InvocationTargetException, NoSuchMethodException public static Object construct(Class<?> klass, Object[] arguments) throws InvocationTargetException, NoSuchMethodException
{ {
Objects.requireNonNull(klass,"Class cannot be null");
for (Constructor<?> constructor : klass.getConstructors()) for (Constructor<?> constructor : klass.getConstructors())
{ {
if (constructor.getParameterTypes().length != arguments.length) if (arguments == null)
{
// null arguments in .newInstance() is allowed
if (constructor.getParameterTypes().length != 0)
continue;
}
else if (constructor.getParameterTypes().length != arguments.length)
continue; continue;
try try
@ -573,20 +589,34 @@ public class TypeUtil
public static Object construct(Class<?> klass, Object[] arguments, Map<String, Object> namedArgMap) throws InvocationTargetException, NoSuchMethodException public static Object construct(Class<?> klass, Object[] arguments, Map<String, Object> namedArgMap) throws InvocationTargetException, NoSuchMethodException
{ {
Objects.requireNonNull(klass,"Class cannot be null");
Objects.requireNonNull(namedArgMap,"Named Argument Map cannot be null");
for (Constructor<?> constructor : klass.getConstructors()) for (Constructor<?> constructor : klass.getConstructors())
{ {
if (constructor.getParameterTypes().length != arguments.length) if (arguments == null)
{
// null arguments in .newInstance() is allowed
if (constructor.getParameterTypes().length != 0)
continue;
}
else if (constructor.getParameterTypes().length != arguments.length)
continue; continue;
try try
{ {
Annotation[][] parameterAnnotations = constructor.getParameterAnnotations(); Annotation[][] parameterAnnotations = constructor.getParameterAnnotations();
// target has no annotations if (arguments == null || arguments.length == 0)
if ( parameterAnnotations == null || parameterAnnotations.length == 0 )
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Target has no parameter annotations"); LOG.debug("Constructor has no arguments");
return constructor.newInstance(arguments);
}
else if (parameterAnnotations == null || parameterAnnotations.length == 0)
{
if (LOG.isDebugEnabled())
LOG.debug("Constructor has no parameter annotations");
return constructor.newInstance(arguments); return constructor.newInstance(arguments);
} }
else else