Polishing

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.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.
@@ -103,8 +103,8 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 			List<String> fileExtensions) {
 
 		this.patterns = Collections.unmodifiableSet(prependLeadingSlash(patterns));
-		this.pathHelper = urlPathHelper != null ? urlPathHelper : new UrlPathHelper();
-		this.pathMatcher = pathMatcher != null ? pathMatcher : new AntPathMatcher();
+		this.pathHelper = (urlPathHelper != null ? urlPathHelper : new UrlPathHelper());
+		this.pathMatcher = (pathMatcher != null ? pathMatcher : new AntPathMatcher());
 		this.useSuffixPatternMatch = useSuffixPatternMatch;
 		this.useTrailingSlashMatch = useTrailingSlashMatch;
 		if (fileExtensions != null) {
@@ -220,7 +220,6 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 	 * {@link #getMatchingCondition(javax.servlet.http.HttpServletRequest)}.
 	 * This method is provided as an alternative to be used if no request is available
 	 * (e.g. introspection, tooling, etc).
-	 *
 	 * @param lookupPath the lookup path to match to existing patterns
 	 * @return a collection of matching patterns sorted with the closest match at the top
 	 */

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java

@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.mvc.method;
 
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
@@ -39,13 +38,13 @@ import org.springframework.web.util.UrlPathHelper;
 /**
  * Encapsulates the following request mapping conditions:
  * <ol>
- * 	<li>{@link PatternsRequestCondition}
- * 	<li>{@link RequestMethodsRequestCondition}
- * 	<li>{@link ParamsRequestCondition}
- * 	<li>{@link HeadersRequestCondition}
- * 	<li>{@link ConsumesRequestCondition}
- * 	<li>{@link ProducesRequestCondition}
- * 	<li>{@code RequestCondition} (optional, custom request condition)
+ * <li>{@link PatternsRequestCondition}
+ * <li>{@link RequestMethodsRequestCondition}
+ * <li>{@link ParamsRequestCondition}
+ * <li>{@link HeadersRequestCondition}
+ * <li>{@link ConsumesRequestCondition}
+ * <li>{@link ProducesRequestCondition}
+ * <li>{@code RequestCondition} (optional, custom request condition)
  * </ol>
  *
  * @author Arjen Poutsma
@@ -297,21 +296,21 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	}
 
 	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
+	public boolean equals(Object other) {
+		if (this == other) {
 			return true;
 		}
-		if (obj != null && obj instanceof RequestMappingInfo) {
-			RequestMappingInfo other = (RequestMappingInfo) obj;
-			return (this.patternsCondition.equals(other.patternsCondition) &&
-					this.methodsCondition.equals(other.methodsCondition) &&
-					this.paramsCondition.equals(other.paramsCondition) &&
-					this.headersCondition.equals(other.headersCondition) &&
-					this.consumesCondition.equals(other.consumesCondition) &&
-					this.producesCondition.equals(other.producesCondition) &&
-					this.customConditionHolder.equals(other.customConditionHolder));
+		if (!(other instanceof RequestMappingInfo)) {
+			return false;
 		}
-		return false;
+		RequestMappingInfo otherInfo = (RequestMappingInfo) other;
+		return (this.patternsCondition.equals(otherInfo.patternsCondition) &&
+				this.methodsCondition.equals(otherInfo.methodsCondition) &&
+				this.paramsCondition.equals(otherInfo.paramsCondition) &&
+				this.headersCondition.equals(otherInfo.headersCondition) &&
+				this.consumesCondition.equals(otherInfo.consumesCondition) &&
+				this.producesCondition.equals(otherInfo.producesCondition) &&
+				this.customConditionHolder.equals(otherInfo.customConditionHolder));
 	}
 
 	@Override
@@ -348,6 +347,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 		return builder.toString();
 	}
 
+
 	/**
 	 * Create a new {@code RequestMappingInfo.Builder} with the given paths.
 	 * @param paths the paths to use
@@ -416,6 +416,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 		RequestMappingInfo build();
 	}
 
+
 	private static class DefaultBuilder implements Builder {
 
 		private String[] paths;
@@ -436,12 +437,10 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 
 		private BuilderConfiguration options = new BuilderConfiguration();
 
-
 		public DefaultBuilder(String... paths) {
 			this.paths = paths;
 		}
 
-
 		@Override
 		public Builder paths(String... paths) {
 			this.paths = paths;
@@ -498,7 +497,6 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 
 		@Override
 		public RequestMappingInfo build() {
-
 			ContentNegotiationManager manager = this.options.getContentNegotiationManager();
 
 			PatternsRequestCondition patternsCondition = new PatternsRequestCondition(
@@ -516,13 +514,13 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 		}
 	}
 
+
 	/**
 	 * Container for configuration options used for request mapping purposes.
 	 * Such configuration is required to create RequestMappingInfo instances but
 	 * is typically used across all RequestMappingInfo instances.
-	 *
-	 * @see Builder#options
 	 * @since 4.2
+	 * @see Builder#options
 	 */
 	public static class BuilderConfiguration {
 
@@ -538,7 +536,6 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 
 		private ContentNegotiationManager contentNegotiationManager;
 
-
 		/**
 		 * Set a custom UrlPathHelper to use for the PatternsRequestCondition.
 		 * <p>By default this is not set.

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java

@@ -122,7 +122,6 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
 
 	@Override
 	public void afterPropertiesSet() {
-
 		this.config = new RequestMappingInfo.BuilderConfiguration();
 		this.config.setPathHelper(getUrlPathHelper());
 		this.config.setPathMatcher(getPathMatcher());
@@ -204,15 +203,13 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
 	 * Delegates to {@link #createRequestMappingInfo(RequestMapping, RequestCondition)},
 	 * supplying the appropriate custom {@link RequestCondition} depending on whether
 	 * the supplied {@code annotatedElement} is a class or method.
-	 *
 	 * @see #getCustomTypeCondition(Class)
 	 * @see #getCustomMethodCondition(Method)
 	 */
 	private RequestMappingInfo createRequestMappingInfo(AnnotatedElement element) {
 		RequestMapping requestMapping = AnnotatedElementUtils.findMergedAnnotation(element, RequestMapping.class);
 		RequestCondition<?> condition = (element instanceof Class<?> ?
-				getCustomTypeCondition((Class<?>) element) :
-				getCustomMethodCondition((Method) element));
+				getCustomTypeCondition((Class<?>) element) : getCustomMethodCondition((Method) element));
 		return (requestMapping != null ? createRequestMappingInfo(requestMapping, condition) : null);
 	}
 
@@ -252,8 +249,8 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
 	 * a directly declared annotation, a meta-annotation, or the synthesized
 	 * result of merging annotation attributes within an annotation hierarchy.
 	 */
-	protected RequestMappingInfo createRequestMappingInfo(RequestMapping requestMapping,
-			RequestCondition<?> customCondition) {
+	protected RequestMappingInfo createRequestMappingInfo(
+			RequestMapping requestMapping, RequestCondition<?> customCondition) {
 
 		return RequestMappingInfo
 				.paths(resolveEmbeddedValuesInPatterns(requestMapping.path()))
@@ -348,7 +345,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
 					+ "or an empty string (\"\"); current value is [" + allowCredentials + "].");
 		}
 
-		if ((annotation.maxAge() >= 0) && (config.getMaxAge() == null)) {
+		if (annotation.maxAge() >= 0 && config.getMaxAge() == null) {
 			config.setMaxAge(annotation.maxAge());
 		}
 	}