Polishing

Author: jhoeller

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;
 	}
 

spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java

@@ -180,7 +180,7 @@ public HierarchicalUriComponents encode(String encoding) throws UnsupportedEncod
 		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 @@ private Type getHostType() {
 		return (this.host != null && this.host.startsWith("[")) ? Type.HOST_IPV6 : Type.HOST_IPV4;
 	}
 
+
 	// verifying
 
 	/**
@@ -257,8 +258,8 @@ private void verify() {
 			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<String, List<String>> entry : queryParams.entrySet()) {
 			verifyUriComponent(entry.getKey(), Type.QUERY_PARAM);
@@ -304,7 +305,7 @@ else if (!type.isAllowed(ch)) {
 	@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);

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 void setDetectAllViewResolvers(boolean detectAllViewResolvers) {
 	 * 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.
-	 * <p>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.
-	 * <p>Default is "false", meaning the DispatcherServlet sends a NOT_FOUND error
-	 * through the Servlet response.
+	 * <p>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.
+	 * <p>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 @@ protected void noHandlerFound(HttpServletRequest request, HttpServletResponse re
 			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);