INT-3054: Add ExpressionEvalMap Support
Use an immutable Map wrapper to evaluate expressions only when accessed. Polishing
This commit is contained in:
Artem Bilan
committed by
Gary Russell
Gary Russell
parent
3369d3f9b1
commit
56812d3861
@@ -0,0 +1,306 @@
|
||||
/*
|
||||
* Copyright 2013 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.integration.expression;
|
||||
|
||||
import java.util.AbstractMap;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.springframework.expression.EvaluationContext;
|
||||
import org.springframework.expression.Expression;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* An immutable {@link AbstractMap} implementation that wraps a Map<String, Expression>
|
||||
* and evaluates an {@code expression} for the provided {@code key} from the underlying
|
||||
* {@code original} Map.
|
||||
* </p>
|
||||
* <p>
|
||||
* Any mutating operations ({@link #put(String, Object)}, {@link #remove(Object)} etc.)
|
||||
* are not allowed on instances of this class. Mutation can be performed on underlying Map
|
||||
* if it supports it.
|
||||
* </p>
|
||||
* <p>
|
||||
* A {@link ExpressionEvalMapBuilder} must be used to instantiate this class
|
||||
* via its {@link #from(Map)} method:
|
||||
* {@code
|
||||
* ExpressionEvalMap evalMap = ExpressionEvalMap
|
||||
* .from(expressions)
|
||||
.usingCallback(new EvaluationCallback() {
|
||||
Object evaluate(Expression expression) {
|
||||
// return some expression evaluation
|
||||
}
|
||||
})
|
||||
.build();
|
||||
* }
|
||||
* </p>
|
||||
* <p>
|
||||
* Thread-safety depends on the original underlying Map.
|
||||
* Objects of this class are not serializable.
|
||||
* </p>
|
||||
*
|
||||
* @author Artem Bilan
|
||||
* @since 3.0
|
||||
*/
|
||||
public final class ExpressionEvalMap extends AbstractMap<String, Object> {
|
||||
|
||||
public static final EvaluationCallback SIMPLE_CALLBACK = new EvaluationCallback() {
|
||||
|
||||
@Override
|
||||
public Object evaluate(Expression expression) {
|
||||
return expression.getValue();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
private final Map<String, Expression> original;
|
||||
|
||||
private final EvaluationCallback evaluationCallback;
|
||||
|
||||
private ExpressionEvalMap(Map<String, Expression> original, EvaluationCallback evaluationCallback) {
|
||||
this.original = original;
|
||||
this.evaluationCallback = evaluationCallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the {@code value}({@link Expression}) for the provided {@code key}
|
||||
* from {@link #original} and returns the result of evaluation using {@link #evaluationCallback}.
|
||||
*/
|
||||
@Override
|
||||
public Object get(Object key) {
|
||||
Expression expression = original.get(key);
|
||||
if (expression != null) {
|
||||
return this.evaluationCallback.evaluate(expression);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Object> values() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsKey(Object key) {
|
||||
return original.containsKey(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> keySet() {
|
||||
return original.keySet();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return original.isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int size() {
|
||||
return original.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
return original.equals(o);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return original.hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Map.Entry<String, Object>> entrySet() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object put(String key, Object value) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void putAll(Map<? extends String, ? extends Object> m) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsValue(Object value) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object remove(Object key) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
public static ExpressionEvalMapBuilder from(Map<String, Expression> expressions) {
|
||||
return new ExpressionEvalMapBuilder(expressions);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Implementations of this interface can be provided to build 'on demand {@link #get(Object)} logic'
|
||||
* for {@link ExpressionEvalMap}.
|
||||
*/
|
||||
public interface EvaluationCallback {
|
||||
|
||||
Object evaluate(Expression expression);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The {@link EvaluationCallback} implementation which evaluates an expression using
|
||||
* the provided {@code context}, {@code root} and {@code returnType} variables.
|
||||
*/
|
||||
public static class ComponentsEvaluationCallback implements EvaluationCallback {
|
||||
|
||||
private final EvaluationContext context;
|
||||
|
||||
private final Object root;
|
||||
|
||||
private final Class<?> returnType;
|
||||
|
||||
public ComponentsEvaluationCallback(EvaluationContext context, Object root, Class<?> returnType) {
|
||||
this.context = context;
|
||||
this.root = root;
|
||||
this.returnType = returnType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object evaluate(Expression expression) {
|
||||
if (this.context != null) {
|
||||
return expression.getValue(this.context, this.root, this.returnType);
|
||||
}
|
||||
return expression.getValue(this.root, this.returnType);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The builder class to instantiate {@link ExpressionEvalMap}.
|
||||
*/
|
||||
public static final class ExpressionEvalMapBuilder {
|
||||
|
||||
private final Map<String, Expression> expressions;
|
||||
|
||||
private EvaluationCallback evaluationCallback;
|
||||
|
||||
private EvaluationContext context;
|
||||
|
||||
private Object root;
|
||||
|
||||
private Class<?> returnType;
|
||||
|
||||
private final ExpressionEvalMapComponentsBuilder evalMapComponentsBuilder = new ExpressionEvalMapComponentsBuilderImpl();
|
||||
|
||||
private final ExpressionEvalMapFinalBuilder finalBuilder = new ExpressionEvalMapFinalBuilderImpl();
|
||||
|
||||
private ExpressionEvalMapBuilder(Map<String, Expression> expressions) {
|
||||
this.expressions = expressions;
|
||||
}
|
||||
|
||||
public ExpressionEvalMapFinalBuilder usingCallback(EvaluationCallback callback) {
|
||||
this.evaluationCallback = callback;
|
||||
return finalBuilder;
|
||||
}
|
||||
|
||||
public ExpressionEvalMapFinalBuilder usingSimpleCallback() {
|
||||
return this.usingCallback(SIMPLE_CALLBACK);
|
||||
}
|
||||
|
||||
public ExpressionEvalMapComponentsBuilder usingEvaluationContext(EvaluationContext context) {
|
||||
this.context = context;
|
||||
return this.evalMapComponentsBuilder;
|
||||
}
|
||||
|
||||
public ExpressionEvalMapComponentsBuilder withRoot(Object root) {
|
||||
this.root = root;
|
||||
return this.evalMapComponentsBuilder;
|
||||
|
||||
}
|
||||
|
||||
public ExpressionEvalMapComponentsBuilder withReturnType(Class<?> returnType) {
|
||||
this.returnType = returnType;
|
||||
return this.evalMapComponentsBuilder;
|
||||
|
||||
}
|
||||
|
||||
|
||||
private class ExpressionEvalMapFinalBuilderImpl implements ExpressionEvalMapFinalBuilder {
|
||||
|
||||
@Override
|
||||
public ExpressionEvalMap build() {
|
||||
if (evaluationCallback != null) {
|
||||
return new ExpressionEvalMap(expressions, evaluationCallback);
|
||||
}
|
||||
return new ExpressionEvalMap(expressions, new ComponentsEvaluationCallback(context, root, returnType));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
private class ExpressionEvalMapComponentsBuilderImpl extends ExpressionEvalMapFinalBuilderImpl
|
||||
implements ExpressionEvalMapComponentsBuilder {
|
||||
|
||||
@Override
|
||||
public ExpressionEvalMapComponentsBuilder usingEvaluationContext(EvaluationContext context) {
|
||||
return ExpressionEvalMapBuilder.this.usingEvaluationContext(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpressionEvalMapComponentsBuilder withRoot(Object root) {
|
||||
return ExpressionEvalMapBuilder.this.withRoot(root);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpressionEvalMapComponentsBuilder withReturnType(Class<?> returnType) {
|
||||
return ExpressionEvalMapBuilder.this.withReturnType(returnType);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public interface ExpressionEvalMapFinalBuilder {
|
||||
|
||||
ExpressionEvalMap build();
|
||||
|
||||
}
|
||||
|
||||
|
||||
public interface ExpressionEvalMapComponentsBuilder extends ExpressionEvalMapFinalBuilder {
|
||||
|
||||
ExpressionEvalMapComponentsBuilder usingEvaluationContext(EvaluationContext context);
|
||||
|
||||
ExpressionEvalMapComponentsBuilder withRoot(Object root);
|
||||
|
||||
ExpressionEvalMapComponentsBuilder withReturnType(Class<?> returnType);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -48,6 +48,7 @@ import org.springframework.integration.Message;
|
||||
import org.springframework.integration.MessageHandlingException;
|
||||
import org.springframework.integration.MessagingException;
|
||||
import org.springframework.integration.core.MessageHandler;
|
||||
import org.springframework.integration.expression.ExpressionEvalMap;
|
||||
import org.springframework.integration.expression.ExpressionUtils;
|
||||
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
|
||||
import org.springframework.integration.http.support.DefaultHttpHeaderMapper;
|
||||
@@ -63,7 +64,6 @@ 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
|
||||
@@ -339,33 +339,24 @@ 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 (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);
|
||||
|
||||
if (!this.shouldIncludeRequestBody(httpMethod) && this.extractPayloadExplicitlySet){
|
||||
if (logger.isWarnEnabled()){
|
||||
logger.warn("The 'extractPayload' attribute has no relevance for the current request since the HTTP Method is '" +
|
||||
httpMethod + "', and no request body will be sent for that method.");
|
||||
httpMethod + "', and no request body will be sent for that method.");
|
||||
}
|
||||
}
|
||||
|
||||
Class<?> expectedResponseType = this.determineExpectedResponseType(requestMessage);
|
||||
|
||||
HttpEntity<?> httpRequest = this.generateHttpRequest(requestMessage, httpMethod);
|
||||
Map<String, Object> uriVariables = ExpressionEvalMap
|
||||
.from(this.uriVariableExpressions)
|
||||
.usingEvaluationContext(this.evaluationContext)
|
||||
.withRoot(requestMessage)
|
||||
.build();
|
||||
UriComponents uriComponents = UriComponentsBuilder.fromUriString(uri).buildAndExpand(uriVariables);
|
||||
URI realUri = this.encodeUri ? uriComponents.toUri() : new URI(uriComponents.toUriString());
|
||||
ResponseEntity<?> httpResponse = this.restTemplate.exchange(realUri, httpMethod, httpRequest, expectedResponseType);
|
||||
@@ -564,6 +555,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
|
||||
return HttpMethod.valueOf(strHttpMethod);
|
||||
}
|
||||
|
||||
|
||||
private Class<?> determineExpectedResponseType(Message<?> requestMessage) throws Exception{
|
||||
Class<?> expectedResponseType = null;
|
||||
String expectedResponseTypeName = null;
|
||||
@@ -574,5 +566,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
|
||||
expectedResponseType = ClassUtils.forName(expectedResponseTypeName, ClassUtils.getDefaultClassLoader());
|
||||
}
|
||||
return expectedResponseType;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user