diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/AbstractNameValueExpression.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/AbstractNameValueExpression.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java index 06d2e81be76..a8555d2790f 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/AbstractNameValueExpression.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import javax.servlet.http.HttpServletRequest; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/AbstractRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/AbstractRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java index 93266c87c27..ed8e153b52f 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/AbstractRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.Collection; import java.util.Iterator; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ConsumesRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ConsumesRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java index 88e7b1f1503..570857ea9db 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ConsumesRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.ArrayList; import java.util.Collection; @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.mvc.method.condition.HeadersRequestCondition.HeaderExpression; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition.HeaderExpression; /** * A logical disjunction (' || ') request condition to match requests against consumable media type expressions. diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/CustomRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/CustomRequestCondition.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/CustomRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/CustomRequestCondition.java index 97a278577a1..b548f813f8d 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/CustomRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/CustomRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.Collection; import java.util.Collections; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/HeadersRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/HeadersRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java index 81a45e0c7f0..016e0d10570 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/HeadersRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.Collection; import java.util.Collections; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/MediaTypeExpression.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/MediaTypeExpression.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java index ca24662ba5d..3d1f21beb9c 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/MediaTypeExpression.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import javax.servlet.http.HttpServletRequest; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ParamsRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ParamsRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java index 3bf7885e2db..df5108160b0 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ParamsRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.Collection; import java.util.Collections; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/PatternsRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java similarity index 99% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/PatternsRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java index 9a614e11540..167b5ed00fc 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/PatternsRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.ArrayList; import java.util.Arrays; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ProducesRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ProducesRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java index 831bd6df382..47b6f4bb67c 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/ProducesRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.ArrayList; import java.util.Collection; @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.mvc.method.condition.HeadersRequestCondition.HeaderExpression; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition.HeaderExpression; /** * A logical disjunction (' || ') request condition to match requests against producible media type expressions. diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/RequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java similarity index 92% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/RequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java index 7ed0ae2071a..24c16bc7cef 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/RequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import javax.servlet.http.HttpServletRequest; @@ -41,7 +41,7 @@ public interface RequestCondition { T combine(T other); /** - * Checks if this condition matches the provided request and returns a potentially new request condition + * Checks if this condition matches the given request and returns a potentially new request condition * with content tailored to the current request. For example a condition with URL patterns might return * a new condition that contains matching patterns sorted with best matching patterns on top. * diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/RequestMethodsRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/RequestMethodsRequestCondition.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java index c64936542ca..7d9a2eefa83 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/condition/RequestMethodsRequestCondition.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import java.util.Arrays; import java.util.Collection; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java index ca35d1ca44e..9a074f99903 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java @@ -19,14 +19,14 @@ package org.springframework.web.servlet.mvc.method; import javax.servlet.http.HttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.mvc.method.condition.ConsumesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.CustomRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.HeadersRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ParamsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.PatternsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ProducesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.RequestCondition; -import org.springframework.web.servlet.mvc.method.condition.RequestMethodsRequestCondition; +import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition; +import org.springframework.web.servlet.mvc.condition.CustomRequestCondition; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition; +import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition; +import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; +import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition; +import org.springframework.web.servlet.mvc.condition.RequestCondition; +import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition; /** * A RequestMapingInfo encapsulates and operates on the following request mapping conditions: diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java index 532be9e9c3d..dd94724ef3c 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java @@ -22,14 +22,14 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.stereotype.Controller; import org.springframework.util.PathMatcher; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition; +import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition; +import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; +import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition; +import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; -import org.springframework.web.servlet.mvc.method.condition.ConsumesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.HeadersRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ParamsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.PatternsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ProducesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.RequestMethodsRequestCondition; /** * A sub-class of {@link RequestMappingInfoHandlerMapping} that prepares {@link RequestMappingInfo}s diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ConsumesRequestConditionTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java similarity index 95% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ConsumesRequestConditionTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java index d93b0d03eb8..d9c5b4f6247 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ConsumesRequestConditionTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,7 +26,8 @@ import java.util.Collection; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.web.servlet.mvc.method.condition.ConsumesRequestCondition.ConsumeMediaTypeExpression; +import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition; +import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition.ConsumeMediaTypeExpression; /** * @author Arjen Poutsma diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/HeadersRequestConditionTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java similarity index 95% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/HeadersRequestConditionTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java index 092a6310272..3956ff06590 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/HeadersRequestConditionTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,7 +26,8 @@ import java.util.Collection; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.web.servlet.mvc.method.condition.HeadersRequestCondition.HeaderExpression; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition.HeaderExpression; /** * @author Arjen Poutsma diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ParamsRequestConditionTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java similarity index 94% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ParamsRequestConditionTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java index 9750f4b01f3..8f2035e592b 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ParamsRequestConditionTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,7 +26,8 @@ import java.util.Collection; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.web.servlet.mvc.method.condition.ParamsRequestCondition.ParamExpression; +import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition; +import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition.ParamExpression; /** * @author Arjen Poutsma diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ProducesRequestConditionTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java similarity index 96% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ProducesRequestConditionTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java index adf059af335..b11467fb2f3 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/ProducesRequestConditionTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,7 +26,8 @@ import java.util.Collection; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.web.servlet.mvc.method.condition.ProducesRequestCondition.ProduceMediaTypeExpression; +import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition; +import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition.ProduceMediaTypeExpression; /** * @author Arjen Poutsma diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/RequestMethodsRequestConditionTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java similarity index 95% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/RequestMethodsRequestConditionTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java index a3d153ea304..718823e1b5f 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/condition/RequestMethodsRequestConditionTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.condition; +package org.springframework.web.servlet.mvc.condition; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition; import static org.junit.Assert.*; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoComparatorTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoComparatorTests.java index bf4c26524d2..334a01ebca9 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoComparatorTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoComparatorTests.java @@ -30,10 +30,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition; +import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition; +import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import org.springframework.web.servlet.mvc.method.condition.ParamsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ProducesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.RequestMethodsRequestCondition; /** * Test fixture with {@link RequestMappingHandlerMapping} testing its {@link RequestMappingInfo} comparator. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java index b87f5060bd7..673ece77fe9 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java @@ -41,13 +41,13 @@ import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.MappedInterceptor; +import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition; +import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition; +import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; +import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition; +import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import org.springframework.web.servlet.mvc.method.condition.ConsumesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.HeadersRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ParamsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.PatternsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ProducesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.RequestMethodsRequestCondition; import org.springframework.web.util.UrlPathHelper; /** diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java index 3b01e2d97e5..0cd9e11d876 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java @@ -24,11 +24,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.web.servlet.mvc.method.condition.ConsumesRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.HeadersRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ParamsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.PatternsRequestCondition; -import org.springframework.web.servlet.mvc.method.condition.ProducesRequestCondition; +import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition; +import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition; +import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition; +import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; +import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition; /** * Test fixture for {@link RequestMappingInfo} tests.