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:04 UTC
[camel] branch main updated (68956719125 -> bba65f2cb2f)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 68956719125 Regen for commit 4b258ec710902454492d5d848f33b1b920d8a47d
new 79ada1bf260 (chores) camel-core-languages: cleanup code duplications
new b4a76830056 (chores) camel-xml-jaxb: cleanup code duplications
new bba65f2cb2f (chores) camel-support: cleanup code duplications
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/language/csimple/CSimpleHelper.java | 26 ++++++-----------
.../org/apache/camel/support/MessageHelper.java | 30 +++++++++-----------
.../java/org/apache/camel/xml/jaxb/JaxbHelper.java | 33 +++++++++-------------
3 files changed, 36 insertions(+), 53 deletions(-)
[camel] 01/03: (chores) camel-core-languages: cleanup code duplications
Posted by or...@apache.org.
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 79ada1bf260e4515c3d3cd2b5098a968cabd1f75
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue May 16 15:13:19 2023 +0200
(chores) camel-core-languages: cleanup code duplications
---
.../camel/language/csimple/CSimpleHelper.java | 26 ++++++++--------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index e96c68b9c2b..73b96c166a8 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -84,21 +84,9 @@ public final class CSimpleHelper {
}
public static <T> T bodyAsIndex(Message message, Class<T> type, String key) {
- Object obj = message.getBody();
+ final Object obj = message.getBody();
// try key as-is as it may be using dots or something that valid
- Object objKey = doObjectAsIndex(message.getExchange().getContext(), obj, key);
- if (objKey != null && objKey != obj) {
- return type.cast(objKey);
- }
- // the key may contain multiple keys ([0][foo]) so we need to walk these keys
- List<String> keys = OgnlHelper.splitOgnl(key);
- for (String k : keys) {
- if (k.startsWith("[") && k.endsWith("]")) {
- k = StringHelper.between(k, "[", "]");
- }
- obj = doObjectAsIndex(message.getExchange().getContext(), obj, k);
- }
- return type.cast(obj);
+ return tryCast(message.getExchange().getContext(), type, key, obj);
}
public static <T> T mandatoryBodyAsIndex(Message message, Class<T> type, int key) throws InvalidPayloadException {
@@ -126,9 +114,13 @@ public final class CSimpleHelper {
}
public static <T> T headerAsIndex(Message message, Class<T> type, String name, String key) {
- Object obj = message.getHeader(name);
+ final Object obj = message.getHeader(name);
// try key as-is as it may be using dots or something that valid
- Object objKey = doObjectAsIndex(message.getExchange().getContext(), obj, key);
+ return tryCast(message.getExchange().getContext(), type, key, obj);
+ }
+
+ private static <T> T tryCast(CamelContext context, Class<T> type, String key, Object obj) {
+ final Object objKey = doObjectAsIndex(context, obj, key);
if (objKey != null && objKey != obj) {
return type.cast(objKey);
}
@@ -138,7 +130,7 @@ public final class CSimpleHelper {
if (k.startsWith("[") && k.endsWith("]")) {
k = StringHelper.between(k, "[", "]");
}
- obj = doObjectAsIndex(message.getExchange().getContext(), obj, k);
+ obj = doObjectAsIndex(context, obj, k);
}
return type.cast(obj);
}
[camel] 03/03: (chores) camel-support: cleanup code duplications
Posted by or...@apache.org.
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 bba65f2cb2fb92b7b566f17baf25ed42c41f8c98
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue May 16 15:19:19 2023 +0200
(chores) camel-support: cleanup code duplications
---
.../org/apache/camel/support/MessageHelper.java | 30 ++++++++++------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
index b45106f8eb6..e76322ff8f7 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
@@ -179,14 +179,7 @@ public final class MessageHelper {
* @see org.apache.camel.Exchange#LOG_DEBUG_BODY_MAX_CHARS
*/
public static String extractValueForLogging(Object value, Message message) {
- boolean streams = false;
- if (message.getExchange() != null) {
- String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
- if (globalOption != null) {
- streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(),
- globalOption);
- }
- }
+ boolean streams = isStreams(message);
// default to 1000 chars
int maxChars = 1000;
@@ -201,6 +194,18 @@ public final class MessageHelper {
return extractValueForLogging(value, message, streams, false, maxChars);
}
+ private static boolean isStreams(Message message) {
+ boolean streams = false;
+ if (message.getExchange() != null) {
+ String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
+ if (globalOption != null) {
+ streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(),
+ globalOption);
+ }
+ }
+ return streams;
+ }
+
/**
* Extracts the body for logging purpose.
* <p/>
@@ -213,14 +218,7 @@ public final class MessageHelper {
* @see org.apache.camel.Exchange#LOG_DEBUG_BODY_MAX_CHARS
*/
public static String extractBodyForLogging(Message message, String prepend) {
- boolean streams = false;
- if (message.getExchange() != null) {
- String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
- if (globalOption != null) {
- streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(),
- globalOption);
- }
- }
+ boolean streams = isStreams(message);
return extractBodyForLogging(message, prepend, streams, false);
}
[camel] 02/03: (chores) camel-xml-jaxb: cleanup code duplications
Posted by or...@apache.org.
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);