This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch yaml-ns in repository https://gitbox.apache.org/repos/asf/camel.git
commit 77e5ba0f010c937ffc84d3856a4f0e7387e72d0e Author: Claus Ibsen <[email protected]> AuthorDate: Mon Nov 11 11:07:02 2024 +0100 CAMEL-21420: camel-xml-io: Parser should handle default Camel namespace better. --- .../java/org/apache/camel/model/language/NamespaceAwareExpression.java | 2 +- .../src/test/java/org/apache/camel/xml/out/ModelWriterTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java index 5dd263e5365..891059bd175 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java @@ -81,7 +81,7 @@ public abstract class NamespaceAwareExpression extends SingleInputTypedExpressio } public List<PropertyDefinition> getNamespace() { - if (namespace == null && namespaces != null && !namespaces.isEmpty()) { + if (namespace == null && namespaces != null && !namespaces.isEmpty()) { namespace = new ArrayList<>(); namespaces.forEach((k, v) -> namespace.add(new PropertyDefinition(k, v))); } diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java index d9e38f81507..afdafe6dce7 100644 --- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java +++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java @@ -51,11 +51,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.w3c.dom.Node; import org.xmlunit.assertj3.XmlAssert; import org.xmlunit.diff.DefaultNodeMatcher; import org.xmlunit.diff.ElementSelectors; -import org.xmlunit.util.Predicate; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
