Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1677 changed uriVariables to pathVariables, added parameterMap and parameters as well as HttpEntity to the EvauationContext

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-09-02 12:17:21 -04:00
committed by Mark Fisher
parent c07d62dadb
commit 581f21f3eb
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java
View File

@@ -33,6 +33,7 @@ import org.springframework.core.convert.ConversionService;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.expression.spel.support.StandardTypeConverter;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -285,7 +286,23 @@ abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewaySuppor
}
Map uriVariableMappings = null;
//
StandardEvaluationContext evaluationContext = this.prepareAndGetEvaluationContext();
StandardEvaluationContext evaluationContext = this.createEvaluationContext();
Object requestBody = null;
if (this.isReadable(request)) {
requestBody = this.extractRequestBody(request);
evaluationContext.setVariable("requestBody", requestBody);
}
HttpEntity httpEntity = new HttpEntity(requestBody, request.getHeaders());
evaluationContext.setRootObject(httpEntity);
LinkedMultiValueMap<String, String> requestParameterMap = this.convertParameterMap(servletRequest.getParameterMap());
evaluationContext.setVariable("requestParameterMap", uriVariableMappings);// bind the whole map
for (String parameterName : requestParameterMap.keySet()) { // bind individual parameters
evaluationContext.setVariable(parameterName, requestParameterMap.get(parameterName));
}
if (StringUtils.hasText(this.path)){
UriTemplate template = new UriTemplate(this.path);
@@ -296,7 +313,7 @@ abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewaySuppor
}
// set the whole map
evaluationContext.setVariable("uriVariables", uriVariableMappings);
evaluationContext.setVariable("pathVariables", uriVariableMappings);
for (Object key : uriVariableMappings.keySet()) {
// add individual elements
evaluationContext.setVariable((String) key, uriVariableMappings.get(key));
@@ -326,11 +343,11 @@ abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewaySuppor
if (payload == null){
if (this.isReadable(request)) {
payload = this.extractRequestBody(request);
//payload = this.extractRequestBody(request);
payload = requestBody;
}
else {
payload = this.convertParameterMap(servletRequest.getParameterMap());
payload = requestParameterMap;
}
}
@@ -453,7 +470,7 @@ abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewaySuppor
return httpStatus;
}
private StandardEvaluationContext prepareAndGetEvaluationContext(){
private StandardEvaluationContext createEvaluationContext(){
StandardEvaluationContext evaluationContext = new StandardEvaluationContext();
evaluationContext.addPropertyAccessor(new MapAccessor());
BeanFactory beanFactory = this.getBeanFactory();

4
spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* 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.
@@ -121,7 +121,7 @@ public class HttpRequestHandlingMessagingGatewayWithPathMappingTests {
HttpRequestHandlingMessagingGateway gateway = new HttpRequestHandlingMessagingGateway(true);
gateway.setPath("/fname/{f}/lname/{l}");
gateway.setRequestChannel(echoChannel);
gateway.setPayloadExpression(PARSER.parseExpression("#uriVariables"));
gateway.setPayloadExpression(PARSER.parseExpression("#pathVariables"));
Object result = gateway.doHandleRequest(request, response);
assertEquals("bill", ((Map<String, Object>)result).get("f"));