From 075e331dcf0a5f53a874de5846e4364a43cc5e5d Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 17 Dec 2013 11:32:28 -0500 Subject: [PATCH] Revert "INT-3184: Test HTTP Matrix Variables" This reverts commit b607b6d3c92c511baa857bfbf8d4a916085f35af. --- .../HttpRequestHandlingEndpointSupport.java | 3 ++- ...tegrationRequestMappingHandlerMapping.java | 26 +------------------ ...RequestMappingIntegrationTests-context.xml | 6 ----- ...Int2312RequestMappingIntegrationTests.java | 16 +++++------- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java index 165429100d..c39991da62 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java @@ -422,8 +422,9 @@ public abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewa evaluationContext.setVariable("pathVariables", pathVariables); } + //TODO change it to HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE after upgrade to Spring 4.0 Map> matrixVariables = - (Map>) servletRequest.getAttribute(HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE); + (Map>) servletRequest.getAttribute(HandlerMapping.class.getName() + ".matrixVariables"); if (!CollectionUtils.isEmpty(matrixVariables)) { if (logger.isDebugEnabled()) { diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java index 50ed117132..3965a3f454 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java @@ -18,13 +18,10 @@ package org.springframework.integration.http.inbound; import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import java.util.concurrent.atomic.AtomicBoolean; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; import org.springframework.web.HttpRequestHandler; @@ -62,14 +59,11 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl * * @since 3.0 */ -public final class IntegrationRequestMappingHandlerMapping extends RequestMappingHandlerMapping - implements ApplicationListener { +public final class IntegrationRequestMappingHandlerMapping extends RequestMappingHandlerMapping { private static final Method HANDLE_REQUEST_METHOD = ReflectionUtils.findMethod(HttpRequestHandler.class, "handleRequest", HttpServletRequest.class, HttpServletResponse.class); - private final AtomicBoolean initialized = new AtomicBoolean(); - @Override protected final boolean isHandler(Class beanType) { return HttpRequestHandlingEndpointSupport.class.isAssignableFrom(beanType); @@ -148,22 +142,4 @@ public final class IntegrationRequestMappingHandlerMapping extends RequestMappin return this.createRequestMappingInfo(requestMappingAnnotation, this.getCustomTypeCondition(endpoint.getClass())); } - @Override - public void afterPropertiesSet() { - // No-op in favor of onApplicationEvent - } - - /** - * {@link HttpRequestHandlingEndpointSupport}s may depend on auto-created - * {@code requestChannel}s, so MVC Handlers detection should be postponed - * as late as possible. - * - * @see RequestMappingHandlerMapping#afterPropertiesSet() - */ - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - if (!this.initialized.getAndSet(true)) { - super.afterPropertiesSet(); - } - } } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests-context.xml index ac61daa16d..2ff049b4e7 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests-context.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests-context.xml @@ -13,12 +13,6 @@ http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd"> - - - - - diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java index e04e51f7e6..fad4b33dd6 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java @@ -19,7 +19,6 @@ package org.springframework.integration.http.inbound; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.util.Collections; @@ -28,7 +27,6 @@ import java.util.Map; import javax.servlet.http.Cookie; -import org.hamcrest.Matchers; import org.junit.Test; import org.junit.runner.RunWith; @@ -102,7 +100,9 @@ public class Int2312RequestMappingIntegrationTests extends AbstractHttpInboundTe public void testURIVariablesAndHeaders() throws Exception { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("GET"); - String testRequest = "aBc;q1=1;q2=2"; + String testRequest = "aBc"; + // TODO test it after upgrade to Spring 4.0 + // String testRequest = "aBc;q1=1;q2=2"; String requestURI = "/test/" + testRequest; request.setRequestURI(requestURI); request.setContentType("text/plain"); @@ -129,12 +129,8 @@ public class Int2312RequestMappingIntegrationTests extends AbstractHttpInboundTe assertNotNull(requestParams); assertEquals(params, ((MultiValueMap) requestParams).toSingleValueMap()); - Object matrixVariables = headers.get("matrixVariables"); - assertThat(matrixVariables, Matchers.instanceOf(Map.class)); - Object value = ((Map) matrixVariables).get("value"); - assertThat(value, Matchers.instanceOf(MultiValueMap.class)); - assertEquals("1", ((MultiValueMap) value).getFirst("q1")); - assertEquals("2", ((MultiValueMap) value).getFirst("q2")); + // TODO test it after upgrade to Spring 4.0 + // assertEquals(matrixVariables, headers.get("matrixVariables")); Object requestHeaders = headers.get("requestHeaders"); assertNotNull(requestParams); @@ -153,7 +149,7 @@ public class Int2312RequestMappingIntegrationTests extends AbstractHttpInboundTe Object handler = this.handlerMapping.getHandler(request).getHandler(); this.handlerAdapter.handle(request, response, handler); final String testResponse = response.getContentAsString(); - assertEquals(testRequest.split(";")[0].toLowerCase(), testResponse); + assertEquals(testRequest.toLowerCase(), testResponse); RequestContextHolder.resetRequestAttributes(); }