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

Fix BeanFactory propagation for MMInvokerHelper (#2694)

Browse Source 
* Fix BeanFactory propagation for MMInvokerHelper

* Remove check for `null` in the
`MessagingMethodInvokerHelper.isProvidedMessageHandlerFactoryBean()`
* Fix `RecipientListRouter` for `BeanFactory` propagation to the
`Recipient.selector`
* Fix tests for `BeanFactory` population and propagation
* Add `errorChannel` into the `TestUtils.createTestApplicationContext()`
* Fix some Sonar smell, including new reported

* * Restore NPE check for the `BeanFactory` in the
`MessagingMethodInvokerHelper` to avoid breaking changes in the current
point release
* Some other polishing and optimizations in the
`MessagingMethodInvokerHelper`
This commit is contained in:
Artem Bilan
2019-01-15 15:16:33 -05:00
committed by Gary Russell
parent 63684e2012
commit eed16f02ca
47 changed files with 1164 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java
View File

@@ -62,12 +62,12 @@ public final class XPathUtils {
private static final List<String> RESULT_TYPES =
Arrays.asList(STRING, BOOLEAN, NUMBER, NODE, NODE_LIST, DOCUMENT_LIST);
private static final XmlPayloadConverter converter = new DefaultXmlPayloadConverter();
private static final XmlPayloadConverter CONVERTER = new DefaultXmlPayloadConverter();
private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance();
private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactoryUtils.newInstance();
static {
documentBuilderFactory.setNamespaceAware(true);
DOCUMENT_BUILDER_FACTORY.setNamespaceAware(true);
}
/**
@@ -97,7 +97,7 @@ public final class XPathUtils {
}
XPathExpression expression = XPathExpressionFactory.createXPathExpression(xpath);
Node node = converter.convertToNode(object);
Node node = CONVERTER.convertToNode(object);
if (resultType == null) {
return (T) expression.evaluateAsString(node);
@@ -111,7 +111,7 @@ public final class XPathUtils {
List<Node> nodeList = (List<Node>) XPathEvaluationType.NODE_LIST_RESULT.evaluateXPath(expression,
node);
try {
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
DocumentBuilder documentBuilder = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder();
List<Node> documents = new ArrayList<>(nodeList.size());
for (Node n : nodeList) {
Document document = documentBuilder.newDocument();