- * Default is an - * {@link org.springframework.core.LocalVariableTableParameterNameDiscoverer} - * instance. + * Set the ParameterNameDiscoverer for resolving parameter names when needed + * (e.g. default request attribute name). + *
Default is a {@link org.springframework.core.DefaultParameterNameDiscoverer}. */ public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer) { this.parameterNameDiscoverer = parameterNameDiscoverer; } + /** * Invoke the method with the given message. - * - * @exception Exception raised if no suitable argument resolver can be found, or the - * method raised an exception + * @throws Exception raised if no suitable argument resolver can be found, + * or the method raised an exception */ public final Object invoke(Message message, Object... providedArgs) throws Exception { - Object[] args = getMethodArgumentValues(message, providedArgs); - if (logger.isTraceEnabled()) { StringBuilder sb = new StringBuilder("Invoking ["); sb.append(this.getBeanType().getSimpleName()).append("."); - sb.append(this.getMethod().getName()).append("] method with arguments "); + sb.append(getMethod().getName()).append("] method with arguments "); sb.append(Arrays.asList(args)); logger.trace(sb.toString()); } - Object returnValue = invoke(args); - if (logger.isTraceEnabled()) { - logger.trace("Method returned [" + returnValue + "]"); + logger.trace("Method [" + getMethod().getName() + "] returned [" + returnValue + "]"); } - return returnValue; } @@ -124,31 +113,28 @@ public class InvocableHandlerMethod extends HandlerMethod { * Get the method argument values for the current request. */ private Object[] getMethodArgumentValues(Message message, Object... providedArgs) throws Exception { - MethodParameter[] parameters = getMethodParameters(); Object[] args = new Object[parameters.length]; for (int i = 0; i < parameters.length; i++) { MethodParameter parameter = parameters[i]; parameter.initParameterNameDiscovery(parameterNameDiscoverer); GenericTypeResolver.resolveParameterType(parameter, getBean().getClass()); - args[i] = resolveProvidedArgument(parameter, providedArgs); if (args[i] != null) { continue; } - if (this.argumentResolvers.supportsParameter(parameter)) { try { args[i] = this.argumentResolvers.resolveArgument(parameter, message); continue; - } catch (Exception ex) { + } + catch (Exception ex) { if (logger.isTraceEnabled()) { logger.trace(getArgumentResolutionErrorMessage("Error resolving argument", i), ex); } throw ex; } } - if (args[i] == null) { String msg = getArgumentResolutionErrorMessage("No suitable resolver for argument", i); throw new IllegalStateException(msg); diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java index c7de90b22f..4942bf0922 100644 --- a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java +++ b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,19 +69,19 @@ public class InvocableHandlerMethod extends HandlerMethod { } /** - * Constructs a new handler method with the given bean instance, method name and parameters. + * Construct a new handler method with the given bean instance, method name and parameters. * @param bean the object bean * @param methodName the method name * @param parameterTypes the method parameter types * @throws NoSuchMethodException when the method cannot be found */ - public InvocableHandlerMethod( - Object bean, String methodName, Class... parameterTypes) throws NoSuchMethodException { + public InvocableHandlerMethod(Object bean, String methodName, Class... parameterTypes) throws NoSuchMethodException { super(bean, methodName, parameterTypes); } + /** - * Sets the {@link WebDataBinderFactory} to be passed to argument resolvers allowing them to create + * Set the {@link WebDataBinderFactory} to be passed to argument resolvers allowing them to create * a {@link WebDataBinder} for data binding and type conversion purposes. * @param dataBinderFactory the data binder factory. */ @@ -105,71 +105,65 @@ public class InvocableHandlerMethod extends HandlerMethod { this.parameterNameDiscoverer = parameterNameDiscoverer; } + /** * Invoke the method after resolving its argument values in the context of the given request.
Argument * values are commonly resolved through {@link HandlerMethodArgumentResolver}s. The {@code provideArgs} * parameter however may supply argument values to be used directly, i.e. without argument resolution. * Examples of provided argument values include a {@link WebDataBinder}, a {@link SessionStatus}, or * a thrown exception instance. Provided argument values are checked before argument resolvers. - * * @param request the current request * @param mavContainer the ModelAndViewContainer for this request * @param providedArgs "given" arguments matched by type, not resolved * @return the raw value returned by the invoked method * @exception Exception raised if no suitable argument resolver can be found, or the method raised an exception */ - public final Object invokeForRequest(NativeWebRequest request, - ModelAndViewContainer mavContainer, - Object... providedArgs) throws Exception { + public final Object invokeForRequest(NativeWebRequest request, ModelAndViewContainer mavContainer, + Object... providedArgs) throws Exception { + Object[] args = getMethodArgumentValues(request, mavContainer, providedArgs); - if (logger.isTraceEnabled()) { - StringBuilder builder = new StringBuilder("Invoking ["); - builder.append(this.getMethod().getName()).append("] method with arguments "); - builder.append(Arrays.asList(args)); - logger.trace(builder.toString()); + StringBuilder sb = new StringBuilder("Invoking ["); + sb.append(this.getBeanType().getSimpleName()).append("."); + sb.append(getMethod().getName()).append("] method with arguments "); + sb.append(Arrays.asList(args)); + logger.trace(sb.toString()); } - Object returnValue = invoke(args); - if (logger.isTraceEnabled()) { - logger.trace("Method [" + this.getMethod().getName() + "] returned [" + returnValue + "]"); + logger.trace("Method [" + getMethod().getName() + "] returned [" + returnValue + "]"); } - return returnValue; } /** * Get the method argument values for the current request. */ - private Object[] getMethodArgumentValues( - NativeWebRequest request, ModelAndViewContainer mavContainer, + private Object[] getMethodArgumentValues(NativeWebRequest request, ModelAndViewContainer mavContainer, Object... providedArgs) throws Exception { MethodParameter[] parameters = getMethodParameters(); Object[] args = new Object[parameters.length]; for (int i = 0; i < parameters.length; i++) { MethodParameter parameter = parameters[i]; - parameter.initParameterNameDiscovery(parameterNameDiscoverer); + parameter.initParameterNameDiscovery(this.parameterNameDiscoverer); GenericTypeResolver.resolveParameterType(parameter, getBean().getClass()); - args[i] = resolveProvidedArgument(parameter, providedArgs); if (args[i] != null) { continue; } - - if (argumentResolvers.supportsParameter(parameter)) { + if (this.argumentResolvers.supportsParameter(parameter)) { try { - args[i] = argumentResolvers.resolveArgument(parameter, mavContainer, request, dataBinderFactory); + args[i] = this.argumentResolvers.resolveArgument(parameter, mavContainer, request, this.dataBinderFactory); continue; - } catch (Exception ex) { + } + catch (Exception ex) { if (logger.isTraceEnabled()) { logger.trace(getArgumentResolutionErrorMessage("Error resolving argument", i), ex); } throw ex; } } - if (args[i] == null) { String msg = getArgumentResolutionErrorMessage("No suitable resolver for argument", i); throw new IllegalStateException(msg);