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
The following commit(s) were added to refs/heads/main by this push:
new b653045ed410 camel-jacksonxml, camel-jackson3xml: one global option,
two public constants, and each side uses a different one (#29960)
b653045ed410 is described below
commit b653045ed4103aed3ae53710a7cae2726eeb540a
Author: dhairya05 <[email protected]>
AuthorDate: Sun Nov 15 12:50:58 2026 +0530
camel-jacksonxml, camel-jackson3xml: one global option, two public
constants, and each side uses a different one (#29960)
camel-jacksonxml, camel-jackson3xml: read the global option under the name
the tests and the other Jackson components use
JacksonXMLConstants declares two constants for one value:
public static final String ENABLE_TYPE_CONVERTER =
"CamelJacksonXmlEnableTypeConverter";
public static final String ENABLE_XML_TYPE_CONVERTER =
"CamelJacksonXmlEnableTypeConverter";
and the two sides of the feature pick different ones. The fallback
converter reads ENABLE_XML_TYPE_CONVERTER, while both tests that turn it
on - JacksonConversionsTest and JacksonConversionsSimpleTest - put
ENABLE_TYPE_CONVERTER into the global options. It works only because the
two constants hold the same string.
ENABLE_TYPE_CONVERTER is the name camel-jackson and camel-jackson3 use
for the same switch, so keep it and deprecate the XML-only duplicate.
The converter now reads ENABLE_TYPE_CONVERTER. The global option name is
unchanged, so nothing a route sets has to change.
camel-jacksonxml, camel-jackson3xml: add since to @Deprecated and link the
replacement
Review feedback: Camel uses @Deprecated(since = "X.Y.Z"), and a
{@link} to the replacement constant gives IDE navigation.
---
.../org/apache/camel/component/jackson3xml/JacksonXMLConstants.java | 5 +++++
.../component/jackson3xml/converter/JacksonXMLTypeConverters.java | 2 +-
.../org/apache/camel/component/jacksonxml/JacksonXMLConstants.java | 5 +++++
.../component/jacksonxml/converter/JacksonXMLTypeConverters.java | 2 +-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/JacksonXMLConstants.java
b/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/JacksonXMLConstants.java
index 7db3021cba41..b22099c76ce8 100644
---
a/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/JacksonXMLConstants.java
+++
b/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/JacksonXMLConstants.java
@@ -20,6 +20,11 @@ public final class JacksonXMLConstants {
public static final String ENABLE_TYPE_CONVERTER =
"CamelJacksonXmlEnableTypeConverter";
+ /**
+ * @deprecated Use {@link #ENABLE_TYPE_CONVERTER} instead: a duplicate
holding the same value, while that is the
+ * name the other Jackson components use.
+ */
+ @Deprecated(since = "4.24.0")
public static final String ENABLE_XML_TYPE_CONVERTER =
"CamelJacksonXmlEnableTypeConverter";
public static final String UNMARSHAL_TYPE = "CamelJacksonXmlUnmarshalType";
diff --git
a/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/converter/JacksonXMLTypeConverters.java
b/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/converter/JacksonXMLTypeConverters.java
index be4a3fc5449d..30f255f6786a 100644
---
a/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/converter/JacksonXMLTypeConverters.java
+++
b/components/camel-jackson3xml/src/main/java/org/apache/camel/component/jackson3xml/converter/JacksonXMLTypeConverters.java
@@ -43,7 +43,7 @@ public final class JacksonXMLTypeConverters {
// only do this if enabled
if (!init && exchange != null) {
// init to see if this is enabled
- String text =
exchange.getContext().getGlobalOptions().get(JacksonXMLConstants.ENABLE_XML_TYPE_CONVERTER);
+ String text =
exchange.getContext().getGlobalOptions().get(JacksonXMLConstants.ENABLE_TYPE_CONVERTER);
enabled = "true".equalsIgnoreCase(text);
init = true;
}
diff --git
a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java
b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java
index 310c43dbc911..1f6b08b16fd6 100644
---
a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java
+++
b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLConstants.java
@@ -20,6 +20,11 @@ public final class JacksonXMLConstants {
public static final String ENABLE_TYPE_CONVERTER =
"CamelJacksonXmlEnableTypeConverter";
+ /**
+ * @deprecated Use {@link #ENABLE_TYPE_CONVERTER} instead: a duplicate
holding the same value, while that is the
+ * name the other Jackson components use.
+ */
+ @Deprecated(since = "4.24.0")
public static final String ENABLE_XML_TYPE_CONVERTER =
"CamelJacksonXmlEnableTypeConverter";
public static final String UNMARSHAL_TYPE = "CamelJacksonXmlUnmarshalType";
diff --git
a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java
b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java
index 618503398fe7..7863a74a5ac7 100644
---
a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java
+++
b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/converter/JacksonXMLTypeConverters.java
@@ -43,7 +43,7 @@ public final class JacksonXMLTypeConverters {
// only do this if enabled
if (!init && exchange != null) {
// init to see if this is enabled
- String text =
exchange.getContext().getGlobalOptions().get(JacksonXMLConstants.ENABLE_XML_TYPE_CONVERTER);
+ String text =
exchange.getContext().getGlobalOptions().get(JacksonXMLConstants.ENABLE_TYPE_CONVERTER);
enabled = "true".equalsIgnoreCase(text);
init = true;
}