Add CompositeRequestCondition

The new type makes it easier providing multiple custom request mapping
conditions via setters on RequestMappingHandlerMapping.

Issue: SPR-9350

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/CompositeRequestConditionTests.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2002-2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.servlet.mvc.condition;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * A test fixture for {@link CompositeRequestCondition} tests.
+ *
+ * @author Rossen Stoyanchev
+ */
+public class CompositeRequestConditionTests {
+
+	private ParamsRequestCondition param1;
+	private ParamsRequestCondition param2;
+	private ParamsRequestCondition param3;
+
+	private HeadersRequestCondition header1;
+	private HeadersRequestCondition header2;
+	private HeadersRequestCondition header3;
+
+	@Before
+	public void setup() {
+		this.param1 = new ParamsRequestCondition("param1");
+		this.param2 = new ParamsRequestCondition("param2");
+		this.param3 = this.param1.combine(this.param2);
+
+		this.header1 = new HeadersRequestCondition("header1");
+		this.header2 = new HeadersRequestCondition("header2");
+		this.header3 = this.header1.combine(this.header2);
+	}
+
+	@Test
+	public void combine() {
+		CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1, this.header1);
+		CompositeRequestCondition cond2 = new CompositeRequestCondition(this.param2, this.header2);
+		CompositeRequestCondition cond3 = new CompositeRequestCondition(this.param3, this.header3);
+
+		assertEquals(cond3, cond1.combine(cond2));
+	}
+
+	@Test
+	public void combineEmpty() {
+		CompositeRequestCondition empty = new CompositeRequestCondition();
+		CompositeRequestCondition notEmpty = new CompositeRequestCondition(this.param1);
+
+		assertSame(empty, empty.combine(empty));
+		assertSame(notEmpty, notEmpty.combine(empty));
+		assertSame(notEmpty, empty.combine(notEmpty));
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void combineDifferentLength() {
+		CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
+		CompositeRequestCondition cond2 = new CompositeRequestCondition(this.param1, this.header1);
+		cond1.combine(cond2);
+	}
+
+	@Test
+	public void match() {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
+		request.setParameter("param1", "paramValue1");
+		request.addHeader("header1", "headerValue1");
+
+		RequestCondition<?> getPostCond = new RequestMethodsRequestCondition(RequestMethod.GET, RequestMethod.POST);
+		RequestCondition<?> getCond = new RequestMethodsRequestCondition(RequestMethod.GET);
+
+		CompositeRequestCondition condition = new CompositeRequestCondition(this.param1, getPostCond);
+		CompositeRequestCondition matchingCondition = new CompositeRequestCondition(this.param1, getCond);
+
+		assertEquals(matchingCondition, condition.getMatchingCondition(request));
+	}
+
+	@Test
+	public void noMatch() {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
+		CompositeRequestCondition cond = new CompositeRequestCondition(this.param1);
+
+		assertNull(cond.getMatchingCondition(request));
+	}
+
+	@Test
+	public void matchEmpty() {
+		CompositeRequestCondition empty = new CompositeRequestCondition();
+		assertSame(empty, empty.getMatchingCondition(new MockHttpServletRequest()));
+	}
+
+	@Test
+	public void compare() {
+		HttpServletRequest request = new MockHttpServletRequest();
+
+		CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
+		CompositeRequestCondition cond3 = new CompositeRequestCondition(this.param3);
+
+		assertEquals(1, cond1.compareTo(cond3, request));
+		assertEquals(-1, cond3.compareTo(cond1, request));
+	}
+
+	@Test
+	public void compareEmpty() {
+		HttpServletRequest request = new MockHttpServletRequest();
+
+		CompositeRequestCondition empty = new CompositeRequestCondition();
+		CompositeRequestCondition notEmpty = new CompositeRequestCondition(this.param1);
+
+		assertEquals(0, empty.compareTo(empty, request));
+		assertEquals(-1, notEmpty.compareTo(empty, request));
+		assertEquals(1, empty.compareTo(notEmpty, request));
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void compareDifferentLength() {
+		CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
+		CompositeRequestCondition cond2 = new CompositeRequestCondition(this.param1, this.header1);
+		cond1.compareTo(cond2, new MockHttpServletRequest());
+	}
+
+}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -27,23 +27,12 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
- * A test fixture for
- * {code org.springframework.web.servlet.mvc.method.RequestConditionHolder} tests.
+ * A test fixture for {@link RequestConditionHolder} tests.
  *
  * @author Rossen Stoyanchev
  */
 public class RequestConditionHolderTests {
 
-	@Test
-	public void combineEmpty() {
-		RequestConditionHolder empty = new RequestConditionHolder(null);
-		RequestConditionHolder notEmpty = new RequestConditionHolder(new ParamsRequestCondition("name"));
-
-		assertSame(empty, empty.combine(new RequestConditionHolder(null)));
-		assertSame(notEmpty, notEmpty.combine(empty));
-		assertSame(notEmpty, empty.combine(notEmpty));
-	}
-
 	@Test
 	public void combine() {
 		RequestConditionHolder params1 = new RequestConditionHolder(new ParamsRequestCondition("name1"));
@@ -53,6 +42,16 @@ public class RequestConditionHolderTests {
 		assertEquals(expected, params1.combine(params2));
 	}
 
+	@Test
+	public void combineEmpty() {
+		RequestConditionHolder empty = new RequestConditionHolder(null);
+		RequestConditionHolder notEmpty = new RequestConditionHolder(new ParamsRequestCondition("name"));
+
+		assertSame(empty, empty.combine(empty));
+		assertSame(notEmpty, notEmpty.combine(empty));
+		assertSame(notEmpty, empty.combine(notEmpty));
+	}
+
 	@Test(expected=ClassCastException.class)
 	public void combineIncompatible() {
 		RequestConditionHolder params = new RequestConditionHolder(new ParamsRequestCondition("name"));