root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polish trailing whitespace

This commit is contained in:
Phillip Webb 2012-09-20 17:38:28 -07:00 committed by Rossen Stoyanchev
parent d1d9e118b7
commit b0153ada19
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
View File

@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.RequestMethod;
/**
* A logical disjunction (' || ') request condition that matches a request
* A logical disjunction (' || ') request condition that matches a request
* against a set of {@link RequestMethod}s.
*
*
* @author Arjen Poutsma
* @author Rossen Stoyanchev
* @since 3.1
@ -41,7 +41,7 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
/**
* Create a new instance with the given request methods.
* @param requestMethods 0 or more HTTP request methods;
* @param requestMethods 0 or more HTTP request methods;
* if, 0 the condition will match to every request.
*/
public RequestMethodsRequestCondition(RequestMethod... requestMethods) {
@ -51,13 +51,13 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
private static List<RequestMethod> asList(RequestMethod... requestMethods) {
return requestMethods != null ? Arrays.asList(requestMethods) : Collections.<RequestMethod>emptyList();
}
/**
* Private constructor.
*/
private RequestMethodsRequestCondition(Collection<RequestMethod> requestMethods) {
this.methods = Collections.unmodifiableSet(new LinkedHashSet<RequestMethod>(requestMethods));
}
}
/**
* Returns all {@link RequestMethod}s contained in this condition.
@ -75,9 +75,9 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
protected String getToStringInfix() {
return " || ";
}
/**
* Returns a new instance with a union of the HTTP request methods
* Returns a new instance with a union of the HTTP request methods
* from "this" and the "other" instance.
*/
public RequestMethodsRequestCondition combine(RequestMethodsRequestCondition other) {
@ -87,11 +87,11 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
}
/**
* Checks if any of the HTTP request methods match the given request and returns
* an instance that contains the matching request method only.
* Checks if any of the HTTP request methods match the given request and returns
* an instance that contains the matching request method only.
* @param request the current request
* @return the same instance if the condition contains no request method;
* or a new condition with the matching request method;
* @return the same instance if the condition contains no request method;
* or a new condition with the matching request method;
* or {@code null} if no request methods match.
*/
public RequestMethodsRequestCondition getMatchingCondition(HttpServletRequest request) {
@ -113,10 +113,10 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
* <li>0 if the two conditions contain the same number of HTTP request methods.
* <li>Less than 0 if "this" instance has an HTTP request method but "other" doesn't.
* <li>Greater than 0 "other" has an HTTP request method but "this" doesn't.
* </ul>
*
* <p>It is assumed that both instances have been obtained via
* {@link #getMatchingCondition(HttpServletRequest)} and therefore each instance
* </ul>
*
* <p>It is assumed that both instances have been obtained via
* {@link #getMatchingCondition(HttpServletRequest)} and therefore each instance
* contains the matching HTTP request method only or is otherwise empty.
*/
public int compareTo(RequestMethodsRequestCondition other, HttpServletRequest request) {