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

INT-3054 URI Variable Mapping Improvements

Browse Source 
Permit missing URI vars in HTTP outbound gateway

Do not attempt to evaluate uri variables that are not in the URL

The http gateway might not know what uri variables it might obtain in the URI.
This patch makes sure that only the uri variables defined in the uri are parsed (the rest are ignored)
This commit is contained in:
Wallace Wadge
2013-06-10 11:19:08 +02:00
committed by Gary Russell
parent 0301f262e0
commit 3369d3f9b1
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java
View File

@@ -63,6 +63,7 @@ import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;
import org.springframework.web.util.UriTemplate;
/**
* A {@link MessageHandler} implementation that executes HTTP requests by delegating
@@ -79,6 +80,7 @@ import org.springframework.web.util.UriComponentsBuilder;
* @author Gary Russell
* @author Gunnar Hillert
* @author Artem Bilan
* @author Wallace Wadge
* @since 2.0
*/
public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMessageHandler {
@@ -337,11 +339,19 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
protected Object handleRequestMessage(Message<?> requestMessage) {
String uri = this.uriExpression.getValue(this.evaluationContext, requestMessage, String.class);
Assert.notNull(uri, "URI Expression evaluation cannot result in null");
List<String> uriVariableNames = new UriTemplate(uri).getVariableNames();
if (logger.isWarnEnabled() && this.uriVariableExpressions.size() != uriVariableNames.size()){
logger.warn("The number of URI variables expecting resolution in the provided uri do not match those in the provided variables");
}
try {
Map<String, Object> uriVariables = new HashMap<String, Object>();
for (Map.Entry<String, Expression> entry : this.uriVariableExpressions.entrySet()) {
Object value = entry.getValue().getValue(this.evaluationContext, requestMessage, String.class);
uriVariables.put(entry.getKey(), value);
for (String var : uriVariableNames) {
Expression exp = this.uriVariableExpressions.get(var);
if (exp != null){
Object value = exp.getValue(this.evaluationContext, requestMessage, String.class);
uriVariables.put(var, value);
}
}
HttpMethod httpMethod = this.determineHttpMethod(requestMessage);