This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit fd1e7cb5a737380a252376b8a82c83d93a5e3e2e Author: Claus Ibsen <[email protected]> AuthorDate: Tue Apr 27 14:03:54 2021 +0200 CAMEL-16477: camel-core - ProcessorDefinitionHelper: ruturn a collection instead of an iterator for filterTypeInOutputs methods --- .../jaxb/definition/CreateModelFromXmlTest.java | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java index 1a11ab5..c5d4991 100644 --- a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java +++ b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java @@ -17,7 +17,7 @@ package org.apache.camel.dsl.xml.jaxb.definition; import java.io.InputStream; -import java.util.Iterator; +import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; @@ -104,23 +104,24 @@ public class CreateModelFromXmlTest extends ContextTestSupport { private void assertNamespacesPresent(RoutesDefinition routesDefinition, Map<String, String> expectedNamespaces) { for (RouteDefinition route : routesDefinition.getRoutes()) { - Iterator<ExpressionNode> it = filterTypeInOutputs(route.getOutputs(), ExpressionNode.class); - if (it.hasNext()) { - ExpressionNode en = it.next(); - ExpressionDefinition ed = en.getExpression(); - - NamespaceAware na = null; - Expression exp = ed.getExpressionValue(); - if (exp instanceof NamespaceAware) { - na = (NamespaceAware) exp; - } else if (ed instanceof NamespaceAware) { - na = (NamespaceAware) ed; - } - - assertNotNull(na); - assertEquals(expectedNamespaces, na.getNamespaces()); - } else { + Collection<ExpressionNode> col = filterTypeInOutputs(route.getOutputs(), ExpressionNode.class); + if (col.isEmpty()) { fail("Expected to find at least one ExpressionNode in route"); + } else { + for (ExpressionNode en : col) { + ExpressionDefinition ed = en.getExpression(); + + NamespaceAware na = null; + Expression exp = ed.getExpressionValue(); + if (exp instanceof NamespaceAware) { + na = (NamespaceAware) exp; + } else if (ed instanceof NamespaceAware) { + na = (NamespaceAware) ed; + } + + assertNotNull(na); + assertEquals(expectedNamespaces, na.getNamespaces()); + } } } }
