diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java index d301b8deb8..be5b4ea6d8 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java @@ -204,7 +204,7 @@ public class GsonHttpMessageConverter extends AbstractHttpMessageConverterUse this method only if it's an error if the input isn't valid. @@ -141,16 +145,6 @@ public class WebRequestDataBinder extends WebDataBinder { } } - /** - * Check if the request is a multipart request (by checking its Content-Type header). - * - * @param request request with parameters to bind - */ - private boolean isMultipartRequest(WebRequest request) { - String contentType = request.getHeader("Content-Type"); - return ((contentType != null) && StringUtils.startsWithIgnoreCase(contentType, "multipart")); - } - /** * Encapsulate Part binding code for Servlet 3.0+ only containers. @@ -160,12 +154,10 @@ public class WebRequestDataBinder extends WebDataBinder { private final boolean bindEmptyMultipartFiles; - public Servlet3MultipartHelper(boolean bindEmptyMultipartFiles) { this.bindEmptyMultipartFiles = bindEmptyMultipartFiles; } - public void bindParts(HttpServletRequest request, MutablePropertyValues mpvs) { try { MultiValueMap map = new LinkedMultiValueMap(); @@ -184,14 +176,10 @@ public class WebRequestDataBinder extends WebDataBinder { } } } - catch (IOException ex) { - throw new MultipartException("Failed to get request parts", ex); - } - catch(ServletException ex) { + catch (Exception ex) { throw new MultipartException("Failed to get request parts", ex); } } - } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java index 01a14a103a..6bac90cd6c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java @@ -99,7 +99,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser { handlerMappingDef.getPropertyValues().add("pathMatcher", pathMatcherRef).add("urlPathHelper", pathHelperRef); String order = element.getAttribute("order"); - // use a default of near-lowest precedence, still allowing for even lower precedence in other mappings + // Use a default of near-lowest precedence, still allowing for even lower precedence in other mappings handlerMappingDef.getPropertyValues().add("order", StringUtils.hasText(order) ? order : Ordered.LOWEST_PRECEDENCE - 1); String beanName = parserContext.getReaderContext().generateBeanName(handlerMappingDef); @@ -278,7 +278,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser { Element childElement = DomUtils.getChildElementsByTagName(beanElement, "bean", "ref").get(0); strategy = parserContext.getDelegate().parsePropertySubElement(childElement, null); } - for(String pattern : patterns) { + for (String pattern : patterns) { strategyMap.put(pattern, strategy); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java index 6107256470..69e3656da3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java @@ -15,8 +15,12 @@ */ package org.springframework.web.servlet.resource; -import java.util.*; - +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.springframework.core.io.Resource; @@ -56,12 +60,9 @@ public class VersionResourceResolver extends AbstractResourceResolver { /** - * Set a Map with URL paths as keys and {@code VersionStrategy} - * as values. - * + * Set a Map with URL paths as keys and {@code VersionStrategy} as values. *

Supports direct URL matches and Ant-style pattern matches. For syntax * details, see the {@link org.springframework.util.AntPathMatcher} javadoc. - * * @param map map with URLs as keys and version strategies as values */ public void setStrategyMap(Map map) { @@ -118,7 +119,7 @@ public class VersionResourceResolver extends AbstractResourceResolver { * @see VersionStrategy */ public VersionResourceResolver addVersionStrategy(VersionStrategy strategy, String... pathPatterns) { - for(String pattern : pathPatterns) { + for (String pattern : pathPatterns) { getStrategyMap().put(pattern, strategy); } return this; @@ -148,7 +149,6 @@ public class VersionResourceResolver extends AbstractResourceResolver { } String simplePath = versionStrategy.removeVersion(requestPath, candidateVersion); - if (logger.isTraceEnabled()) { logger.trace("Extracted version from path, re-resolving without version, path=\"" + simplePath + "\""); } @@ -166,8 +166,10 @@ public class VersionResourceResolver extends AbstractResourceResolver { return baseResource; } else { - logger.trace("Potential resource found for [" + requestPath + "], but version [" - + candidateVersion + "] doesn't match."); + if (logger.isTraceEnabled()) { + logger.trace("Potential resource found for [" + requestPath + "], but version [" + + candidateVersion + "] doesn't match."); + } return null; } } @@ -194,7 +196,7 @@ public class VersionResourceResolver extends AbstractResourceResolver { } /** - * Finds a {@code VersionStrategy} for the request path of the requested resource. + * Find a {@code VersionStrategy} for the request path of the requested resource. * @return an instance of a {@code VersionStrategy} or null if none matches that request path */ protected VersionStrategy getStrategyForPath(String requestPath) { @@ -210,7 +212,6 @@ public class VersionResourceResolver extends AbstractResourceResolver { Collections.sort(matchingPatterns, comparator); return this.versionStrategyMap.get(matchingPatterns.get(0)); } - return null; }