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 8e5b6e0d92c8fc3f0b9b7c62eb65f893d2856971
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Feb 3 07:12:15 2023 +0100
Remove some of the xstream leftovers in json data formats
---
.../apache/camel/catalog/dataformats/jackson.json | 4 +-
.../org/apache/camel/catalog/models/json.json | 3 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 15 +------
.../apache/camel/component/jackson/jackson.json | 4 +-
.../src/main/docs/jackson-dataformat.adoc | 2 +-
.../camel/component/jackson/JacksonDataFormat.java | 4 +-
.../org/apache/camel/model/dataformat/json.json | 3 +-
.../camel/model/dataformat/JsonDataFormat.java | 51 +---------------------
.../reifier/dataformat/JsonDataFormatReifier.java | 3 --
.../java/org/apache/camel/xml/in/ModelParser.java | 1 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 ---
.../generated/resources/schema/camel-yaml-dsl.json | 3 --
.../generated/resources/schema/camelYamlDsl.json | 3 --
13 files changed, 13 insertions(+), 89 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json
index 60a19f907ee..a4deb7f0ee8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json
@@ -3,7 +3,7 @@
"kind": "dataformat",
"name": "jackson",
"title": "JSON Jackson",
- "description": "Marshal POJOs to JSON and back using Jackson",
+ "description": "Marshal POJOs to JSON and back using Jackson.",
"deprecated": false,
"firstVersion": "2.0.0",
"label": "dataformat,transformation,json",
@@ -31,7 +31,7 @@
"enableFeatures": { "kind": "attribute", "displayName": "Enable Features",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, [...]
"disableFeatures": { "kind": "attribute", "displayName": "Disable
Features", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeatur [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow
Unmarshall Type", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If enabled then Jackson is allowed to
attempt to use the CamelJacksonUnmarshalType header during the unmarshalling.
This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson, fastjson and xstream." },
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson and fastjson." },
"schemaResolver": { "kind": "attribute", "displayName": "Schema Resolver",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Optional schema resolver used to lookup schemas for the data in
transit." },
"autoDiscoverSchemaResolver": { "kind": "attribute", "displayName": "Auto
Discover Schema Resolver", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "When not
disabled, the SchemaResolver will be looked up into the registry" },
"namingStrategy": { "kind": "attribute", "displayName": "Naming Strategy",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "If
set then Jackson will use the the defined Property Naming Strategy.Possible
values are: LOWER_CAMEL_CASE, LOWER_DOT_CASE, LOWER_CASE, KEBAB_CASE,
SNAKE_CASE and UPPER_CAMEL_CASE" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
index df79bce3d96..965257a9e2f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/json.json
@@ -29,8 +29,7 @@
"disableFeatures": { "kind": "attribute", "displayName": "Disable
Features", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeatur [...]
"permissions": { "kind": "attribute", "displayName": "Permissions",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Adds permissions that controls which Java packages and classes
XStream is allowed to use during unmarshal from xml\/json to Java beans. A
permission must be configured either here or globally using a JVM system
property. The permission can be specified in [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow
Unmarshall Type", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If enabled then Jackson is allowed to
attempt to use the CamelJacksonUnmarshalType header during the unmarshalling.
This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson, fastjson and xstream." },
- "dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether XStream will drop the root node
in the generated JSon. You may want to enable this when using POJOs; as then
the written object will include the class name as root node, which is often not
intended to be written in the [...]
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson and fastjson." },
"schemaResolver": { "kind": "attribute", "displayName": "Schema Resolver",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Optional schema resolver used to lookup schemas for the data in
transit." },
"autoDiscoverSchemaResolver": { "kind": "attribute", "displayName": "Auto
Discover Schema Resolver", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "When not
disabled, the SchemaResolver will be looked up into the registry" },
"namingStrategy": { "kind": "attribute", "displayName": "Naming Strategy",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "If
set then Jackson will use the the defined Property Naming Strategy.Possible
values are: LOWER_CAMEL_CASE, LOWER_DOT_CASE, LOWER_CASE, KEBAB_CASE,
SNAKE_CASE and UPPER_CAMEL_CASE" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index eb1b11b9fae..e65bb48c4ce 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -10059,19 +10059,8 @@ enabled when desired to be used. Default value: false
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
If set then Jackson will use the Timezone when marshalling/unmarshalling. This
-option will have no effect on the others Json DataFormat, like gson, fastjson
-and xstream.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="dropRootNode" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether XStream will drop the root node in the generated JSon. You may want to
-enable this when using POJOs; as then the written object will include the class
-name as root node, which is often not intended to be written in the JSON
output.
-Default value: false
+option will have no effect on the others Json DataFormat, like gson and
+fastjson.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
diff --git
a/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/jackson.json
b/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/jackson.json
index 60a19f907ee..a4deb7f0ee8 100644
---
a/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/jackson.json
+++
b/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/jackson.json
@@ -3,7 +3,7 @@
"kind": "dataformat",
"name": "jackson",
"title": "JSON Jackson",
- "description": "Marshal POJOs to JSON and back using Jackson",
+ "description": "Marshal POJOs to JSON and back using Jackson.",
"deprecated": false,
"firstVersion": "2.0.0",
"label": "dataformat,transformation,json",
@@ -31,7 +31,7 @@
"enableFeatures": { "kind": "attribute", "displayName": "Enable Features",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, [...]
"disableFeatures": { "kind": "attribute", "displayName": "Disable
Features", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeatur [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow
Unmarshall Type", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If enabled then Jackson is allowed to
attempt to use the CamelJacksonUnmarshalType header during the unmarshalling.
This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson, fastjson and xstream." },
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson and fastjson." },
"schemaResolver": { "kind": "attribute", "displayName": "Schema Resolver",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Optional schema resolver used to lookup schemas for the data in
transit." },
"autoDiscoverSchemaResolver": { "kind": "attribute", "displayName": "Auto
Discover Schema Resolver", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "When not
disabled, the SchemaResolver will be looked up into the registry" },
"namingStrategy": { "kind": "attribute", "displayName": "Naming Strategy",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "If
set then Jackson will use the the defined Property Naming Strategy.Possible
values are: LOWER_CAMEL_CASE, LOWER_DOT_CASE, LOWER_CASE, KEBAB_CASE,
SNAKE_CASE and UPPER_CAMEL_CASE" },
diff --git a/components/camel-jackson/src/main/docs/jackson-dataformat.adoc
b/components/camel-jackson/src/main/docs/jackson-dataformat.adoc
index 0f96603425d..9646bda3169 100644
--- a/components/camel-jackson/src/main/docs/jackson-dataformat.adoc
+++ b/components/camel-jackson/src/main/docs/jackson-dataformat.adoc
@@ -2,7 +2,7 @@
:doctitle: JSON Jackson
:shortname: jackson
:artifactid: camel-jackson
-:description: Marshal POJOs to JSON and back using Jackson
+:description: Marshal POJOs to JSON and back using Jackson.
:since: 2.0
:supportlevel: Stable
//Manually maintained attributes
diff --git
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index 092767524ee..d4243c5751e 100644
---
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -21,10 +21,10 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Dataformat;
/**
- * Marshal POJOs to JSON and back using <a
href="https://github.com/FasterXML/jackson";>Jackson</a>
+ * Marshal POJOs to JSON and back using Jackson.
*/
@Dataformat("jackson")
-@Metadata(excludeProperties = "library,permissions,dropRootNode")
+@Metadata(excludeProperties = "library,permissions")
public class JacksonDataFormat extends AbstractJacksonDataFormat {
/**
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
index df79bce3d96..965257a9e2f 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/json.json
@@ -29,8 +29,7 @@
"disableFeatures": { "kind": "attribute", "displayName": "Disable
Features", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeatur [...]
"permissions": { "kind": "attribute", "displayName": "Permissions",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Adds permissions that controls which Java packages and classes
XStream is allowed to use during unmarshal from xml\/json to Java beans. A
permission must be configured either here or globally using a JVM system
property. The permission can be specified in [...]
"allowUnmarshallType": { "kind": "attribute", "displayName": "Allow
Unmarshall Type", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If enabled then Jackson is allowed to
attempt to use the CamelJacksonUnmarshalType header during the unmarshalling.
This should only be enabled when desired to be used." },
- "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson, fastjson and xstream." },
- "dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether XStream will drop the root node
in the generated JSon. You may want to enable this when using POJOs; as then
the written object will include the class name as root node, which is often not
intended to be written in the [...]
+ "timezone": { "kind": "attribute", "displayName": "Timezone", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson and fastjson." },
"schemaResolver": { "kind": "attribute", "displayName": "Schema Resolver",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Optional schema resolver used to lookup schemas for the data in
transit." },
"autoDiscoverSchemaResolver": { "kind": "attribute", "displayName": "Auto
Discover Schema Resolver", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "When not
disabled, the SchemaResolver will be looked up into the registry" },
"namingStrategy": { "kind": "attribute", "displayName": "Naming Strategy",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "If
set then Jackson will use the the defined Property Naming Strategy.Possible
values are: LOWER_CAMEL_CASE, LOWER_DOT_CASE, LOWER_CASE, KEBAB_CASE,
SNAKE_CASE and UPPER_CAMEL_CASE" },
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index ac9f941da0e..67b5fdda2b8 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -94,9 +94,6 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
@Metadata(label = "advanced")
private String timezone;
@XmlAttribute
- @Metadata(label = "advanced", javaType = "java.lang.Boolean", defaultValue
= "false")
- private String dropRootNode;
- @XmlAttribute
@Metadata(label = "advanced")
private String schemaResolver;
@XmlAttribute
@@ -144,7 +141,6 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
this.permissions = builder.permissions;
this.allowUnmarshallType = builder.allowUnmarshallType;
this.timezone = builder.timezone;
- this.dropRootNode = builder.dropRootNode;
this.schemaResolver = builder.schemaResolver;
this.autoDiscoverSchemaResolver = builder.autoDiscoverSchemaResolver;
this.namingStrategy = builder.namingStrategy;
@@ -430,7 +426,7 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
/**
* If set then Jackson will use the Timezone when
marshalling/unmarshalling. This option will have no effect on the
- * others Json DataFormat, like gson, fastjson and xstream.
+ * others Json DataFormat, like gson and fastjson.
*/
public void setTimezone(String timezone) {
this.timezone = timezone;
@@ -447,19 +443,6 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
this.autoDiscoverObjectMapper = autoDiscoverObjectMapper;
}
- public String getDropRootNode() {
- return dropRootNode;
- }
-
- /**
- * Whether XStream will drop the root node in the generated JSon. You may
want to enable this when using POJOs; as
- * then the written object will include the class name as root node, which
is often not intended to be written in
- * the JSON output.
- */
- public void setDropRootNode(String dropRootNode) {
- this.dropRootNode = dropRootNode;
- }
-
/**
* Optional schema resolver used to lookup schemas for the data in transit.
*/
@@ -622,15 +605,6 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
return this;
}
- public JsonDataFormat dropRootNode(boolean dropRootNode) {
- return dropRootNode(Boolean.toString(dropRootNode));
- }
-
- public JsonDataFormat dropRootNode(String dropRootNode) {
- this.dropRootNode = dropRootNode;
- return this;
- }
-
public JsonDataFormat namingStrategy(String namingStrategy) {
this.namingStrategy = namingStrategy;
return this;
@@ -663,7 +637,6 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
private String permissions;
private String allowUnmarshallType;
private String timezone;
- private String dropRootNode;
private String schemaResolver;
private String autoDiscoverSchemaResolver;
private String namingStrategy;
@@ -922,7 +895,7 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
/**
* If set then Jackson will use the Timezone when
marshalling/unmarshalling. This option will have no effect on
- * the others Json DataFormat, like gson, fastjson and xstream.
+ * the others Json DataFormat, like gson and fastjson.
*/
public Builder timezone(String timezone) {
this.timezone = timezone;
@@ -945,26 +918,6 @@ public class JsonDataFormat extends DataFormatDefinition
implements ContentTypeH
return this;
}
- /**
- * Whether XStream will drop the root node in the generated JSon. You
may want to enable this when using POJOs;
- * as then the written object will include the class name as root
node, which is often not intended to be
- * written in the JSON output.
- */
- public Builder dropRootNode(String dropRootNode) {
- this.dropRootNode = dropRootNode;
- return this;
- }
-
- /**
- * Whether XStream will drop the root node in the generated JSon. You
may want to enable this when using POJOs;
- * as then the written object will include the class name as root
node, which is often not intended to be
- * written in the JSON output.
- */
- public Builder dropRootNode(boolean dropRootNode) {
- this.dropRootNode = Boolean.toString(dropRootNode);
- return this;
- }
-
/**
* Optional schema resolver used to lookup schemas for the data in
transit.
*/
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
index ed584fb3228..7bbfb85db04 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
@@ -59,9 +59,6 @@ public class JsonDataFormatReifier extends
DataFormatReifier<JsonDataFormat> {
properties.put("enableFeatures", definition.getEnableFeatures());
properties.put("disableFeatures", definition.getDisableFeatures());
properties.put("allowUnmarshallType",
definition.getAllowUnmarshallType());
- if (definition.getLibrary() == JsonLibrary.XStream) {
- properties.put("dropRootNode", definition.getDropRootNode());
- }
if (definition.getLibrary() == JsonLibrary.XStream &&
definition.getPermissions() == null) {
// if we have the unmarshal type, but no permission set, then use
it to be allowed
String type = definition.getUnmarshalTypeName();
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index ecec40cae6b..a7eccace2f5 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -2195,7 +2195,6 @@ public class ModelParser extends BaseParser {
case "collectionType": def.setCollectionTypeName(val); break;
case "contentTypeHeader": def.setContentTypeHeader(val); break;
case "disableFeatures": def.setDisableFeatures(val); break;
- case "dropRootNode": def.setDropRootNode(val); break;
case "enableFeatures": def.setEnableFeatures(val); break;
case "include": def.setInclude(val); break;
case "jsonView": def.setJsonViewTypeName(val); break;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 3aa4cb8e5ca..a501feee39b 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -7346,7 +7346,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "collection-type", type = "string"),
@YamlProperty(name = "content-type-header", type =
"boolean"),
@YamlProperty(name = "disable-features", type = "string"),
- @YamlProperty(name = "drop-root-node", type = "boolean"),
@YamlProperty(name = "enable-features", type = "string"),
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "include", type = "string"),
@@ -7414,11 +7413,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setDisableFeatures(val);
break;
}
- case "drop-root-node": {
- String val = asText(node);
- target.setDropRootNode(val);
- break;
- }
case "enable-features": {
String val = asText(node);
target.setEnableFeatures(val);
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index 798cbd30ac7..6af7e948c74 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -5210,9 +5210,6 @@
"disable-features" : {
"type" : "string"
},
- "drop-root-node" : {
- "type" : "boolean"
- },
"enable-features" : {
"type" : "string"
},
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 533dc3b4b7e..b794a8d4c3a 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -5114,9 +5114,6 @@
"disableFeatures" : {
"type" : "string"
},
- "dropRootNode" : {
- "type" : "boolean"
- },
"enableFeatures" : {
"type" : "string"
},
