From 00147379f94660b552b961f0969664acaedb3e5c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 11 May 2015 21:52:38 +0200 Subject: [PATCH] Polishing (cherry picked from commit 9e925aa) --- .../org/springframework/core/GenericTypeResolverTests.java | 2 +- .../jdbc/core/metadata/CallMetaDataProviderFactory.java | 2 +- .../jdbc/core/metadata/TableMetaDataProviderFactory.java | 2 +- .../java/org/springframework/http/ResponseEntityTests.java | 1 - .../method/annotation/RequestResponseBodyMethodProcessor.java | 3 ++- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java index dc5df2c80d..bd3bdfd3bc 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java @@ -90,7 +90,7 @@ public class GenericTypeResolverTests { resolveType(intArrMessageMethodParam.getGenericParameterType(), new HashMap())); Method genericArrMessageMethod = findMethod(MySimpleTypeWithMethods.class, "readGenericArrayInputMessage", - Object[].class); + Object[].class); MethodParameter genericArrMessageMethodParam = new MethodParameter(genericArrMessageMethod, 0); Map varMap = getTypeVariableMap(MySimpleTypeWithMethods.class); assertEquals(Integer[].class, resolveType(genericArrMessageMethodParam.getGenericParameterType(), varMap)); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java index be91db1556..dc4b90f1aa 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java @@ -32,7 +32,7 @@ import org.springframework.jdbc.support.MetaDataAccessException; /** * Factory used to create a {@link CallMetaDataProvider} implementation - * based on the type of databse being used. + * based on the type of database being used. * * @author Thomas Risberg * @since 2.5 diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java index 2d9c5b5476..f2e8cc52e1 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java @@ -31,7 +31,7 @@ import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor; /** * Factory used to create a {@link TableMetaDataProvider} implementation - * based on the type of databse being used. + * based on the type of database being used. * * @author Thomas Risberg * @since 2.5 diff --git a/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java b/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java index 16a0ad4c7e..abd2b55635 100644 --- a/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java +++ b/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java @@ -193,7 +193,6 @@ public class ResponseEntityTests { @Test public void emptyCacheControl() { - Integer entity = new Integer(42); ResponseEntity responseEntity = diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java index 20d381dc39..3bbf082e63 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java @@ -58,7 +58,6 @@ import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolv */ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverterMethodProcessor { - /** * Basic constructor with converters only. Suitable for resolving * {@code @RequestBody}. For handling {@code @ResponseBody} consider also @@ -126,6 +125,7 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter Object arg = readWithMessageConverters(webRequest, parameter, parameter.getGenericParameterType()); String name = Conventions.getVariableNameForParameter(parameter); + WebDataBinder binder = binderFactory.createBinder(webRequest, arg, name); if (arg != null) { validateIfApplicable(binder, parameter); @@ -134,6 +134,7 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter } } mavContainer.addAttribute(BindingResult.MODEL_KEY_PREFIX + name, binder.getBindingResult()); + return arg; }