From 6f5359e40c21146c40a7e2b18a491f75b61f8152 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 6 Apr 2015 22:36:54 -0400 Subject: [PATCH] Enrich TypeMismatchException for controller method args Issue: SPR-10153 --- ...tractNamedValueMethodArgumentResolver.java | 17 +++++- ...gumentConversionNotSupportedException.java | 60 +++++++++++++++++++ .../MethodArgumentTypeMismatchException.java | 60 +++++++++++++++++++ 3 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentConversionNotSupportedException.java create mode 100644 spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentTypeMismatchException.java diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java index 30bbfbc0a10..a27f9725ce8 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java @@ -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); diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentConversionNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentConversionNotSupportedException.java new file mode 100644 index 00000000000..3395f7e93f6 --- /dev/null +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentConversionNotSupportedException.java @@ -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; + } + +} diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentTypeMismatchException.java b/spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentTypeMismatchException.java new file mode 100644 index 00000000000..afa27b55cb6 --- /dev/null +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/MethodArgumentTypeMismatchException.java @@ -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; + } + +}