You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/05/16 14:38:06 UTC
[camel] 02/03: (chores) camel-xml-jaxb: cleanup code duplications
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b4a76830056f6071056b1b477e3420c7b3f62942
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue May 16 15:16:31 2023 +0200
(chores) camel-xml-jaxb: cleanup code duplications
---
.../java/org/apache/camel/xml/jaxb/JaxbHelper.java | 33 +++++++++-------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java
index d54eb37e9a9..8cfba8da20b 100644
--- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java
+++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbHelper.java
@@ -277,11 +277,7 @@ public final class JaxbHelper {
JAXBContext jaxbContext = getJAXBContext(context);
- Map<String, String> namespaces = new LinkedHashMap<>();
- extractNamespaces(dom, namespaces);
- if (!namespaces.containsValue(CAMEL_NS)) {
- addNamespaceToDom(dom);
- }
+ Map<String, String> namespaces = doExtractNamespaces(dom);
Binder<Node> binder = jaxbContext.createBinder();
Object result = binder.unmarshal(dom);
@@ -318,11 +314,7 @@ public final class JaxbHelper {
JAXBContext jaxbContext = getJAXBContext(context);
- Map<String, String> namespaces = new LinkedHashMap<>();
- extractNamespaces(dom, namespaces);
- if (!namespaces.containsValue(CAMEL_NS)) {
- addNamespaceToDom(dom);
- }
+ Map<String, String> namespaces = doExtractNamespaces(dom);
Binder<Node> binder = jaxbContext.createBinder();
Object result = binder.unmarshal(dom);
@@ -359,11 +351,7 @@ public final class JaxbHelper {
JAXBContext jaxbContext = getJAXBContext(context);
- Map<String, String> namespaces = new LinkedHashMap<>();
- extractNamespaces(dom, namespaces);
- if (!namespaces.containsValue(CAMEL_NS)) {
- addNamespaceToDom(dom);
- }
+ Map<String, String> namespaces = doExtractNamespaces(dom);
Binder<Node> binder = jaxbContext.createBinder();
Object result = binder.unmarshal(dom);
@@ -392,6 +380,15 @@ public final class JaxbHelper {
return answer;
}
+ private static Map<String, String> doExtractNamespaces(Document dom) {
+ Map<String, String> namespaces = new LinkedHashMap<>();
+ extractNamespaces(dom, namespaces);
+ if (!namespaces.containsValue(CAMEL_NS)) {
+ addNamespaceToDom(dom);
+ }
+ return namespaces;
+ }
+
/**
* Un-marshals the content of the input stream to an instance of {@link TemplatedRoutesDefinition}.
*
@@ -408,11 +405,7 @@ public final class JaxbHelper {
JAXBContext jaxbContext = getJAXBContext(context);
- Map<String, String> namespaces = new LinkedHashMap<>();
- extractNamespaces(dom, namespaces);
- if (!namespaces.containsValue(CAMEL_NS)) {
- addNamespaceToDom(dom);
- }
+ doExtractNamespaces(dom);
Binder<Node> binder = jaxbContext.createBinder();
Object result = binder.unmarshal(dom);