From 074590730bdcd32a49d525da1fccf0862cacad26 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 25 Mar 2014 00:54:02 +0100 Subject: [PATCH] Polishing --- .../http/server/ServletServerHttpRequest.java | 4 +-- .../web/util/HierarchicalUriComponents.java | 9 ++++--- .../web/servlet/DispatcherServlet.java | 25 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java index cd4d366ffc7..0afab0b3022 100644 --- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -68,7 +68,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest { * @param servletRequest the servlet request */ public ServletServerHttpRequest(HttpServletRequest servletRequest) { - Assert.notNull(servletRequest, "'servletRequest' must not be null"); + Assert.notNull(servletRequest, "HttpServletRequest must not be null"); this.servletRequest = servletRequest; } diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java index 40073188a24..895ba266a05 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java @@ -180,7 +180,7 @@ final class HierarchicalUriComponents extends UriComponents { if (this.encoded) { return this; } - String encodedScheme = encodeUriComponent(this.getScheme(), encoding, Type.SCHEME); + String encodedScheme = encodeUriComponent(getScheme(), encoding, Type.SCHEME); String encodedUserInfo = encodeUriComponent(this.userInfo, encoding, Type.USER_INFO); String encodedHost = encodeUriComponent(this.host, encoding, getHostType()); @@ -245,6 +245,7 @@ final class HierarchicalUriComponents extends UriComponents { return (this.host != null && this.host.startsWith("[")) ? Type.HOST_IPV6 : Type.HOST_IPV4; } + // verifying /** @@ -257,8 +258,8 @@ final class HierarchicalUriComponents extends UriComponents { return; } verifyUriComponent(getScheme(), Type.SCHEME); - verifyUriComponent(userInfo, Type.USER_INFO); - verifyUriComponent(host, getHostType()); + verifyUriComponent(this.userInfo, Type.USER_INFO); + verifyUriComponent(this.host, getHostType()); this.path.verify(); for (Map.Entry> entry : queryParams.entrySet()) { verifyUriComponent(entry.getKey(), Type.QUERY_PARAM); @@ -304,7 +305,7 @@ final class HierarchicalUriComponents extends UriComponents { @Override protected HierarchicalUriComponents expandInternal(UriTemplateVariables uriVariables) { Assert.state(!this.encoded, "Cannot expand an already encoded UriComponents object"); - String expandedScheme = expandUriComponent(this.getScheme(), uriVariables); + String expandedScheme = expandUriComponent(getScheme(), uriVariables); String expandedUserInfo = expandUriComponent(this.userInfo, uriVariables); String expandedHost = expandUriComponent(this.host, uriVariables); PathComponent expandedPath = this.path.expand(uriVariables); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java index adcc54adea5..fdb07351cf3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java @@ -272,12 +272,12 @@ public class DispatcherServlet extends FrameworkServlet { /** Detect all ViewResolvers or just expect "viewResolver" bean? */ private boolean detectAllViewResolvers = true; - /** Perform cleanup of request attributes after include request? */ - private boolean cleanupAfterInclude = true; - /** Throw a NoHandlerFoundException if no Handler was found to process this request? **/ private boolean throwExceptionIfNoHandlerFound = false; + /** Perform cleanup of request attributes after include request? */ + private boolean cleanupAfterInclude = true; + /** MultipartResolver used by this servlet */ private MultipartResolver multipartResolver; @@ -413,12 +413,11 @@ public class DispatcherServlet extends FrameworkServlet { * Set whether to throw a NoHandlerFoundException when no Handler was found for this request. * This exception can then be caught with a HandlerExceptionResolver or an * {@code @ExceptionHandler} controller method. - *

Note that if - * {@link org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler} - * is used, then requests will always be forwarded to the default servlet and - * a NoHandlerFoundException would never be thrown in that case. - *

Default is "false", meaning the DispatcherServlet sends a NOT_FOUND error - * through the Servlet response. + *

Note that if {@link org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler} + * is used, then requests will always be forwarded to the default servlet and a + * NoHandlerFoundException would never be thrown in that case. + *

Default is "false", meaning the DispatcherServlet sends a NOT_FOUND error through the + * Servlet response. * @since 4.0 */ public void setThrowExceptionIfNoHandlerFound(boolean throwExceptionIfNoHandlerFound) { @@ -1111,10 +1110,10 @@ public class DispatcherServlet extends FrameworkServlet { pageNotFoundLogger.warn("No mapping found for HTTP request with URI [" + getRequestUri(request) + "] in DispatcherServlet with name '" + getServletName() + "'"); } - if (throwExceptionIfNoHandlerFound) { - ServletServerHttpRequest req = new ServletServerHttpRequest(request); - throw new NoHandlerFoundException(req.getMethod().name(), - req.getServletRequest().getRequestURI(),req.getHeaders()); + if (this.throwExceptionIfNoHandlerFound) { + ServletServerHttpRequest sshr = new ServletServerHttpRequest(request); + throw new NoHandlerFoundException( + sshr.getMethod().name(), sshr.getServletRequest().getRequestURI(), sshr.getHeaders()); } else { response.sendError(HttpServletResponse.SC_NOT_FOUND);