root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Enrich TypeMismatchException for controller method args 

Issue: SPR-10153
This commit is contained in:
Rossen Stoyanchev 2015-04-06 22:36:54 -04:00
parent 13403d51e5
commit 6f5359e40c
3 changed files with 135 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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.
@ -20,6 +20,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletException;
import org.springframework.beans.ConversionNotSupportedException;
import org.springframework.beans.TypeMismatchException;
import org.springframework.beans.factory.config.BeanExpressionContext;
import org.springframework.beans.factory.config.BeanExpressionResolver;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@ -101,7 +103,18 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
if (binderFactory != null) {
WebDataBinder binder = binderFactory.createBinder(webRequest, null, namedValueInfo.name);
arg = binder.convertIfNecessary(arg, paramType, parameter);
try {
arg = binder.convertIfNecessary(arg, paramType, parameter);
}
catch (ConversionNotSupportedException ex) {
throw new MethodArgumentConversionNotSupportedException(arg, ex.getRequiredType(),
ex.getCause(), namedValueInfo.name, parameter);
}
catch (TypeMismatchException ex) {
throw new MethodArgumentTypeMismatchException(arg, ex.getRequiredType(),
ex.getCause(), namedValueInfo.name, parameter);
}
}
handleResolvedValue(arg, namedValueInfo.name, parameter, mavContainer, webRequest);

60
spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentConversionNotSupportedException.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright 2002-2015 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.method.annotation;
import org.springframework.beans.ConversionNotSupportedException;
import org.springframework.core.MethodParameter;
/**
* A ConversionNotSupportedException raised while resolving a method argument.
* Provides access to the target {@link org.springframework.core.MethodParameter
* MethodParameter}.
*
* @author Rossen Stoyanchev
* @since 4.2
*/
@SuppressWarnings("serial")
public class MethodArgumentConversionNotSupportedException extends ConversionNotSupportedException {
private final String name;
private final MethodParameter parameter;
public MethodArgumentConversionNotSupportedException(Object value, Class<?> requiredType,
Throwable cause, String name, MethodParameter param) {
super(value, requiredType, cause);
this.name = name;
this.parameter = param;
}
/**
* Return the name of the method argument.
*/
public String getName() {
return this.name;
}
/**
* Return the target method parameter.
*/
public MethodParameter getParameter() {
return this.parameter;
}
}

60
spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentTypeMismatchException.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright 2002-2015 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.method.annotation;
import org.springframework.beans.TypeMismatchException;
import org.springframework.core.MethodParameter;
/**
* A TypeMismatchException raised while resolving a controller method argument.
* Provides access to the target {@link org.springframework.core.MethodParameter
* MethodParameter}.
*
* @author Rossen Stoyanchev
* @since 4.2
*/
@SuppressWarnings("serial")
public class MethodArgumentTypeMismatchException extends TypeMismatchException {
private final String name;
private final MethodParameter parameter;
public MethodArgumentTypeMismatchException(Object value, Class<?> requiredType,
Throwable cause, String name, MethodParameter param) {
super(value, requiredType, cause);
this.name = name;
this.parameter = param;
}
/**
* Return the name of the method argument.
*/
public String getName() {
return this.name;
}
/**
* Return the target method parameter.
*/
public MethodParameter getParameter() {
return this.parameter;
}
}