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 943633931bc4c6a6a2bc2382f1c8abdd8c6050d9 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Jan 12 11:38:46 2023 +0100 CAMEL-18891: Remove camel-xstream --- .../apache/camel/catalog/models/dataFormats.json | 2 +- .../org/apache/camel/catalog/models/marshal.json | 2 +- .../org/apache/camel/catalog/models/unmarshal.json | 2 +- .../org/apache/camel/catalog/models/xstream.json | 28 ----- .../apache/camel/catalog/schemas/camel-spring.xsd | 132 --------------------- .../org/apache/camel/main/dataformats.properties | 2 - .../modules/dataformats/examples/json/xstream.json | 1 - .../dataformats/examples/json/xstreamJson.json | 1 - .../dataformats/pages/xstream-dataformat.adoc | 1 - .../dataformats/pages/xstreamJson-dataformat.adoc | 1 - .../dsl/yaml/deserializers/ModelDeserializers.java | 131 -------------------- .../deserializers/ModelDeserializersResolver.java | 2 - .../generated/resources/schema/camel-yaml-dsl.json | 67 ----------- .../generated/resources/schema/camelYamlDsl.json | 67 ----------- 14 files changed, 3 insertions(+), 436 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json index f3512e463ec..78ab2a10f56 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json @@ -12,6 +12,6 @@ "output": false }, "properties": { - "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarF [...] + "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarF [...] } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json index c290002203d..51761863692 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] + "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] "disabled": { "kind": "attribute", "displayName": "Disabled", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json index 45dccff325a..a4e367d41f3 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] + "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "tarFile", "t [...] "allowNullBody": { "kind": "attribute", "displayName": "Allow Null Body", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Indicates whether null is allowed as value of a body to unmarshall." }, "disabled": { "kind": "attribute", "displayName": "Disabled", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime." }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xstream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xstream.json deleted file mode 100644 index 0ff73355d4e..00000000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xstream.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "xstream", - "title": "XStream", - "description": "Marshal and unmarshal POJOs to\/from XML using XStream library.", - "deprecated": true, - "firstVersion": "1.3.0", - "label": "dataformat,transformation,xml,json", - "javaType": "org.apache.camel.model.dataformat.XStreamDataFormat", - "abstract": false, - "input": false, - "output": false - }, - "properties": { - "permissions": { "kind": "attribute", "displayName": "Permissions", "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 a syntax where a plus [...] - "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the encoding to use" }, - "driver": { "kind": "attribute", "displayName": "Driver", "label": "advanced", "required": false, "type": "object", "javaType": "com.thoughtworks.xstream.io.HierarchicalStreamDriver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom XStream driver. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver" }, - "driverRef": { "kind": "attribute", "displayName": "Driver Ref", "label": "advanced", "required": false, "type": "object", "javaType": "com.thoughtworks.xstream.io.HierarchicalStreamDriver", "deprecated": false, "autowired": false, "secret": false, "description": "To refer to a custom XStream driver to lookup in the registry. The instance must be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver" }, - "mode": { "kind": "attribute", "displayName": "Mode", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ], "deprecated": false, "autowired": false, "secret": false, "description": "Mode for dealing with duplicate references The possible values are: NO_REFERENCES ID_R [...] - "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" }, - "converters": { "kind": "element", "displayName": "Converters", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "List of class names for using custom XStream converters. The classes must be of type com.thoughtworks.xstream.converters.Converter" }, - "aliases": { "kind": "element", "displayName": "Aliases", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Alias a Class to a shorter name to be used in XML elements." }, - "omitFields": { "kind": "element", "displayName": "Omit Fields", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Prevents a field from being serialized. To omit a field you must always provide the declaring type and not necessarily the type that is converted. Multiple values can be separated by comma." }, - "implicitCollections": { "kind": "element", "displayName": "Implicit Collections", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" } - } -} 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 8426fcf3057..89fe8582557 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 @@ -1965,14 +1965,6 @@ Evaluates an XQuery expressions against an XML payload. </xs:annotation> </xs:element> - <xs:element name="xstream" type="tns:xStreamDataFormat"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Deprecated: Marshal and unmarshal POJOs to/from XML using XStream library. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="xtokenize" type="tns:xmlTokenizerExpression"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ @@ -8203,8 +8195,6 @@ it reaches the end when Camel is shut down. Default value: false <xs:element ref="tns:xmlSecurity"/> - <xs:element ref="tns:xstream"/> - <xs:element ref="tns:pgp"/> <xs:element ref="tns:yaml"/> @@ -11230,122 +11220,6 @@ the EncryptedKey structure or not. Default value: true </xs:complexType> - <xs:complexType name="xStreamDataFormat"> - - <xs:complexContent> - - <xs:extension base="tns:dataFormat"> - - <xs:sequence> - - <xs:element maxOccurs="unbounded" minOccurs="0" name="converters" type="tns:propertyDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -List of class names for using custom XStream converters. The classes must be of -type com.thoughtworks.xstream.converters.Converter. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element maxOccurs="unbounded" minOccurs="0" name="aliases" type="tns:propertyDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Alias a Class to a shorter name to be used in XML elements. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element maxOccurs="unbounded" minOccurs="0" name="omitFields" type="tns:propertyDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Prevents a field from being serialized. To omit a field you must always provide -the declaring type and not necessarily the type that is converted. Multiple -values can be separated by comma. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element maxOccurs="unbounded" minOccurs="0" name="implicitCollections" type="tns:propertyDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Adds a default implicit collection which is used for any unmapped XML tag. -Multiple values can be separated by comma. - ]]></xs:documentation> - </xs:annotation> - </xs:element> - - </xs:sequence> - - <xs:attribute name="permissions" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -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 a syntax where a plus sign is allow, and minus -sign is deny. Wildcards is supported by using . as prefix. For example to allow -com.foo and all subpackages then specify com.foo.. Multiple permissions can be -configured separated by comma, such as com.foo.,-com.foo.bar.MySecretBean. The -following default permission is always included: -,java.lang.,java.util. unless -its overridden by specifying a JVM system property with they key -org.apache.camel.xstream.permissions. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="encoding" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Sets the encoding to use. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="driver" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -To use a custom XStream driver. The instance must be of type -com.thoughtworks.xstream.io.HierarchicalStreamDriver. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="driverRef" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -To refer to a custom XStream driver to lookup in the registry. The instance must -be of type com.thoughtworks.xstream.io.HierarchicalStreamDriver. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="mode" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Mode for dealing with duplicate references The possible values are: -NO_REFERENCES ID_REFERENCES XPATH_RELATIVE_REFERENCES XPATH_ABSOLUTE_REFERENCES -SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - <xs:attribute name="contentTypeHeader" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Whether the data format should set the Content-Type header with the type from -the data format. For example application/xml for data formats marshalling to -XML, or application/json for data formats marshalling to JSON. Default value: -true - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - - </xs:extension> - - </xs:complexContent> - - </xs:complexType> - <xs:complexType name="pgpDataFormat"> <xs:complexContent> @@ -16902,8 +16776,6 @@ Sets a reference to use for lookup the policy in the registry. <xs:element ref="tns:xmlSecurity"/> - <xs:element ref="tns:xstream"/> - <xs:element ref="tns:pgp"/> <xs:element ref="tns:yaml"/> @@ -18171,8 +18043,6 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:xmlSecurity"/> - <xs:element ref="tns:xstream"/> - <xs:element ref="tns:pgp"/> <xs:element ref="tns:yaml"/> @@ -20295,8 +20165,6 @@ To configure a special tag for the operations within this rest definition. <xs:element ref="tns:xmlSecurity"/> - <xs:element ref="tns:xstream"/> - <xs:element ref="tns:pgp"/> <xs:element ref="tns:yaml"/> diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties index 5b26131dfdb..555cf78cbe4 100644 --- a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties +++ b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties @@ -41,7 +41,5 @@ univocityCsv univocityFixed univocityTsv xmlSecurity -xstream -xstreamJson zipDeflater zipFile diff --git a/docs/components/modules/dataformats/examples/json/xstream.json b/docs/components/modules/dataformats/examples/json/xstream.json deleted file mode 120000 index 8166be3a482..00000000000 --- a/docs/components/modules/dataformats/examples/json/xstream.json +++ /dev/null @@ -1 +0,0 @@ -../../../../../../components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json \ No newline at end of file diff --git a/docs/components/modules/dataformats/examples/json/xstreamJson.json b/docs/components/modules/dataformats/examples/json/xstreamJson.json deleted file mode 120000 index c4ced90267a..00000000000 --- a/docs/components/modules/dataformats/examples/json/xstreamJson.json +++ /dev/null @@ -1 +0,0 @@ -../../../../../../components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstreamJson.json \ No newline at end of file diff --git a/docs/components/modules/dataformats/pages/xstream-dataformat.adoc b/docs/components/modules/dataformats/pages/xstream-dataformat.adoc deleted file mode 120000 index eab1b07fd3e..00000000000 --- a/docs/components/modules/dataformats/pages/xstream-dataformat.adoc +++ /dev/null @@ -1 +0,0 @@ -../../../../../components/camel-xstream/src/main/docs/xstream-dataformat.adoc \ No newline at end of file diff --git a/docs/components/modules/dataformats/pages/xstreamJson-dataformat.adoc b/docs/components/modules/dataformats/pages/xstreamJson-dataformat.adoc deleted file mode 120000 index 510815588a3..00000000000 --- a/docs/components/modules/dataformats/pages/xstreamJson-dataformat.adoc +++ /dev/null @@ -1 +0,0 @@ -../../../../../components/camel-xstream/src/main/docs/xstreamJson-dataformat.adoc \ No newline at end of file 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 5438f7880a9..9c2ba6e22ec 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 @@ -162,7 +162,6 @@ import org.apache.camel.model.dataformat.UniVocityFixedDataFormat; import org.apache.camel.model.dataformat.UniVocityHeader; import org.apache.camel.model.dataformat.UniVocityTsvDataFormat; import org.apache.camel.model.dataformat.XMLSecurityDataFormat; -import org.apache.camel.model.dataformat.XStreamDataFormat; import org.apache.camel.model.dataformat.YAMLDataFormat; import org.apache.camel.model.dataformat.YAMLTypeFilterDefinition; import org.apache.camel.model.dataformat.ZipDeflaterDataFormat; @@ -2972,7 +2971,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "univocity-fixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat"), @YamlProperty(name = "univocity-tsv", type = "object:org.apache.camel.model.dataformat.UniVocityTsvDataFormat"), @YamlProperty(name = "xml-security", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"), - @YamlProperty(name = "xstream", type = "object:org.apache.camel.model.dataformat.XStreamDataFormat"), @YamlProperty(name = "yaml", type = "object:org.apache.camel.model.dataformat.YAMLDataFormat"), @YamlProperty(name = "zip-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"), @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat") @@ -3177,11 +3175,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "xstream": { - org.apache.camel.model.dataformat.XStreamDataFormat val = asType(node, org.apache.camel.model.dataformat.XStreamDataFormat.class); - target.setDataFormatType(val); - break; - } case "pgp": { org.apache.camel.model.dataformat.PGPDataFormat val = asType(node, org.apache.camel.model.dataformat.PGPDataFormat.class); target.setDataFormatType(val); @@ -3270,7 +3263,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "univocity-fixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat"), @YamlProperty(name = "univocity-tsv", type = "object:org.apache.camel.model.dataformat.UniVocityTsvDataFormat"), @YamlProperty(name = "xml-security", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"), - @YamlProperty(name = "xstream", type = "object:org.apache.camel.model.dataformat.XStreamDataFormat"), @YamlProperty(name = "yaml", type = "object:org.apache.camel.model.dataformat.YAMLDataFormat"), @YamlProperty(name = "zip-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"), @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat") @@ -3655,16 +3647,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormats(existing); break; } - case "xstream": { - org.apache.camel.model.dataformat.XStreamDataFormat val = asType(node, org.apache.camel.model.dataformat.XStreamDataFormat.class); - java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats(); - if (existing == null) { - existing = new java.util.ArrayList<>(); - } - existing.add(val); - target.setDataFormats(existing); - break; - } case "pgp": { org.apache.camel.model.dataformat.PGPDataFormat val = asType(node, org.apache.camel.model.dataformat.PGPDataFormat.class); java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats(); @@ -8441,7 +8423,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "univocity-fixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat"), @YamlProperty(name = "univocity-tsv", type = "object:org.apache.camel.model.dataformat.UniVocityTsvDataFormat"), @YamlProperty(name = "xml-security", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"), - @YamlProperty(name = "xstream", type = "object:org.apache.camel.model.dataformat.XStreamDataFormat"), @YamlProperty(name = "yaml", type = "object:org.apache.camel.model.dataformat.YAMLDataFormat"), @YamlProperty(name = "zip-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"), @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat") @@ -8646,11 +8627,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "xstream": { - org.apache.camel.model.dataformat.XStreamDataFormat val = asType(node, org.apache.camel.model.dataformat.XStreamDataFormat.class); - target.setDataFormatType(val); - break; - } case "pgp": { org.apache.camel.model.dataformat.PGPDataFormat val = asType(node, org.apache.camel.model.dataformat.PGPDataFormat.class); target.setDataFormatType(val); @@ -17652,7 +17628,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "univocity-fixed", type = "object:org.apache.camel.model.dataformat.UniVocityFixedDataFormat"), @YamlProperty(name = "univocity-tsv", type = "object:org.apache.camel.model.dataformat.UniVocityTsvDataFormat"), @YamlProperty(name = "xml-security", type = "object:org.apache.camel.model.dataformat.XMLSecurityDataFormat"), - @YamlProperty(name = "xstream", type = "object:org.apache.camel.model.dataformat.XStreamDataFormat"), @YamlProperty(name = "yaml", type = "object:org.apache.camel.model.dataformat.YAMLDataFormat"), @YamlProperty(name = "zip-deflater", type = "object:org.apache.camel.model.dataformat.ZipDeflaterDataFormat"), @YamlProperty(name = "zip-file", type = "object:org.apache.camel.model.dataformat.ZipFileDataFormat") @@ -17862,11 +17837,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "xstream": { - org.apache.camel.model.dataformat.XStreamDataFormat val = asType(node, org.apache.camel.model.dataformat.XStreamDataFormat.class); - target.setDataFormatType(val); - break; - } case "pgp": { org.apache.camel.model.dataformat.PGPDataFormat val = asType(node, org.apache.camel.model.dataformat.PGPDataFormat.class); target.setDataFormatType(val); @@ -18845,107 +18815,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } } - @YamlType( - nodes = "xstream", - inline = true, - types = org.apache.camel.model.dataformat.XStreamDataFormat.class, - order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, - properties = { - @YamlProperty(name = "aliases", type = "array:org.apache.camel.model.PropertyDefinition"), - @YamlProperty(name = "content-type-header", type = "boolean"), - @YamlProperty(name = "converters", type = "array:org.apache.camel.model.PropertyDefinition"), - @YamlProperty(name = "driver", type = "string"), - @YamlProperty(name = "driver-ref", type = "string"), - @YamlProperty(name = "encoding", type = "string"), - @YamlProperty(name = "id", type = "string"), - @YamlProperty(name = "implicit-collections", type = "array:org.apache.camel.model.PropertyDefinition"), - @YamlProperty(name = "mode", type = "enum:NO_REFERENCES,ID_REFERENCES,XPATH_RELATIVE_REFERENCES,XPATH_ABSOLUTE_REFERENCES,SINGLE_NODE_XPATH_RELATIVE_REFERENCES,SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES"), - @YamlProperty(name = "omit-fields", type = "array:org.apache.camel.model.PropertyDefinition"), - @YamlProperty(name = "permissions", type = "string") - } - ) - public static class XStreamDataFormatDeserializer extends YamlDeserializerBase<XStreamDataFormat> { - public XStreamDataFormatDeserializer() { - super(XStreamDataFormat.class); - } - - @Override - protected XStreamDataFormat newInstance() { - return new XStreamDataFormat(); - } - - @Override - protected XStreamDataFormat newInstance(String value) { - return new XStreamDataFormat(value); - } - - @Override - protected boolean setProperty(XStreamDataFormat target, String propertyKey, - String propertyName, Node node) { - switch(propertyKey) { - case "aliases": { - java.util.List<org.apache.camel.model.PropertyDefinition> val = asFlatList(node, org.apache.camel.model.PropertyDefinition.class); - target.setAliases(val); - break; - } - case "content-type-header": { - String val = asText(node); - target.setContentTypeHeader(val); - break; - } - case "converters": { - java.util.List<org.apache.camel.model.PropertyDefinition> val = asFlatList(node, org.apache.camel.model.PropertyDefinition.class); - target.setConverters(val); - break; - } - case "driver": { - String val = asText(node); - target.setDriver(val); - break; - } - case "driver-ref": { - String val = asText(node); - target.setDriverRef(val); - break; - } - case "encoding": { - String val = asText(node); - target.setEncoding(val); - break; - } - case "id": { - String val = asText(node); - target.setId(val); - break; - } - case "implicit-collections": { - java.util.List<org.apache.camel.model.PropertyDefinition> val = asFlatList(node, org.apache.camel.model.PropertyDefinition.class); - target.setImplicitCollections(val); - break; - } - case "mode": { - String val = asText(node); - target.setMode(val); - break; - } - case "omit-fields": { - java.util.List<org.apache.camel.model.PropertyDefinition> val = asFlatList(node, org.apache.camel.model.PropertyDefinition.class); - target.setOmitFields(val); - break; - } - case "permissions": { - String val = asText(node); - target.setPermissions(val); - break; - } - default: { - return false; - } - } - return true; - } - } - @YamlType( nodes = "yaml", types = org.apache.camel.model.dataformat.YAMLDataFormat.class, diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java index fd0d01573e4..eb9def3e208 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java @@ -545,8 +545,6 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve case "org.apache.camel.model.language.XPathExpression": return new ModelDeserializers.XPathExpressionDeserializer(); case "xquery": return new ModelDeserializers.XQueryExpressionDeserializer(); case "org.apache.camel.model.language.XQueryExpression": return new ModelDeserializers.XQueryExpressionDeserializer(); - case "xstream": return new ModelDeserializers.XStreamDataFormatDeserializer(); - case "org.apache.camel.model.dataformat.XStreamDataFormat": return new ModelDeserializers.XStreamDataFormatDeserializer(); case "yaml": return new ModelDeserializers.YAMLDataFormatDeserializer(); case "org.apache.camel.model.dataformat.YAMLDataFormat": return new ModelDeserializers.YAMLDataFormatDeserializer(); case "type-filter": return new ModelDeserializers.YAMLTypeFilterDefinitionDeserializer(); 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 a3648e05c0c..2c4cd5adc2a 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 @@ -1585,9 +1585,6 @@ "xml-security" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" }, @@ -3565,9 +3562,6 @@ "xml-security" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" }, @@ -4872,9 +4866,6 @@ "xml-security" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" }, @@ -5856,61 +5847,6 @@ } } }, - "org.apache.camel.model.dataformat.XStreamDataFormat" : { - "oneOf" : [ { - "type" : "string" - }, { - "type" : "object", - "properties" : { - "aliases" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "content-type-header" : { - "type" : "boolean" - }, - "converters" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "driver" : { - "type" : "string" - }, - "driver-ref" : { - "type" : "string" - }, - "encoding" : { - "type" : "string" - }, - "id" : { - "type" : "string" - }, - "implicit-collections" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "mode" : { - "type" : "string", - "enum" : [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ] - }, - "omit-fields" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "permissions" : { - "type" : "string" - } - } - } ] - }, "org.apache.camel.model.dataformat.YAMLDataFormat" : { "type" : "object", "properties" : { @@ -8132,9 +8068,6 @@ "xml-security" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" }, 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 8cd91c10f42..3d719fb1605 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 @@ -1489,9 +1489,6 @@ "xmlSecurity" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" }, @@ -3469,9 +3466,6 @@ "xmlSecurity" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" }, @@ -4776,9 +4770,6 @@ "xmlSecurity" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" }, @@ -5760,61 +5751,6 @@ } } }, - "org.apache.camel.model.dataformat.XStreamDataFormat" : { - "oneOf" : [ { - "type" : "string" - }, { - "type" : "object", - "properties" : { - "aliases" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "contentTypeHeader" : { - "type" : "boolean" - }, - "converters" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "driver" : { - "type" : "string" - }, - "driverRef" : { - "type" : "string" - }, - "encoding" : { - "type" : "string" - }, - "id" : { - "type" : "string" - }, - "implicitCollections" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "mode" : { - "type" : "string", - "enum" : [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ] - }, - "omitFields" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "permissions" : { - "type" : "string" - } - } - } ] - }, "org.apache.camel.model.dataformat.YAMLDataFormat" : { "type" : "object", "properties" : { @@ -8033,9 +7969,6 @@ "xmlSecurity" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XMLSecurityDataFormat" }, - "xstream" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.XStreamDataFormat" - }, "yaml" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLDataFormat" },
