This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch fury-fory in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8b8c42aa294fe0f1c220aedfcd7a4da55de8e615 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Jun 23 13:48:15 2025 +0200 CAMEL-22183 - camel-fury - Rename Fury to Fory Signed-off-by: Andrea Cosentino <[email protected]> --- bom/camel-bom/pom.xml | 6 +-- catalog/camel-allcomponents/pom.xml | 6 +-- .../apache/camel/catalog/dataformats.properties | 1 + .../org/apache/camel/catalog/dataformats/fory.json | 18 ++++---- .../org/apache/camel/catalog/models.properties | 1 + .../catalog/models/dataFormatTransformer.json | 2 +- .../apache/camel/catalog/models/dataFormats.json | 2 +- .../org/apache/camel/catalog/models/fory.json | 25 +++++----- .../org/apache/camel/catalog/models/marshal.json | 2 +- .../org/apache/camel/catalog/models/unmarshal.json | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 24 +++++----- .../apache/camel/catalog/schemas/camel-xml-io.xsd | 24 +++++----- components/{camel-fury => camel-fory}/pom.xml | 12 ++--- .../component/fory/ForyDataFormatConfigurer.java} | 6 +-- .../component/fory}/FuryDataFormatConfigurer.java | 6 +-- .../org/apache/camel/component/fory/fory.json} | 18 ++++---- .../org/apache/camel/component/fory}/fury.json | 4 +- .../org/apache/camel/component/fury/fury.json | 0 .../org/apache/camel/configurer/fory-dataformat | 2 + .../org/apache/camel/configurer/fury-dataformat | 2 + .../org/apache/camel/dataformat.properties | 7 +++ .../services/org/apache/camel/dataformat/fory} | 2 +- .../services/org/apache/camel/dataformat/fury | 2 +- .../src/main/docs/fory-dataformat.adoc} | 26 +++++------ .../camel/component/fory/ForyDataFormat.java} | 52 ++++++++++----------- .../org/apache/camel/component/fory/ForyTest.java} | 8 ++-- .../org/apache/camel/component/fory}/TestPojo.java | 2 +- .../src/test/resources/log4j2.properties | 2 +- .../org/apache/camel/configurer/fury-dataformat | 2 - .../org/apache/camel/dataformat.properties | 7 --- components/pom.xml | 2 +- .../apache/camel/model/dataformat/dataFormats.json | 2 +- .../org/apache/camel/model/dataformat/fory.json | 25 +++++----- .../META-INF/org/apache/camel/model/marshal.json | 2 +- .../model/transformer/dataFormatTransformer.json | 2 +- .../META-INF/org/apache/camel/model/unmarshal.json | 2 +- .../services/org/apache/camel/model.properties | 1 + .../org/apache/camel/model/dataformat/jaxb.index | 2 +- .../camel/builder/DataFormatBuilderFactory.java | 8 ++-- .../org/apache/camel/builder/DataFormatClause.java | 14 +++--- .../org/apache/camel/model/MarshalDefinition.java | 4 +- .../apache/camel/model/UnmarshalDefinition.java | 4 +- .../model/dataformat/DataFormatsDefinition.java | 2 +- .../{FuryDataFormat.java => ForyDataFormat.java} | 52 ++++++++++----------- .../DataFormatTransformerDefinition.java | 4 +- .../reifier/dataformat/DataFormatReifier.java | 51 ++------------------ ...rmatReifier.java => ForyDataFormatReifier.java} | 10 ++-- .../org/apache/camel/main/dataformats.properties | 1 + .../java/org/apache/camel/xml/in/ModelParser.java | 8 ++-- .../java/org/apache/camel/xml/out/ModelWriter.java | 16 +++---- .../org/apache/camel/yaml/out/ModelWriter.java | 16 +++---- .../modules/dataformats/examples/json/fory.json | 1 + .../modules/dataformats/examples/json/fury.json | 2 +- docs/components/modules/dataformats/nav.adoc | 2 +- .../modules/dataformats/pages/fory-dataformat.adoc | 1 + .../modules/dataformats/pages/fury-dataformat.adoc | 1 - .../dsl/yaml/deserializers/ModelDeserializers.java | 54 +++++++++++----------- .../deserializers/ModelDeserializersResolver.java | 4 +- .../generated/resources/schema/camelYamlDsl.json | 48 +++++++++---------- parent/pom.xml | 8 ++-- 60 files changed, 288 insertions(+), 334 deletions(-) diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index 8a72fe4563f..3499f57014b 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -819,17 +819,17 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-freemarker</artifactId> + <artifactId>camel-fory</artifactId> <version>4.13.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-ftp</artifactId> + <artifactId>camel-freemarker</artifactId> <version>4.13.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-fury</artifactId> + <artifactId>camel-ftp</artifactId> <version>4.13.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml index 06b20f45fd9..92d1c89c8ce 100644 --- a/catalog/camel-allcomponents/pom.xml +++ b/catalog/camel-allcomponents/pom.xml @@ -688,17 +688,17 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-freemarker</artifactId> + <artifactId>camel-fory</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-ftp</artifactId> + <artifactId>camel-freemarker</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-fury</artifactId> + <artifactId>camel-ftp</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties index b2614ea160f..70cfe1b01f6 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties @@ -15,6 +15,7 @@ fastjson fhirJson fhirXml flatpack +fory fury grok gson diff --git a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fory.json similarity index 80% copy from components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json copy to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fory.json index 7f3951fe2b4..f2997aa3fc5 100644 --- a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fory.json @@ -1,25 +1,25 @@ { "dataformat": { "kind": "dataformat", - "name": "fury", - "title": "Fury", - "description": "Serialize and deserialize messages using Apache Fury", + "name": "fory", + "title": "Fory", + "description": "Serialize and deserialize messages using Apache Fory", "deprecated": false, "firstVersion": "4.9.0", "label": "dataformat,transformation", - "javaType": "org.apache.camel.component.fury.FuryDataFormat", + "javaType": "org.apache.camel.component.fory.ForyDataFormat", "supportLevel": "Preview", "groupId": "org.apache.camel", - "artifactId": "camel-fury", + "artifactId": "camel-fory", "version": "4.13.0-SNAPSHOT", - "modelName": "fury", - "modelJavaType": "org.apache.camel.model.dataformat.FuryDataFormat" + "modelName": "fory", + "modelJavaType": "org.apache.camel.model.dataformat.ForyDataFormat" }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, "unmarshalType": { "index": 1, "kind": "attribute", "displayName": "Unmarshal Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class of the java type to use when unmarshalling" }, "requireClassRegistration": { "index": 2, "kind": "attribute", "displayName": "Require Class Registration", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to require register classes" }, - "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fury" }, - "allowAutoWiredFury": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fury", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fury from the registry" } + "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fory" }, + "allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fory from the registry" } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties index f0fe91022df..202454642f7 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties @@ -59,6 +59,7 @@ fhirJson fhirXml filter flatpack +fory from fury get diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json index 3214b3b8e14..90a3339ce27 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "index": 0, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf", "rss" [...] + "dataFormatType": { "index": 0, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf", "rss" [...] "scheme": { "index": 1, "kind": "attribute", "displayName": "Scheme", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set a scheme name supported by the transformer. If you specify 'csv', the transformer will be picked up for all of 'csv' from\/to Java transformation. Note that the scheme matching is performed only when no exactly matched transformer exists." }, "name": { "index": 2, "kind": "attribute", "displayName": "Name", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set the transformer name under which the transformer gets referenced when specifying the input\/output data type on routes. If you specify a transformer name that matches a data type scheme like 'csv' the transformer will be picked up for all of 'csv:' from\/t [...] "fromType": { "index": 3, "kind": "attribute", "displayName": "From Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set the 'from' data type name. If you specify 'xml:XYZ', the transformer will be picked up if source type is 'xml:XYZ'. If you specify just 'xml', the transformer matches with all of 'xml' source type like 'xml:ABC' or 'xml:DEF'." }, 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 2428196ae02..4eb58384efd 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": { "index": 0, "kind": "element", "displayName": "Data Formats", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] + "dataFormats": { "index": 0, "kind": "element", "displayName": "Data Formats", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] } } diff --git a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fory.json similarity index 73% copy from components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json copy to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fory.json index 7f3951fe2b4..38abe61c847 100644 --- a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/fory.json @@ -1,25 +1,22 @@ { - "dataformat": { - "kind": "dataformat", - "name": "fury", - "title": "Fury", - "description": "Serialize and deserialize messages using Apache Fury", + "model": { + "kind": "model", + "name": "fory", + "title": "Fory", + "description": "Serialize and deserialize messages using Apache Fory", "deprecated": false, "firstVersion": "4.9.0", "label": "dataformat,transformation", - "javaType": "org.apache.camel.component.fury.FuryDataFormat", - "supportLevel": "Preview", - "groupId": "org.apache.camel", - "artifactId": "camel-fury", - "version": "4.13.0-SNAPSHOT", - "modelName": "fury", - "modelJavaType": "org.apache.camel.model.dataformat.FuryDataFormat" + "javaType": "org.apache.camel.model.dataformat.ForyDataFormat", + "abstract": false, + "input": false, + "output": false }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, "unmarshalType": { "index": 1, "kind": "attribute", "displayName": "Unmarshal Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class of the java type to use when unmarshalling" }, "requireClassRegistration": { "index": 2, "kind": "attribute", "displayName": "Require Class Registration", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to require register classes" }, - "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fury" }, - "allowAutoWiredFury": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fury", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fury from the registry" } + "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fory" }, + "allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fory from the registry" } } } 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 7bea9a3bac9..1125fc01435 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 @@ -15,7 +15,7 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }, "disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "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." }, - "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] + "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] "variableSend": { "index": 4, "kind": "attribute", "displayName": "Variable Send", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is tak [...] "variableReceive": { "index": 5, "kind": "attribute", "displayName": "Variable Receive", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable th [...] } 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 a77bdafa13c..6de9ae5e296 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 @@ -15,7 +15,7 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }, "disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "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." }, - "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] + "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] "variableSend": { "index": 4, "kind": "attribute", "displayName": "Variable Send", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is tak [...] "variableReceive": { "index": 5, "kind": "attribute", "displayName": "Variable Receive", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable th [...] "allowNullBody": { "index": 6, "kind": "attribute", "displayName": "Allow Null Body", "group": "advanced", "label": "advanced", "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." } 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 8551d9b1dcb..1eb90fc79fd 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 @@ -619,20 +619,20 @@ Configures a org.apache.camel.FluentProducerTemplate </xs:documentation> </xs:annotation> </xs:element> - <xs:element name="from" type="tns:fromDefinition"> + <xs:element name="fory" type="tns:foryDataFormat"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Act as a message source as input to a route +Serialize and deserialize messages using Apache Fory ]]> </xs:documentation> </xs:annotation> </xs:element> - <xs:element name="fury" type="tns:furyDataFormat"> + <xs:element name="from" type="tns:fromDefinition"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Serialize and deserialize messages using Apache Fury +Act as a message source as input to a route ]]> </xs:documentation> </xs:annotation> @@ -7548,7 +7548,7 @@ messages, or any custom logic needed before the looping executes. <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> @@ -8868,7 +8868,7 @@ References to a custom parser factory to lookup in the registry. </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="furyDataFormat"> + <xs:complexType name="foryDataFormat"> <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> @@ -8894,16 +8894,16 @@ Whether to require register classes. Default value: true <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Whether to use the threadsafe fury. Default value: true +Whether to use the threadsafe fory. Default value: true ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="allowAutoWiredFury" type="xs:string"> + <xs:attribute name="allowAutoWiredFory" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Whether to auto-discover Fury from the registry. Default value: true +Whether to auto-discover Fory from the registry. Default value: true ]]> </xs:documentation> </xs:annotation> @@ -14804,7 +14804,7 @@ To type used as a target data type in the transformation. <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> @@ -17077,7 +17077,7 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> @@ -17927,7 +17927,7 @@ Set the 'to' data type name. If you specify 'json:XYZ', the transformer will be <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd index 86034864896..11c71226301 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd @@ -574,20 +574,20 @@ Flatpack library. </xs:documentation> </xs:annotation> </xs:element> - <xs:element name="from" type="tns:fromDefinition"> + <xs:element name="fory" type="tns:foryDataFormat"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Act as a message source as input to a route +Serialize and deserialize messages using Apache Fory ]]> </xs:documentation> </xs:annotation> </xs:element> - <xs:element name="fury" type="tns:furyDataFormat"> + <xs:element name="from" type="tns:fromDefinition"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Serialize and deserialize messages using Apache Fury +Act as a message source as input to a route ]]> </xs:documentation> </xs:annotation> @@ -6221,7 +6221,7 @@ messages, or any custom logic needed before the looping executes. <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> @@ -7541,7 +7541,7 @@ References to a custom parser factory to lookup in the registry. </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="furyDataFormat"> + <xs:complexType name="foryDataFormat"> <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> @@ -7567,16 +7567,16 @@ Whether to require register classes. Default value: true <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Whether to use the threadsafe fury. Default value: true +Whether to use the threadsafe fory. Default value: true ]]> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="allowAutoWiredFury" type="xs:string"> + <xs:attribute name="allowAutoWiredFory" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Whether to auto-discover Fury from the registry. Default value: true +Whether to auto-discover Fory from the registry. Default value: true ]]> </xs:documentation> </xs:annotation> @@ -13498,7 +13498,7 @@ To type used as a target data type in the transformation. <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> @@ -15771,7 +15771,7 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> @@ -16621,7 +16621,7 @@ Set the 'to' data type name. If you specify 'json:XYZ', the transformer will be <xs:element ref="tns:fhirJson"/> <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> - <xs:element ref="tns:fury"/> + <xs:element ref="tns:fory"/> <xs:element ref="tns:grok"/> <xs:element ref="tns:gzipDeflater"/> <xs:element ref="tns:hl7"/> diff --git a/components/camel-fury/pom.xml b/components/camel-fory/pom.xml similarity index 89% rename from components/camel-fury/pom.xml rename to components/camel-fory/pom.xml index acb987e1c09..f4937098b49 100644 --- a/components/camel-fury/pom.xml +++ b/components/camel-fory/pom.xml @@ -26,10 +26,10 @@ <version>4.13.0-SNAPSHOT</version> </parent> - <artifactId>camel-fury</artifactId> + <artifactId>camel-fory</artifactId> <packaging>jar</packaging> - <name>Camel :: Fury</name> - <description>Camel Fury support</description> + <name>Camel :: Fory</name> + <description>Camel Fory support</description> <properties> <skipTests.s390x>true</skipTests.s390x> @@ -43,9 +43,9 @@ <artifactId>camel-support</artifactId> </dependency> <dependency> - <groupId>org.apache.fury</groupId> - <artifactId>fury-core</artifactId> - <version>${fury-version}</version> + <groupId>org.apache.fory</groupId> + <artifactId>fory-core</artifactId> + <version>${fory-version}</version> </dependency> <!-- testing --> diff --git a/components/camel-fury/src/generated/java/org/apache/camel/component/fury/FuryDataFormatConfigurer.java b/components/camel-fory/src/generated/java/org/apache/camel/component/fory/ForyDataFormatConfigurer.java similarity index 89% copy from components/camel-fury/src/generated/java/org/apache/camel/component/fury/FuryDataFormatConfigurer.java copy to components/camel-fory/src/generated/java/org/apache/camel/component/fory/ForyDataFormatConfigurer.java index 96152df1691..1d597892104 100644 --- a/components/camel-fury/src/generated/java/org/apache/camel/component/fury/FuryDataFormatConfigurer.java +++ b/components/camel-fory/src/generated/java/org/apache/camel/component/fory/ForyDataFormatConfigurer.java @@ -1,5 +1,5 @@ /* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.component.fury; +package org.apache.camel.component.fory; import javax.annotation.processing.Generated; import java.util.HashMap; @@ -14,11 +14,11 @@ import org.apache.camel.support.component.PropertyConfigurerSupport; */ @Generated("org.apache.camel.maven.packaging.PackageDataFormatMojo") @SuppressWarnings("unchecked") -public class FuryDataFormatConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer { +public class ForyDataFormatConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer { @Override public boolean configure(CamelContext camelContext, Object target, String name, Object value, boolean ignoreCase) { - FuryDataFormat dataformat = (FuryDataFormat) target; + ForyDataFormat dataformat = (ForyDataFormat) target; switch (ignoreCase ? name.toLowerCase() : name) { case "unmarshaltype": case "unmarshalType": dataformat.setUnmarshalType(property(camelContext, java.lang.Class.class, value)); return true; diff --git a/components/camel-fury/src/generated/java/org/apache/camel/component/fury/FuryDataFormatConfigurer.java b/components/camel-fory/src/generated/java/org/apache/camel/component/fory/FuryDataFormatConfigurer.java similarity index 90% rename from components/camel-fury/src/generated/java/org/apache/camel/component/fury/FuryDataFormatConfigurer.java rename to components/camel-fory/src/generated/java/org/apache/camel/component/fory/FuryDataFormatConfigurer.java index 96152df1691..a93557f6bff 100644 --- a/components/camel-fury/src/generated/java/org/apache/camel/component/fury/FuryDataFormatConfigurer.java +++ b/components/camel-fory/src/generated/java/org/apache/camel/component/fory/FuryDataFormatConfigurer.java @@ -1,9 +1,7 @@ /* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.component.fury; +package org.apache.camel.component.fory; import javax.annotation.processing.Generated; -import java.util.HashMap; -import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.spi.GeneratedPropertyConfigurer; @@ -18,7 +16,7 @@ public class FuryDataFormatConfigurer extends PropertyConfigurerSupport implemen @Override public boolean configure(CamelContext camelContext, Object target, String name, Object value, boolean ignoreCase) { - FuryDataFormat dataformat = (FuryDataFormat) target; + ForyDataFormat dataformat = (ForyDataFormat) target; switch (ignoreCase ? name.toLowerCase() : name) { case "unmarshaltype": case "unmarshalType": dataformat.setUnmarshalType(property(camelContext, java.lang.Class.class, value)); return true; diff --git a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json b/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json similarity index 80% copy from components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json copy to components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json index 7f3951fe2b4..f2997aa3fc5 100644 --- a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json +++ b/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json @@ -1,25 +1,25 @@ { "dataformat": { "kind": "dataformat", - "name": "fury", - "title": "Fury", - "description": "Serialize and deserialize messages using Apache Fury", + "name": "fory", + "title": "Fory", + "description": "Serialize and deserialize messages using Apache Fory", "deprecated": false, "firstVersion": "4.9.0", "label": "dataformat,transformation", - "javaType": "org.apache.camel.component.fury.FuryDataFormat", + "javaType": "org.apache.camel.component.fory.ForyDataFormat", "supportLevel": "Preview", "groupId": "org.apache.camel", - "artifactId": "camel-fury", + "artifactId": "camel-fory", "version": "4.13.0-SNAPSHOT", - "modelName": "fury", - "modelJavaType": "org.apache.camel.model.dataformat.FuryDataFormat" + "modelName": "fory", + "modelJavaType": "org.apache.camel.model.dataformat.ForyDataFormat" }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, "unmarshalType": { "index": 1, "kind": "attribute", "displayName": "Unmarshal Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class of the java type to use when unmarshalling" }, "requireClassRegistration": { "index": 2, "kind": "attribute", "displayName": "Require Class Registration", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to require register classes" }, - "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fury" }, - "allowAutoWiredFury": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fury", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fury from the registry" } + "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fory" }, + "allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fory from the registry" } } } diff --git a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json b/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fury.json similarity index 95% copy from components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json copy to components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fury.json index 7f3951fe2b4..11615e77fd9 100644 --- a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json +++ b/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fury.json @@ -7,10 +7,10 @@ "deprecated": false, "firstVersion": "4.9.0", "label": "dataformat,transformation", - "javaType": "org.apache.camel.component.fury.FuryDataFormat", + "javaType": "org.apache.camel.component.fory.ForyDataFormat", "supportLevel": "Preview", "groupId": "org.apache.camel", - "artifactId": "camel-fury", + "artifactId": "camel-fory", "version": "4.13.0-SNAPSHOT", "modelName": "fury", "modelJavaType": "org.apache.camel.model.dataformat.FuryDataFormat" diff --git a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json b/components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json similarity index 100% copy from components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json copy to components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json diff --git a/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/configurer/fory-dataformat b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/configurer/fory-dataformat new file mode 100644 index 00000000000..d4ee1389d74 --- /dev/null +++ b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/configurer/fory-dataformat @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.component.fory.ForyDataFormatConfigurer diff --git a/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/configurer/fury-dataformat b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/configurer/fury-dataformat new file mode 100644 index 00000000000..d4ee1389d74 --- /dev/null +++ b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/configurer/fury-dataformat @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.component.fory.ForyDataFormatConfigurer diff --git a/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties new file mode 100644 index 00000000000..98859c6ef9d --- /dev/null +++ b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties @@ -0,0 +1,7 @@ +# Generated by camel build tools - do NOT edit this file! +dataFormats=fory fury +groupId=org.apache.camel +artifactId=camel-fory +version=4.13.0-SNAPSHOT +projectName=Camel :: Fory +projectDescription=Camel Fory support diff --git a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fory similarity index 52% copy from components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury copy to components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fory index 9f7d48352b6..55eaf0e427a 100644 --- a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury +++ b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fory @@ -1,2 +1,2 @@ # Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.component.fury.FuryDataFormat +class=org.apache.camel.component.fory.ForyDataFormat diff --git a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury similarity index 52% rename from components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury rename to components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury index 9f7d48352b6..55eaf0e427a 100644 --- a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury +++ b/components/camel-fory/src/generated/resources/META-INF/services/org/apache/camel/dataformat/fury @@ -1,2 +1,2 @@ # Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.component.fury.FuryDataFormat +class=org.apache.camel.component.fory.ForyDataFormat diff --git a/components/camel-fury/src/main/docs/fury-dataformat.adoc b/components/camel-fory/src/main/docs/fory-dataformat.adoc similarity index 60% rename from components/camel-fury/src/main/docs/fury-dataformat.adoc rename to components/camel-fory/src/main/docs/fory-dataformat.adoc index 2bd175608ab..6388895b2b0 100644 --- a/components/camel-fury/src/main/docs/fury-dataformat.adoc +++ b/components/camel-fory/src/main/docs/fory-dataformat.adoc @@ -1,23 +1,23 @@ -= Fury DataFormat -:doctitle: Fury -:shortname: fury -:artifactid: camel-fury -:description: Serialize and deserialize messages using Apache Fury += Fory DataFormat +:doctitle: Fory +:shortname: fory +:artifactid: camel-fory +:description: Serialize and deserialize messages using Apache Fory :since: 4.9 :supportlevel: Preview :tabs-sync-option: //Manually maintained attributes -:camel-spring-boot-name: fury +:camel-spring-boot-name: fory *Since Camel {since}* -Fury is a Data Format that uses the -https://fury.apache.org/[Fury Library] +Fory is a Data Format that uses the +https://fory.apache.org/[Fory Library] [NOTE] -Apache Fury is not supporting architecture using Big Endian (s390x, for instance). +Apache Fory is not supporting architecture using Big Endian (s390x, for instance). -== Fury Options +== Fory Options // dataformat options: START @@ -27,8 +27,8 @@ include::partial$dataformat-options.adoc[] == Dependencies -To use Fury in your camel routes, you need to add the dependency -on *camel-fury* which implements this data format. +To use Fory in your camel routes, you need to add the dependency +on *camel-fory* which implements this data format. If you use maven, you could add the following to your `pom.xml`, substituting the version number for the latest and greatest release. @@ -37,7 +37,7 @@ substituting the version number for the latest and greatest release. ---------------------------------------------------------- <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-fury</artifactId> + <artifactId>camel-fory</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> diff --git a/components/camel-fury/src/main/java/org/apache/camel/component/fury/FuryDataFormat.java b/components/camel-fory/src/main/java/org/apache/camel/component/fory/ForyDataFormat.java similarity index 76% rename from components/camel-fury/src/main/java/org/apache/camel/component/fury/FuryDataFormat.java rename to components/camel-fory/src/main/java/org/apache/camel/component/fory/ForyDataFormat.java index 30ef3c564ba..0cd08c8f6d2 100644 --- a/components/camel-fury/src/main/java/org/apache/camel/component/fury/FuryDataFormat.java +++ b/components/camel-fory/src/main/java/org/apache/camel/component/fory/ForyDataFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.fury; +package org.apache.camel.component.fory; import java.io.*; @@ -26,21 +26,21 @@ import org.apache.camel.spi.DataFormatName; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Dataformat; import org.apache.camel.support.service.ServiceSupport; -import org.apache.fury.BaseFury; -import org.apache.fury.Fury; -import org.apache.fury.config.FuryBuilder; -import org.apache.fury.config.Language; -import org.apache.fury.io.FuryInputStream; +import org.apache.fory.BaseFory; +import org.apache.fory.Fory; +import org.apache.fory.config.ForyBuilder; +import org.apache.fory.config.Language; +import org.apache.fory.io.ForyInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Serialize and deserialize messages using <a href="https://fury.apache.org";>Apache Fury</a> + * Serialize and deserialize messages using <a href="https://fory.apache.org";>Apache Fory</a> */ -@Dataformat("fury") -@Metadata(firstVersion = "4.9.0", title = "Fury") -public class FuryDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware { - private static final Logger LOG = LoggerFactory.getLogger(FuryDataFormat.class); +@Dataformat("fory") +@Metadata(firstVersion = "4.9.0", title = "Fory") +public class ForyDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware { + private static final Logger LOG = LoggerFactory.getLogger(ForyDataFormat.class); private CamelContext camelContext; private Class<?> unmarshalType; @@ -49,13 +49,13 @@ public class FuryDataFormat extends ServiceSupport implements DataFormat, DataFo private boolean threadSafe = true; private boolean allowAutoWiredFury = true; - private BaseFury fury; + private BaseFory fory; - public FuryDataFormat() { + public ForyDataFormat() { this(Object.class); } - public FuryDataFormat(Class<?> unmarshalType) { + public ForyDataFormat(Class<?> unmarshalType) { this.unmarshalType = unmarshalType; } @@ -76,12 +76,12 @@ public class FuryDataFormat extends ServiceSupport implements DataFormat, DataFo @Override public void marshal(final Exchange exchange, final Object graph, final OutputStream stream) throws Exception { - fury.serialize(stream, graph); + fory.serialize(stream, graph); } @Override public Object unmarshal(Exchange exchange, InputStream stream) throws Exception { - return fury.deserialize(new FuryInputStream(stream)); + return fory.deserialize(new ForyInputStream(stream)); } @Override @@ -90,18 +90,18 @@ public class FuryDataFormat extends ServiceSupport implements DataFormat, DataFo unmarshalType = camelContext.getClassResolver().resolveClass(unmarshalTypeName); } - if (fury == null && isAllowAutoWiredFury()) { - fury = getCamelContext().getRegistry().findSingleByType(BaseFury.class); + if (fory == null && isAllowAutoWiredFury()) { + fory = getCamelContext().getRegistry().findSingleByType(BaseFory.class); } - if (fury == null) { - FuryBuilder builder = Fury.builder().withLanguage(Language.JAVA); + if (fory == null) { + ForyBuilder builder = Fory.builder().withLanguage(Language.JAVA); builder.requireClassRegistration(requireClassRegistration); - fury = threadSafe ? builder.buildThreadSafeFury() : builder.build(); + fory = threadSafe ? builder.buildThreadSafeFory() : builder.build(); } if (unmarshalType != null) { - fury.register(unmarshalType); + fory.register(unmarshalType); } } @@ -116,12 +116,12 @@ public class FuryDataFormat extends ServiceSupport implements DataFormat, DataFo // Properties // ------------------------------------------------------------------------- - public BaseFury getFury() { - return fury; + public BaseFory getFory() { + return fory; } - public void setFury(BaseFury fury) { - this.fury = fury; + public void setFory(BaseFory fory) { + this.fory = fory; } public Class<?> getUnmarshalType() { diff --git a/components/camel-fury/src/test/java/org/apache/camel/component/fury/FuryTest.java b/components/camel-fory/src/test/java/org/apache/camel/component/fory/ForyTest.java similarity index 88% rename from components/camel-fury/src/test/java/org/apache/camel/component/fury/FuryTest.java rename to components/camel-fory/src/test/java/org/apache/camel/component/fory/ForyTest.java index bccf64d9655..2811f696e8c 100644 --- a/components/camel-fury/src/test/java/org/apache/camel/component/fury/FuryTest.java +++ b/components/camel-fory/src/test/java/org/apache/camel/component/fory/ForyTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.fury; +package org.apache.camel.component.fory; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -public class FuryTest extends CamelTestSupport { +public class ForyTest extends CamelTestSupport { @Test public void testMarshalAndUnmarshalMap() throws Exception { @@ -44,8 +44,8 @@ public class FuryTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() { - from("direct:in").marshal().fury(TestPojo.class); - from("direct:back").unmarshal().fury(TestPojo.class).to("mock:reverse"); + from("direct:in").marshal().fory(TestPojo.class); + from("direct:back").unmarshal().fory(TestPojo.class).to("mock:reverse"); } }; } diff --git a/components/camel-fury/src/test/java/org/apache/camel/component/fury/TestPojo.java b/components/camel-fory/src/test/java/org/apache/camel/component/fory/TestPojo.java similarity index 96% rename from components/camel-fury/src/test/java/org/apache/camel/component/fury/TestPojo.java rename to components/camel-fory/src/test/java/org/apache/camel/component/fory/TestPojo.java index d649b1bbdac..9724cbebc21 100644 --- a/components/camel-fury/src/test/java/org/apache/camel/component/fury/TestPojo.java +++ b/components/camel-fory/src/test/java/org/apache/camel/component/fory/TestPojo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.fury; +package org.apache.camel.component.fory; public class TestPojo { diff --git a/components/camel-fury/src/test/resources/log4j2.properties b/components/camel-fory/src/test/resources/log4j2.properties similarity index 96% rename from components/camel-fury/src/test/resources/log4j2.properties rename to components/camel-fory/src/test/resources/log4j2.properties index adbb3ca5808..966a1cbe7c6 100644 --- a/components/camel-fury/src/test/resources/log4j2.properties +++ b/components/camel-fory/src/test/resources/log4j2.properties @@ -17,7 +17,7 @@ appender.file.type = File appender.file.name = file -appender.file.fileName = target/camel-fury-test.log +appender.file.fileName = target/camel-fory-test.log appender.file.layout.type = PatternLayout appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n appender.out.type = Console diff --git a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/configurer/fury-dataformat b/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/configurer/fury-dataformat deleted file mode 100644 index d4719ed2a9c..00000000000 --- a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/configurer/fury-dataformat +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.component.fury.FuryDataFormatConfigurer diff --git a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties deleted file mode 100644 index 59e3af956dd..00000000000 --- a/components/camel-fury/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -dataFormats=fury -groupId=org.apache.camel -artifactId=camel-fury -version=4.13.0-SNAPSHOT -projectName=Camel :: Fury -projectDescription=Camel Fury support diff --git a/components/pom.xml b/components/pom.xml index 9a319e3f40c..a4b057fde39 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -141,7 +141,7 @@ <module>camel-fop</module> <module>camel-freemarker</module> <module>camel-ftp</module> - <module>camel-fury</module> + <module>camel-fory</module> <module>camel-geocoder</module> <module>camel-git</module> <module>camel-github</module> diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/dataFormats.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/dataFormats.json index 2428196ae02..4eb58384efd 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/dataFormats.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/dataFormats.json @@ -12,6 +12,6 @@ "output": false }, "properties": { - "dataFormats": { "index": 0, "kind": "element", "displayName": "Data Formats", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] + "dataFormats": { "index": 0, "kind": "element", "displayName": "Data Formats", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] } } diff --git a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/fory.json similarity index 73% rename from components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json rename to core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/fory.json index 7f3951fe2b4..38abe61c847 100644 --- a/components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/fory.json @@ -1,25 +1,22 @@ { - "dataformat": { - "kind": "dataformat", - "name": "fury", - "title": "Fury", - "description": "Serialize and deserialize messages using Apache Fury", + "model": { + "kind": "model", + "name": "fory", + "title": "Fory", + "description": "Serialize and deserialize messages using Apache Fory", "deprecated": false, "firstVersion": "4.9.0", "label": "dataformat,transformation", - "javaType": "org.apache.camel.component.fury.FuryDataFormat", - "supportLevel": "Preview", - "groupId": "org.apache.camel", - "artifactId": "camel-fury", - "version": "4.13.0-SNAPSHOT", - "modelName": "fury", - "modelJavaType": "org.apache.camel.model.dataformat.FuryDataFormat" + "javaType": "org.apache.camel.model.dataformat.ForyDataFormat", + "abstract": false, + "input": false, + "output": false }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, "unmarshalType": { "index": 1, "kind": "attribute", "displayName": "Unmarshal Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class of the java type to use when unmarshalling" }, "requireClassRegistration": { "index": 2, "kind": "attribute", "displayName": "Require Class Registration", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to require register classes" }, - "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fury" }, - "allowAutoWiredFury": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fury", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fury from the registry" } + "threadSafe": { "index": 3, "kind": "attribute", "displayName": "Thread Safe", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use the threadsafe fory" }, + "allowAutoWiredFory": { "index": 4, "kind": "attribute", "displayName": "Allow Auto Wired Fory", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover Fory from the registry" } } } diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json index 7bea9a3bac9..1125fc01435 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json @@ -15,7 +15,7 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }, "disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "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." }, - "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] + "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] "variableSend": { "index": 4, "kind": "attribute", "displayName": "Variable Send", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is tak [...] "variableReceive": { "index": 5, "kind": "attribute", "displayName": "Variable Receive", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable th [...] } diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json index 3214b3b8e14..90a3339ce27 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json @@ -12,7 +12,7 @@ "output": false }, "properties": { - "dataFormatType": { "index": 0, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf", "rss" [...] + "dataFormatType": { "index": 0, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf", "rss" [...] "scheme": { "index": 1, "kind": "attribute", "displayName": "Scheme", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set a scheme name supported by the transformer. If you specify 'csv', the transformer will be picked up for all of 'csv' from\/to Java transformation. Note that the scheme matching is performed only when no exactly matched transformer exists." }, "name": { "index": 2, "kind": "attribute", "displayName": "Name", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set the transformer name under which the transformer gets referenced when specifying the input\/output data type on routes. If you specify a transformer name that matches a data type scheme like 'csv' the transformer will be picked up for all of 'csv:' from\/t [...] "fromType": { "index": 3, "kind": "attribute", "displayName": "From Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set the 'from' data type name. If you specify 'xml:XYZ', the transformer will be picked up if source type is 'xml:XYZ'. If you specify just 'xml', the transformer matches with all of 'xml' source type like 'xml:ABC' or 'xml:DEF'." }, diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json index a77bdafa13c..6de9ae5e296 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json @@ -15,7 +15,7 @@ "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "index": 1, "kind": "attribute", "displayName": "Description", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }, "disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled", "group": "advanced", "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." }, - "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fury", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] + "dataFormatType": { "index": 3, "kind": "element", "displayName": "Data Format Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "dfdl", "fhirJson", "fhirXml", "flatpack", "fory", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "parquetAvro", "pgp", "protobuf [...] "variableSend": { "index": 4, "kind": "attribute", "displayName": "Variable Send", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is tak [...] "variableReceive": { "index": 5, "kind": "attribute", "displayName": "Variable Receive", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable th [...] "allowNullBody": { "index": 6, "kind": "attribute", "displayName": "Allow Null Body", "group": "advanced", "label": "advanced", "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." } diff --git a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties index fc37cee42a0..28c679a5b4d 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties +++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties @@ -60,6 +60,7 @@ fhirJson fhirXml filter flatpack +fory from fury get diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index index a6bca7e3953..831e27c61ed 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jaxb.index @@ -16,7 +16,7 @@ DfdlDataFormat FhirJsonDataFormat FhirXmlDataFormat FlatpackDataFormat -FuryDataFormat +ForyDataFormat GrokDataFormat GzipDeflaterDataFormat HL7DataFormat diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java index 982292a394b..5ed906dff66 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatBuilderFactory.java @@ -30,7 +30,7 @@ import org.apache.camel.model.dataformat.DfdlDataFormat; import org.apache.camel.model.dataformat.FhirJsonDataFormat; import org.apache.camel.model.dataformat.FhirXmlDataFormat; import org.apache.camel.model.dataformat.FlatpackDataFormat; -import org.apache.camel.model.dataformat.FuryDataFormat; +import org.apache.camel.model.dataformat.ForyDataFormat; import org.apache.camel.model.dataformat.GrokDataFormat; import org.apache.camel.model.dataformat.GzipDeflaterDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; @@ -165,10 +165,10 @@ public final class DataFormatBuilderFactory { } /** - * Uses the Fury data format + * Uses the Fory data format */ - public FuryDataFormat.Builder fury() { - return new FuryDataFormat.Builder(); + public ForyDataFormat.Builder fory() { + return new ForyDataFormat.Builder(); } /** diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java index 2ee02bd9e57..d2abb864ec5 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java @@ -37,7 +37,7 @@ import org.apache.camel.model.dataformat.CustomDataFormat; import org.apache.camel.model.dataformat.DfdlDataFormat; import org.apache.camel.model.dataformat.FhirJsonDataFormat; import org.apache.camel.model.dataformat.FhirXmlDataFormat; -import org.apache.camel.model.dataformat.FuryDataFormat; +import org.apache.camel.model.dataformat.ForyDataFormat; import org.apache.camel.model.dataformat.GrokDataFormat; import org.apache.camel.model.dataformat.GzipDeflaterDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; @@ -315,18 +315,18 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> { } /** - * Use the Fury data format + * Use the Fory data format */ - public T fury() { - return dataFormat(new FuryDataFormat()); + public T fory() { + return dataFormat(new ForyDataFormat()); } /** - * Use the Fury data format with the given unmarshalType + * Use the Fory data format with the given unmarshalType */ - public T fury(Class type) { - FuryDataFormat format = new FuryDataFormat(); + public T fory(Class type) { + ForyDataFormat format = new ForyDataFormat(); format.setUnmarshalType(type); return dataFormat(format); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java index 593d23b6dd5..79a9953cb6d 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java @@ -37,7 +37,7 @@ import org.apache.camel.model.dataformat.DfdlDataFormat; import org.apache.camel.model.dataformat.FhirJsonDataFormat; import org.apache.camel.model.dataformat.FhirXmlDataFormat; import org.apache.camel.model.dataformat.FlatpackDataFormat; -import org.apache.camel.model.dataformat.FuryDataFormat; +import org.apache.camel.model.dataformat.ForyDataFormat; import org.apache.camel.model.dataformat.GrokDataFormat; import org.apache.camel.model.dataformat.GzipDeflaterDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; @@ -92,7 +92,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class), @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class), @XmlElement(name = "flatpack", type = FlatpackDataFormat.class), - @XmlElement(name = "fury", type = FuryDataFormat.class), + @XmlElement(name = "fory", type = ForyDataFormat.class), @XmlElement(name = "grok", type = GrokDataFormat.class), @XmlElement(name = "gzipDeflater", type = GzipDeflaterDataFormat.class), @XmlElement(name = "hl7", type = HL7DataFormat.class), diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java index 5f4f5c276b7..536b25c8495 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java @@ -37,7 +37,7 @@ import org.apache.camel.model.dataformat.DfdlDataFormat; import org.apache.camel.model.dataformat.FhirJsonDataFormat; import org.apache.camel.model.dataformat.FhirXmlDataFormat; import org.apache.camel.model.dataformat.FlatpackDataFormat; -import org.apache.camel.model.dataformat.FuryDataFormat; +import org.apache.camel.model.dataformat.ForyDataFormat; import org.apache.camel.model.dataformat.GrokDataFormat; import org.apache.camel.model.dataformat.GzipDeflaterDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; @@ -92,7 +92,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class), @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class), @XmlElement(name = "flatpack", type = FlatpackDataFormat.class), - @XmlElement(name = "fury", type = FuryDataFormat.class), + @XmlElement(name = "fory", type = ForyDataFormat.class), @XmlElement(name = "grok", type = GrokDataFormat.class), @XmlElement(name = "gzipDeflater", type = GzipDeflaterDataFormat.class), @XmlElement(name = "hl7", type = HL7DataFormat.class), diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java index 606ea87eced..74ab4828caa 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java @@ -57,7 +57,7 @@ public class DataFormatsDefinition implements CopyableDefinition<DataFormatsDefi @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class), @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class), @XmlElement(name = "flatpack", type = FlatpackDataFormat.class), - @XmlElement(name = "fury", type = FuryDataFormat.class), + @XmlElement(name = "fory", type = ForyDataFormat.class), @XmlElement(name = "grok", type = GrokDataFormat.class), @XmlElement(name = "gzipDeflater", type = GzipDeflaterDataFormat.class), @XmlElement(name = "hl7", type = HL7DataFormat.class), diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FuryDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ForyDataFormat.java similarity index 77% rename from core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FuryDataFormat.java rename to core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ForyDataFormat.java index 49d72a74355..33e87578d91 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FuryDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/ForyDataFormat.java @@ -27,12 +27,12 @@ import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.Metadata; /** - * Serialize and deserialize messages using Apache Fury + * Serialize and deserialize messages using Apache Fory */ -@Metadata(firstVersion = "4.9.0", label = "dataformat,transformation", title = "Fury") -@XmlRootElement(name = "fury") +@Metadata(firstVersion = "4.9.0", label = "dataformat,transformation", title = "Fory") +@XmlRootElement(name = "fory") @XmlAccessorType(XmlAccessType.FIELD) -public class FuryDataFormat extends DataFormatDefinition { +public class ForyDataFormat extends DataFormatDefinition { @XmlTransient private Class<?> unmarshalType; @@ -46,39 +46,39 @@ public class FuryDataFormat extends DataFormatDefinition { private String requireClassRegistration; @XmlAttribute - @Metadata(label = "advanced", description = "Whether to use the threadsafe fury", defaultValue = "true", + @Metadata(label = "advanced", description = "Whether to use the threadsafe fory", defaultValue = "true", javaType = "java.lang.Boolean") private String threadSafe; @XmlAttribute - @Metadata(label = "advanced", description = "Whether to auto-discover Fury from the registry", defaultValue = "true", + @Metadata(label = "advanced", description = "Whether to auto-discover Fory from the registry", defaultValue = "true", javaType = "java.lang.Boolean") - private String allowAutoWiredFury; + private String allowAutoWiredFory; - public FuryDataFormat() { - super("fury"); + public ForyDataFormat() { + super("fory"); } - public FuryDataFormat(FuryDataFormat source) { + public ForyDataFormat(ForyDataFormat source) { super(source); this.unmarshalType = source.unmarshalType; this.unmarshalTypeName = source.unmarshalTypeName; this.requireClassRegistration = source.requireClassRegistration; this.threadSafe = source.threadSafe; - this.allowAutoWiredFury = source.allowAutoWiredFury; + this.allowAutoWiredFory = source.allowAutoWiredFory; } - private FuryDataFormat(Builder builder) { + private ForyDataFormat(Builder builder) { this.unmarshalType = builder.unmarshalType; this.unmarshalTypeName = builder.unmarshalTypeName; this.requireClassRegistration = builder.requireClassRegistration; this.threadSafe = builder.threadSafe; - this.allowAutoWiredFury = builder.allowAutoWiredFury; + this.allowAutoWiredFory = builder.allowAutoWiredFory; } @Override - public FuryDataFormat copyDefinition() { - return new FuryDataFormat(this); + public ForyDataFormat copyDefinition() { + return new ForyDataFormat(this); } public Class<?> getUnmarshalType() { @@ -113,24 +113,24 @@ public class FuryDataFormat extends DataFormatDefinition { this.threadSafe = threadSafe; } - public String getAllowAutoWiredFury() { - return allowAutoWiredFury; + public String getAllowAutoWiredFory() { + return allowAutoWiredFory; } - public void setAllowAutoWiredFury(String allowAutoWiredFury) { - this.allowAutoWiredFury = allowAutoWiredFury; + public void setAllowAutoWiredFory(String allowAutoWiredFory) { + this.allowAutoWiredFory = allowAutoWiredFory; } /** - * {@code Builder} is a specific builder for {@link FuryDataFormat}. + * {@code Builder} is a specific builder for {@link ForyDataFormat}. */ @XmlTransient - public static class Builder implements DataFormatBuilder<FuryDataFormat> { + public static class Builder implements DataFormatBuilder<ForyDataFormat> { private Class<?> unmarshalType; private String unmarshalTypeName; private String requireClassRegistration; private String threadSafe; - private String allowAutoWiredFury; + private String allowAutoWiredFory; public Builder unmarshalType(Class<?> value) { this.unmarshalType = value; @@ -152,14 +152,14 @@ public class FuryDataFormat extends DataFormatDefinition { return this; } - public Builder allowAutoWiredFury(String value) { - this.allowAutoWiredFury = value; + public Builder allowAutoWiredFory(String value) { + this.allowAutoWiredFory = value; return this; } @Override - public FuryDataFormat end() { - return new FuryDataFormat(this); + public ForyDataFormat end() { + return new ForyDataFormat(this); } } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java index 9d8e9342470..86ea836025a 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java @@ -36,7 +36,7 @@ import org.apache.camel.model.dataformat.CustomDataFormat; import org.apache.camel.model.dataformat.FhirJsonDataFormat; import org.apache.camel.model.dataformat.FhirXmlDataFormat; import org.apache.camel.model.dataformat.FlatpackDataFormat; -import org.apache.camel.model.dataformat.FuryDataFormat; +import org.apache.camel.model.dataformat.ForyDataFormat; import org.apache.camel.model.dataformat.GrokDataFormat; import org.apache.camel.model.dataformat.GzipDeflaterDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; @@ -92,7 +92,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class), @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class), @XmlElement(name = "flatpack", type = FlatpackDataFormat.class), - @XmlElement(name = "fury", type = FuryDataFormat.class), + @XmlElement(name = "fory", type = ForyDataFormat.class), @XmlElement(name = "grok", type = GrokDataFormat.class), @XmlElement(name = "gzipDeflater", type = GzipDeflaterDataFormat.class), @XmlElement(name = "hl7", type = HL7DataFormat.class), diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java index ff5d07fe903..ad2af7ad3dd 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java @@ -24,52 +24,7 @@ import java.util.function.BiFunction; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.model.Model; -import org.apache.camel.model.dataformat.ASN1DataFormat; -import org.apache.camel.model.dataformat.AvroDataFormat; -import org.apache.camel.model.dataformat.BarcodeDataFormat; -import org.apache.camel.model.dataformat.Base64DataFormat; -import org.apache.camel.model.dataformat.BeanioDataFormat; -import org.apache.camel.model.dataformat.BindyDataFormat; -import org.apache.camel.model.dataformat.CBORDataFormat; -import org.apache.camel.model.dataformat.ContentTypeHeaderAware; -import org.apache.camel.model.dataformat.CryptoDataFormat; -import org.apache.camel.model.dataformat.CsvDataFormat; -import org.apache.camel.model.dataformat.CustomDataFormat; -import org.apache.camel.model.dataformat.DfdlDataFormat; -import org.apache.camel.model.dataformat.FhirDataformat; -import org.apache.camel.model.dataformat.FhirJsonDataFormat; -import org.apache.camel.model.dataformat.FhirXmlDataFormat; -import org.apache.camel.model.dataformat.FlatpackDataFormat; -import org.apache.camel.model.dataformat.FuryDataFormat; -import org.apache.camel.model.dataformat.GrokDataFormat; -import org.apache.camel.model.dataformat.GzipDeflaterDataFormat; -import org.apache.camel.model.dataformat.HL7DataFormat; -import org.apache.camel.model.dataformat.IcalDataFormat; -import org.apache.camel.model.dataformat.JacksonXMLDataFormat; -import org.apache.camel.model.dataformat.JaxbDataFormat; -import org.apache.camel.model.dataformat.JsonApiDataFormat; -import org.apache.camel.model.dataformat.JsonDataFormat; -import org.apache.camel.model.dataformat.LZFDataFormat; -import org.apache.camel.model.dataformat.MimeMultipartDataFormat; -import org.apache.camel.model.dataformat.PGPDataFormat; -import org.apache.camel.model.dataformat.ParquetAvroDataFormat; -import org.apache.camel.model.dataformat.ProtobufDataFormat; -import org.apache.camel.model.dataformat.RssDataFormat; -import org.apache.camel.model.dataformat.SmooksDataFormat; -import org.apache.camel.model.dataformat.SoapDataFormat; -import org.apache.camel.model.dataformat.SwiftMtDataFormat; -import org.apache.camel.model.dataformat.SwiftMxDataFormat; -import org.apache.camel.model.dataformat.SyslogDataFormat; -import org.apache.camel.model.dataformat.TarFileDataFormat; -import org.apache.camel.model.dataformat.ThriftDataFormat; -import org.apache.camel.model.dataformat.TidyMarkupDataFormat; -import org.apache.camel.model.dataformat.UniVocityCsvDataFormat; -import org.apache.camel.model.dataformat.UniVocityFixedDataFormat; -import org.apache.camel.model.dataformat.UniVocityTsvDataFormat; -import org.apache.camel.model.dataformat.XMLSecurityDataFormat; -import org.apache.camel.model.dataformat.YAMLDataFormat; -import org.apache.camel.model.dataformat.ZipDeflaterDataFormat; -import org.apache.camel.model.dataformat.ZipFileDataFormat; +import org.apache.camel.model.dataformat.*; import org.apache.camel.reifier.AbstractReifier; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatContentTypeHeader; @@ -209,8 +164,8 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends return new FhirDataFormatReifier<>(camelContext, definition); } else if (definition instanceof FlatpackDataFormat) { return new FlatpackDataFormatReifier(camelContext, definition); - } else if (definition instanceof FuryDataFormat) { - return new FuryDataFormatReifier(camelContext, definition); + } else if (definition instanceof ForyDataFormat) { + return new ForyDataFormatReifier(camelContext, definition); } else if (definition instanceof GrokDataFormat) { return new GrokDataFormatReifier(camelContext, definition); } else if (definition instanceof GzipDeflaterDataFormat) { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FuryDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ForyDataFormatReifier.java similarity index 84% rename from core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FuryDataFormatReifier.java rename to core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ForyDataFormatReifier.java index 2cc00ddcce9..daf9989f46e 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FuryDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/ForyDataFormatReifier.java @@ -20,11 +20,11 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.dataformat.FuryDataFormat; +import org.apache.camel.model.dataformat.ForyDataFormat; -public class FuryDataFormatReifier extends DataFormatReifier<FuryDataFormat> { - public FuryDataFormatReifier(CamelContext camelContext, DataFormatDefinition definition) { - super(camelContext, (FuryDataFormat) definition); +public class ForyDataFormatReifier extends DataFormatReifier<ForyDataFormat> { + public ForyDataFormatReifier(CamelContext camelContext, DataFormatDefinition definition) { + super(camelContext, (ForyDataFormat) definition); } @Override @@ -32,6 +32,6 @@ public class FuryDataFormatReifier extends DataFormatReifier<FuryDataFormat> { properties.put("unmarshalType", definition.getUnmarshalType()); properties.put("requireClassRegistration", definition.getRequireClassRegistration()); properties.put("threadSafe", definition.getThreadSafe()); - properties.put("allowAutoWiredFury", definition.getAllowAutoWiredFury()); + properties.put("allowAutoWiredFury", definition.getAllowAutoWiredFory()); } } 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 b2614ea160f..70cfe1b01f6 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 @@ -15,6 +15,7 @@ fastjson fhirJson fhirXml flatpack +fory fury grok gson 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 338b55ee63a..87598cc4478 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 @@ -1934,9 +1934,9 @@ public class ModelParser extends BaseParser { default: yield identifiedTypeAttributeHandler().accept(def, key, val); }, noElementHandler(), noValueHandler()); } - protected FuryDataFormat doParseFuryDataFormat() throws IOException, XmlPullParserException { - return doParse(new FuryDataFormat(), (def, key, val) -> switch (key) { - case "allowAutoWiredFury": def.setAllowAutoWiredFury(val); yield true; + protected ForyDataFormat doParseForyDataFormat() throws IOException, XmlPullParserException { + return doParse(new ForyDataFormat(), (def, key, val) -> switch (key) { + case "allowAutoWiredFory": def.setAllowAutoWiredFory(val); yield true; case "requireClassRegistration": def.setRequireClassRegistration(val); yield true; case "threadSafe": def.setThreadSafe(val); yield true; case "unmarshalType": def.setUnmarshalTypeName(val); yield true; @@ -2950,7 +2950,7 @@ public class ModelParser extends BaseParser { case "fhirJson": return doParseFhirJsonDataFormat(); case "fhirXml": return doParseFhirXmlDataFormat(); case "flatpack": return doParseFlatpackDataFormat(); - case "fury": return doParseFuryDataFormat(); + case "fory": return doParseForyDataFormat(); case "grok": return doParseGrokDataFormat(); case "gzipDeflater": return doParseGzipDeflaterDataFormat(); case "hl7": return doParseHL7DataFormat(); diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java index 062ff02bfe0..d5aa32b0426 100644 --- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java +++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java @@ -484,8 +484,8 @@ public class ModelWriter extends BaseWriter { public void writeFlatpackDataFormat(FlatpackDataFormat def) throws IOException { doWriteFlatpackDataFormat("flatpack", def); } - public void writeFuryDataFormat(FuryDataFormat def) throws IOException { - doWriteFuryDataFormat("fury", def); + public void writeForyDataFormat(ForyDataFormat def) throws IOException { + doWriteForyDataFormat("fory", def); } public void writeGrokDataFormat(GrokDataFormat def) throws IOException { doWriteGrokDataFormat("grok", def); @@ -1215,7 +1215,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); @@ -1974,7 +1974,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); @@ -2536,7 +2536,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); @@ -2627,13 +2627,13 @@ public class ModelWriter extends BaseWriter { doWriteAttribute("ignoreExtraColumns", def.getIgnoreExtraColumns(), null); endElement(name); } - protected void doWriteFuryDataFormat(String name, FuryDataFormat def) throws IOException { + protected void doWriteForyDataFormat(String name, ForyDataFormat def) throws IOException { startElement(name); doWriteIdentifiedTypeAttributes(def); + doWriteAttribute("allowAutoWiredFory", def.getAllowAutoWiredFory(), "true"); doWriteAttribute("unmarshalType", def.getUnmarshalTypeName(), null); doWriteAttribute("threadSafe", def.getThreadSafe(), "true"); doWriteAttribute("requireClassRegistration", def.getRequireClassRegistration(), "true"); - doWriteAttribute("allowAutoWiredFury", def.getAllowAutoWiredFury(), "true"); endElement(name); } protected void doWriteGrokDataFormat(String name, GrokDataFormat def) throws IOException { @@ -3669,7 +3669,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); diff --git a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java index a3a33eea40b..a28d76d766b 100644 --- a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java +++ b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java @@ -484,8 +484,8 @@ public class ModelWriter extends BaseWriter { public void writeFlatpackDataFormat(FlatpackDataFormat def) throws IOException { doWriteFlatpackDataFormat("flatpack", def); } - public void writeFuryDataFormat(FuryDataFormat def) throws IOException { - doWriteFuryDataFormat("fury", def); + public void writeForyDataFormat(ForyDataFormat def) throws IOException { + doWriteForyDataFormat("fory", def); } public void writeGrokDataFormat(GrokDataFormat def) throws IOException { doWriteGrokDataFormat("grok", def); @@ -1215,7 +1215,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); @@ -1974,7 +1974,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); @@ -2536,7 +2536,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); @@ -2627,13 +2627,13 @@ public class ModelWriter extends BaseWriter { doWriteAttribute("ignoreExtraColumns", def.getIgnoreExtraColumns(), null); endElement(name); } - protected void doWriteFuryDataFormat(String name, FuryDataFormat def) throws IOException { + protected void doWriteForyDataFormat(String name, ForyDataFormat def) throws IOException { startElement(name); doWriteIdentifiedTypeAttributes(def); + doWriteAttribute("allowAutoWiredFory", def.getAllowAutoWiredFory(), "true"); doWriteAttribute("unmarshalType", def.getUnmarshalTypeName(), null); doWriteAttribute("threadSafe", def.getThreadSafe(), "true"); doWriteAttribute("requireClassRegistration", def.getRequireClassRegistration(), "true"); - doWriteAttribute("allowAutoWiredFury", def.getAllowAutoWiredFury(), "true"); endElement(name); } protected void doWriteGrokDataFormat(String name, GrokDataFormat def) throws IOException { @@ -3669,7 +3669,7 @@ public class ModelWriter extends BaseWriter { case "FhirJsonDataFormat" -> doWriteFhirJsonDataFormat("fhirJson", (FhirJsonDataFormat) v); case "FhirXmlDataFormat" -> doWriteFhirXmlDataFormat("fhirXml", (FhirXmlDataFormat) v); case "FlatpackDataFormat" -> doWriteFlatpackDataFormat("flatpack", (FlatpackDataFormat) v); - case "FuryDataFormat" -> doWriteFuryDataFormat("fury", (FuryDataFormat) v); + case "ForyDataFormat" -> doWriteForyDataFormat("fory", (ForyDataFormat) v); case "GrokDataFormat" -> doWriteGrokDataFormat("grok", (GrokDataFormat) v); case "GzipDeflaterDataFormat" -> doWriteGzipDeflaterDataFormat("gzipDeflater", (GzipDeflaterDataFormat) v); case "HL7DataFormat" -> doWriteHL7DataFormat("hl7", (HL7DataFormat) v); diff --git a/docs/components/modules/dataformats/examples/json/fory.json b/docs/components/modules/dataformats/examples/json/fory.json new file mode 120000 index 00000000000..b870f263b13 --- /dev/null +++ b/docs/components/modules/dataformats/examples/json/fory.json @@ -0,0 +1 @@ +../../../../../../components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fory/fory.json \ No newline at end of file diff --git a/docs/components/modules/dataformats/examples/json/fury.json b/docs/components/modules/dataformats/examples/json/fury.json index 89f636e73bb..abcadfd02a0 120000 --- a/docs/components/modules/dataformats/examples/json/fury.json +++ b/docs/components/modules/dataformats/examples/json/fury.json @@ -1 +1 @@ -../../../../../../components/camel-fury/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json \ No newline at end of file +../../../../../../components/camel-fory/src/generated/resources/META-INF/org/apache/camel/component/fury/fury.json \ No newline at end of file diff --git a/docs/components/modules/dataformats/nav.adoc b/docs/components/modules/dataformats/nav.adoc index 52c503e2383..1e94462890a 100644 --- a/docs/components/modules/dataformats/nav.adoc +++ b/docs/components/modules/dataformats/nav.adoc @@ -16,7 +16,7 @@ ** xref:fhirJson-dataformat.adoc[FHIR JSon] ** xref:fhirXml-dataformat.adoc[FHIR XML] ** xref:flatpack-dataformat.adoc[Flatpack] -** xref:fury-dataformat.adoc[Fury] +** xref:fory-dataformat.adoc[Fory] ** xref:grok-dataformat.adoc[Grok] ** xref:gzipDeflater-dataformat.adoc[GZip Deflater] ** xref:hl7-dataformat.adoc[HL7] diff --git a/docs/components/modules/dataformats/pages/fory-dataformat.adoc b/docs/components/modules/dataformats/pages/fory-dataformat.adoc new file mode 120000 index 00000000000..676f79c833b --- /dev/null +++ b/docs/components/modules/dataformats/pages/fory-dataformat.adoc @@ -0,0 +1 @@ +../../../../../components/camel-fory/src/main/docs/fory-dataformat.adoc \ No newline at end of file diff --git a/docs/components/modules/dataformats/pages/fury-dataformat.adoc b/docs/components/modules/dataformats/pages/fury-dataformat.adoc deleted file mode 120000 index f54d2089424..00000000000 --- a/docs/components/modules/dataformats/pages/fury-dataformat.adoc +++ /dev/null @@ -1 +0,0 @@ -../../../../../components/camel-fury/src/main/docs/fury-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 74538f108a2..38ea2c612b2 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 @@ -150,7 +150,7 @@ import org.apache.camel.model.dataformat.DfdlDataFormat; import org.apache.camel.model.dataformat.FhirJsonDataFormat; import org.apache.camel.model.dataformat.FhirXmlDataFormat; import org.apache.camel.model.dataformat.FlatpackDataFormat; -import org.apache.camel.model.dataformat.FuryDataFormat; +import org.apache.camel.model.dataformat.ForyDataFormat; import org.apache.camel.model.dataformat.GrokDataFormat; import org.apache.camel.model.dataformat.GzipDeflaterDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; @@ -3502,8 +3502,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "fhirJson", type = "object:org.apache.camel.model.dataformat.FhirJsonDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "fhirXml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat", oneOf = "dataFormatType"), + @YamlProperty(name = "fory", type = "object:org.apache.camel.model.dataformat.ForyDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "fromType", type = "string", description = "Set the 'from' data type name. If you specify 'xml:XYZ', the transformer will be picked up if source type is 'xml:XYZ'. If you specify just 'xml', the transformer matches with all of 'xml' source type like 'xml:ABC' or 'xml:DEF'.", displayName = "From Type"), - @YamlProperty(name = "fury", type = "object:org.apache.camel.model.dataformat.FuryDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "grok", type = "object:org.apache.camel.model.dataformat.GrokDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "gzipDeflater", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat", oneOf = "dataFormatType"), @@ -3623,8 +3623,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "fury": { - org.apache.camel.model.dataformat.FuryDataFormat val = asType(node, org.apache.camel.model.dataformat.FuryDataFormat.class); + case "fory": { + org.apache.camel.model.dataformat.ForyDataFormat val = asType(node, org.apache.camel.model.dataformat.ForyDataFormat.class); target.setDataFormatType(val); break; } @@ -3822,7 +3822,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "fhirJson", type = "object:org.apache.camel.model.dataformat.FhirJsonDataFormat"), @YamlProperty(name = "fhirXml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat"), @YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat"), - @YamlProperty(name = "fury", type = "object:org.apache.camel.model.dataformat.FuryDataFormat"), + @YamlProperty(name = "fory", type = "object:org.apache.camel.model.dataformat.ForyDataFormat"), @YamlProperty(name = "grok", type = "object:org.apache.camel.model.dataformat.GrokDataFormat"), @YamlProperty(name = "gzipDeflater", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat"), @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat"), @@ -4004,8 +4004,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormats(existing); break; } - case "fury": { - org.apache.camel.model.dataformat.FuryDataFormat val = asType(node, org.apache.camel.model.dataformat.FuryDataFormat.class); + case "fory": { + org.apache.camel.model.dataformat.ForyDataFormat val = asType(node, org.apache.camel.model.dataformat.ForyDataFormat.class); java.util.List<org.apache.camel.model.DataFormatDefinition> existing = target.getDataFormats(); if (existing == null) { existing = new java.util.ArrayList<>(); @@ -6229,38 +6229,38 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @YamlType( - nodes = "fury", - types = org.apache.camel.model.dataformat.FuryDataFormat.class, + nodes = "fory", + types = org.apache.camel.model.dataformat.ForyDataFormat.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, - displayName = "Fury", - description = "Serialize and deserialize messages using Apache Fury", + displayName = "Fory", + description = "Serialize and deserialize messages using Apache Fory", deprecated = false, properties = { - @YamlProperty(name = "allowAutoWiredFury", type = "boolean", description = "Whether to auto-discover Fury from the registry", displayName = "Allow Auto Wired Fury"), + @YamlProperty(name = "allowAutoWiredFory", type = "boolean", description = "Whether to auto-discover Fory from the registry", displayName = "Allow Auto Wired Fory"), @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id"), @YamlProperty(name = "requireClassRegistration", type = "boolean", description = "Whether to require register classes", displayName = "Require Class Registration"), - @YamlProperty(name = "threadSafe", type = "boolean", description = "Whether to use the threadsafe fury", displayName = "Thread Safe"), + @YamlProperty(name = "threadSafe", type = "boolean", description = "Whether to use the threadsafe fory", displayName = "Thread Safe"), @YamlProperty(name = "unmarshalType", type = "string", description = "Class of the java type to use when unmarshalling", displayName = "Unmarshal Type") } ) - public static class FuryDataFormatDeserializer extends YamlDeserializerBase<FuryDataFormat> { - public FuryDataFormatDeserializer() { - super(FuryDataFormat.class); + public static class ForyDataFormatDeserializer extends YamlDeserializerBase<ForyDataFormat> { + public ForyDataFormatDeserializer() { + super(ForyDataFormat.class); } @Override - protected FuryDataFormat newInstance() { - return new FuryDataFormat(); + protected ForyDataFormat newInstance() { + return new ForyDataFormat(); } @Override - protected boolean setProperty(FuryDataFormat target, String propertyKey, + protected boolean setProperty(ForyDataFormat target, String propertyKey, String propertyName, Node node) { propertyKey = org.apache.camel.util.StringHelper.dashToCamelCase(propertyKey); switch(propertyKey) { - case "allowAutoWiredFury": { + case "allowAutoWiredFory": { String val = asText(node); - target.setAllowAutoWiredFury(val); + target.setAllowAutoWiredFory(val); break; } case "id": { @@ -9641,7 +9641,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "fhirJson", type = "object:org.apache.camel.model.dataformat.FhirJsonDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "fhirXml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat", oneOf = "dataFormatType"), - @YamlProperty(name = "fury", type = "object:org.apache.camel.model.dataformat.FuryDataFormat", oneOf = "dataFormatType"), + @YamlProperty(name = "fory", type = "object:org.apache.camel.model.dataformat.ForyDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "grok", type = "object:org.apache.camel.model.dataformat.GrokDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "gzipDeflater", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat", oneOf = "dataFormatType"), @@ -9766,8 +9766,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "fury": { - org.apache.camel.model.dataformat.FuryDataFormat val = asType(node, org.apache.camel.model.dataformat.FuryDataFormat.class); + case "fory": { + org.apache.camel.model.dataformat.ForyDataFormat val = asType(node, org.apache.camel.model.dataformat.ForyDataFormat.class); target.setDataFormatType(val); break; } @@ -19864,7 +19864,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "fhirJson", type = "object:org.apache.camel.model.dataformat.FhirJsonDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "fhirXml", type = "object:org.apache.camel.model.dataformat.FhirXmlDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "flatpack", type = "object:org.apache.camel.model.dataformat.FlatpackDataFormat", oneOf = "dataFormatType"), - @YamlProperty(name = "fury", type = "object:org.apache.camel.model.dataformat.FuryDataFormat", oneOf = "dataFormatType"), + @YamlProperty(name = "fory", type = "object:org.apache.camel.model.dataformat.ForyDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "grok", type = "object:org.apache.camel.model.dataformat.GrokDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "gzipDeflater", type = "object:org.apache.camel.model.dataformat.GzipDeflaterDataFormat", oneOf = "dataFormatType"), @YamlProperty(name = "hl7", type = "object:org.apache.camel.model.dataformat.HL7DataFormat", oneOf = "dataFormatType"), @@ -19994,8 +19994,8 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDataFormatType(val); break; } - case "fury": { - org.apache.camel.model.dataformat.FuryDataFormat val = asType(node, org.apache.camel.model.dataformat.FuryDataFormat.class); + case "fory": { + org.apache.camel.model.dataformat.ForyDataFormat val = asType(node, org.apache.camel.model.dataformat.ForyDataFormat.class); target.setDataFormatType(val); break; } 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 5239fceba77..aff887f78a3 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 @@ -139,8 +139,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve case "org.apache.camel.model.FinallyDefinition": return new ModelDeserializers.FinallyDefinitionDeserializer(); case "flatpack": return new ModelDeserializers.FlatpackDataFormatDeserializer(); case "org.apache.camel.model.dataformat.FlatpackDataFormat": return new ModelDeserializers.FlatpackDataFormatDeserializer(); - case "fury": return new ModelDeserializers.FuryDataFormatDeserializer(); - case "org.apache.camel.model.dataformat.FuryDataFormat": return new ModelDeserializers.FuryDataFormatDeserializer(); + case "fory": return new ModelDeserializers.ForyDataFormatDeserializer(); + case "org.apache.camel.model.dataformat.ForyDataFormat": return new ModelDeserializers.ForyDataFormatDeserializer(); case "get": return new ModelDeserializers.GetDefinitionDeserializer(); case "org.apache.camel.model.rest.GetDefinition": return new ModelDeserializers.GetDefinitionDeserializer(); case "globalOption": return new ModelDeserializers.GlobalOptionDefinitionDeserializer(); 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 6bc5311fb97..3cb49623b16 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 @@ -2860,7 +2860,7 @@ }, { "required" : [ "flatpack" ] }, { - "required" : [ "fury" ] + "required" : [ "fory" ] }, { "required" : [ "grok" ] }, { @@ -3027,10 +3027,10 @@ } }, { "type" : "object", - "required" : [ "fury" ], + "required" : [ "fory" ], "properties" : { - "fury" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FuryDataFormat" + "fory" : { + "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ForyDataFormat" } } }, { @@ -3307,7 +3307,7 @@ "fhirJson" : { }, "fhirXml" : { }, "flatpack" : { }, - "fury" : { }, + "fory" : { }, "grok" : { }, "gzipDeflater" : { }, "hl7" : { }, @@ -7786,7 +7786,7 @@ "fhirJson" : { }, "fhirXml" : { }, "flatpack" : { }, - "fury" : { }, + "fory" : { }, "grok" : { }, "gzipDeflater" : { }, "hl7" : { }, @@ -7857,7 +7857,7 @@ }, { "required" : [ "flatpack" ] }, { - "required" : [ "fury" ] + "required" : [ "fory" ] }, { "required" : [ "grok" ] }, { @@ -8024,10 +8024,10 @@ } }, { "type" : "object", - "required" : [ "fury" ], + "required" : [ "fory" ], "properties" : { - "fury" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FuryDataFormat" + "fory" : { + "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ForyDataFormat" } } }, { @@ -10634,8 +10634,8 @@ "flatpack" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FlatpackDataFormat" }, - "fury" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FuryDataFormat" + "fory" : { + "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ForyDataFormat" }, "grok" : { "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat" @@ -11023,16 +11023,16 @@ } } }, - "org.apache.camel.model.dataformat.FuryDataFormat" : { - "title" : "Fury", - "description" : "Serialize and deserialize messages using Apache Fury", + "org.apache.camel.model.dataformat.ForyDataFormat" : { + "title" : "Fory", + "description" : "Serialize and deserialize messages using Apache Fory", "type" : "object", "additionalProperties" : false, "properties" : { - "allowAutoWiredFury" : { + "allowAutoWiredFory" : { "type" : "boolean", - "title" : "Allow Auto Wired Fury", - "description" : "Whether to auto-discover Fury from the registry" + "title" : "Allow Auto Wired Fory", + "description" : "Whether to auto-discover Fory from the registry" }, "id" : { "type" : "string", @@ -11047,7 +11047,7 @@ "threadSafe" : { "type" : "boolean", "title" : "Thread Safe", - "description" : "Whether to use the threadsafe fury" + "description" : "Whether to use the threadsafe fory" }, "unmarshalType" : { "type" : "string", @@ -16388,7 +16388,7 @@ }, { "required" : [ "flatpack" ] }, { - "required" : [ "fury" ] + "required" : [ "fory" ] }, { "required" : [ "grok" ] }, { @@ -16547,10 +16547,10 @@ } }, { "type" : "object", - "required" : [ "fury" ], + "required" : [ "fory" ], "properties" : { - "fury" : { - "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FuryDataFormat" + "fory" : { + "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ForyDataFormat" } } }, { @@ -16821,7 +16821,7 @@ "fhirJson" : { }, "fhirXml" : { }, "flatpack" : { }, - "fury" : { }, + "fory" : { }, "grok" : { }, "gzipDeflater" : { }, "hl7" : { }, diff --git a/parent/pom.xml b/parent/pom.xml index 86f72108f6a..6015bbeff4d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -162,7 +162,7 @@ <formatter-maven-plugin-version>2.25.0</formatter-maven-plugin-version> <ftpserver-version>1.2.1</ftpserver-version> <freemarker-version>2.3.34</freemarker-version> - <fury-version>0.10.3</fury-version> + <fory-version>0.11.0</fory-version> <geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version> <geronimo-annotation-1.2-spec-version>1.0</geronimo-annotation-1.2-spec-version> <geronimo-atinject-1.0-spec-version>1.0</geronimo-atinject-1.0-spec-version> @@ -1334,17 +1334,17 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-freemarker</artifactId> + <artifactId>camel-fory</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-ftp</artifactId> + <artifactId>camel-freemarker</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-fury</artifactId> + <artifactId>camel-ftp</artifactId> <version>${project.version}</version> </dependency> <dependency>
