Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

param parsers can accept nullable params

This commit is contained in:
Adrian Cole 2012-09-16 14:56:57 -07:00
parent fdf5ff403f
commit d9c71923a6
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
View File

@ -1205,17 +1205,26 @@ public class RestAnnotationProcessor<T> {
protected Optional<?> getParamValue(Method method, Object[] args, Set<Annotation> extractors, protected Optional<?> getParamValue(Method method, Object[] args, Set<Annotation> extractors,
Entry<Integer, Set<Annotation>> entry, String paramKey) { Entry<Integer, Set<Annotation>> entry, String paramKey) {
Object arg = args[entry.getKey()]; Integer argIndex = entry.getKey();
if (arg == null && containsNullable(method.getParameterAnnotations()[entry.getKey()])) Object arg = args[argIndex];
return Optional.absent(); if (extractors != null && extractors.size() > 0 && checkPresentOrNullable(method, paramKey, argIndex, arg)) {
checkNotNull(arg, "param{%s} for method %s.%s", paramKey, method.getDeclaringClass().getSimpleName(),
method.getName());
if (extractors != null && extractors.size() > 0) {
ParamParser extractor = (ParamParser) extractors.iterator().next(); ParamParser extractor = (ParamParser) extractors.iterator().next();
return Optional.of(injector.getInstance(extractor.value()).apply(arg)); // ParamParsers can deal with nullable parameters
arg = injector.getInstance(extractor.value()).apply(arg);
} }
return Optional.of(arg); checkPresentOrNullable(method, paramKey, argIndex, arg);
return Optional.fromNullable(arg);
}
private static boolean checkPresentOrNullable(Method method, String paramKey, Integer argIndex, Object arg) {
if (arg == null && !argNullable(method, argIndex))
throw new NullPointerException(String.format("param{%s} for method %s.%s", paramKey, method
.getDeclaringClass().getSimpleName(), method.getName()));
return true;
}
private static boolean argNullable(Method method, Integer argIndex) {
return containsNullable(method.getParameterAnnotations()[argIndex]);
} }
private static final Predicate<Annotation> NULLABLE = new Predicate<Annotation>() { private static final Predicate<Annotation> NULLABLE = new Predicate<Annotation>() {