This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 792bb5421b3 CAMEL-19728: parquetAvro is missing in dataformats model
792bb5421b3 is described below
commit 792bb5421b3e9b2a7785bc3ba68177b00b341abc
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Aug 9 11:38:57 2023 +0200
CAMEL-19728: parquetAvro is missing in dataformats model
---
.../apache/camel/catalog/models/dataFormats.json | 2 +-
.../apache/camel/model/dataformat/dataFormats.json | 2 +-
.../model/dataformat/DataFormatsDefinition.java | 3 ++-
.../java/org/apache/camel/xml/out/ModelWriter.java | 3 ++-
.../org/apache/camel/yaml/out/ModelWriter.java | 3 ++-
.../dsl/yaml/deserializers/ModelDeserializers.java | 31 +++++++++++++++-------
.../generated/resources/schema/camel-yaml-dsl.json | 3 +++
.../generated/resources/schema/camelYamlDsl.json | 3 +++
8 files changed, 35 insertions(+), 15 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormats.json
index 021d5fb0a20..b2b8fb14fa8 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", "required": true, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [
"asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv",
"custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7",
"ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp",
"protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "t [...]
+ "dataFormats": { "index": 0, "kind": "element", "displayName": "Data
Formats", "required": true, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [
"asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv",
"custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7",
"ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart",
"parquetAvro", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx [...]
}
}
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
index 021d5fb0a20..b2b8fb14fa8 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
@@ -12,6 +12,6 @@
"output": false
},
"properties": {
- "dataFormats": { "index": 0, "kind": "element", "displayName": "Data
Formats", "required": true, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [
"asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv",
"custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7",
"ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp",
"protobuf", "rss", "soap", "swiftMt", "swiftMx", "syslog", "t [...]
+ "dataFormats": { "index": 0, "kind": "element", "displayName": "Data
Formats", "required": true, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [
"asn1", "avro", "barcode", "base64", "bindy", "cbor", "crypto", "csv",
"custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7",
"ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart",
"parquetAvro", "pgp", "protobuf", "rss", "soap", "swiftMt", "swiftMx [...]
}
}
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 e82b73ec068..6925e7f75f0 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
@@ -61,6 +61,8 @@ public class DataFormatsDefinition {
@XmlElement(name = "jsonApi", type = JsonApiDataFormat.class),
@XmlElement(name = "lzf", type = LZFDataFormat.class),
@XmlElement(name = "mimeMultipart", type =
MimeMultipartDataFormat.class),
+ @XmlElement(name = "parquetAvro", type =
ParquetAvroDataFormat.class),
+ @XmlElement(name = "pgp", type = PGPDataFormat.class),
@XmlElement(name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(name = "rss", type = RssDataFormat.class),
@XmlElement(name = "soap", type = SoapDataFormat.class),
@@ -74,7 +76,6 @@ public class DataFormatsDefinition {
@XmlElement(name = "univocityFixed", type =
UniVocityFixedDataFormat.class),
@XmlElement(name = "univocityTsv", type =
UniVocityTsvDataFormat.class),
@XmlElement(name = "xmlSecurity", type =
XMLSecurityDataFormat.class),
- @XmlElement(name = "pgp", type = PGPDataFormat.class),
@XmlElement(name = "yaml", type = YAMLDataFormat.class),
@XmlElement(name = "zipDeflater", type =
ZipDeflaterDataFormat.class),
@XmlElement(name = "zipFile", type = ZipFileDataFormat.class) })
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 9466dcbfe84..1eb6fc5b8df 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
@@ -3137,6 +3137,8 @@ public class ModelWriter extends BaseWriter {
case "JsonApiDataFormat" ->
doWriteJsonApiDataFormat("jsonApi", (JsonApiDataFormat) v);
case "LZFDataFormat" -> doWriteLZFDataFormat("lzf",
(LZFDataFormat) v);
case "MimeMultipartDataFormat" ->
doWriteMimeMultipartDataFormat("mimeMultipart", (MimeMultipartDataFormat) v);
+ case "ParquetAvroDataFormat" ->
doWriteParquetAvroDataFormat("parquetAvro", (ParquetAvroDataFormat) v);
+ case "PGPDataFormat" -> doWritePGPDataFormat("pgp",
(PGPDataFormat) v);
case "ProtobufDataFormat" ->
doWriteProtobufDataFormat("protobuf", (ProtobufDataFormat) v);
case "RssDataFormat" -> doWriteRssDataFormat("rss",
(RssDataFormat) v);
case "SoapDataFormat" -> doWriteSoapDataFormat("soap",
(SoapDataFormat) v);
@@ -3150,7 +3152,6 @@ public class ModelWriter extends BaseWriter {
case "UniVocityFixedDataFormat" ->
doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v);
case "UniVocityTsvDataFormat" ->
doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v);
case "XMLSecurityDataFormat" ->
doWriteXMLSecurityDataFormat("xmlSecurity", (XMLSecurityDataFormat) v);
- case "PGPDataFormat" -> doWritePGPDataFormat("pgp",
(PGPDataFormat) v);
case "YAMLDataFormat" -> doWriteYAMLDataFormat("yaml",
(YAMLDataFormat) v);
case "ZipDeflaterDataFormat" ->
doWriteZipDeflaterDataFormat("zipDeflater", (ZipDeflaterDataFormat) v);
case "ZipFileDataFormat" ->
doWriteZipFileDataFormat("zipFile", (ZipFileDataFormat) 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 926278a016b..4cc192db2e5 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
@@ -3137,6 +3137,8 @@ public class ModelWriter extends BaseWriter {
case "JsonApiDataFormat" ->
doWriteJsonApiDataFormat("jsonApi", (JsonApiDataFormat) v);
case "LZFDataFormat" -> doWriteLZFDataFormat("lzf",
(LZFDataFormat) v);
case "MimeMultipartDataFormat" ->
doWriteMimeMultipartDataFormat("mimeMultipart", (MimeMultipartDataFormat) v);
+ case "ParquetAvroDataFormat" ->
doWriteParquetAvroDataFormat("parquetAvro", (ParquetAvroDataFormat) v);
+ case "PGPDataFormat" -> doWritePGPDataFormat("pgp",
(PGPDataFormat) v);
case "ProtobufDataFormat" ->
doWriteProtobufDataFormat("protobuf", (ProtobufDataFormat) v);
case "RssDataFormat" -> doWriteRssDataFormat("rss",
(RssDataFormat) v);
case "SoapDataFormat" -> doWriteSoapDataFormat("soap",
(SoapDataFormat) v);
@@ -3150,7 +3152,6 @@ public class ModelWriter extends BaseWriter {
case "UniVocityFixedDataFormat" ->
doWriteUniVocityFixedDataFormat("univocityFixed", (UniVocityFixedDataFormat) v);
case "UniVocityTsvDataFormat" ->
doWriteUniVocityTsvDataFormat("univocityTsv", (UniVocityTsvDataFormat) v);
case "XMLSecurityDataFormat" ->
doWriteXMLSecurityDataFormat("xmlSecurity", (XMLSecurityDataFormat) v);
- case "PGPDataFormat" -> doWritePGPDataFormat("pgp",
(PGPDataFormat) v);
case "YAMLDataFormat" -> doWriteYAMLDataFormat("yaml",
(YAMLDataFormat) v);
case "ZipDeflaterDataFormat" ->
doWriteZipDeflaterDataFormat("zipDeflater", (ZipDeflaterDataFormat) v);
case "ZipFileDataFormat" ->
doWriteZipFileDataFormat("zipFile", (ZipFileDataFormat) v);
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 06da686c9ec..07f56a85c6f 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
@@ -3556,6 +3556,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "json-api", type =
"object:org.apache.camel.model.dataformat.JsonApiDataFormat"),
@YamlProperty(name = "lzf", type =
"object:org.apache.camel.model.dataformat.LZFDataFormat"),
@YamlProperty(name = "mime-multipart", type =
"object:org.apache.camel.model.dataformat.MimeMultipartDataFormat"),
+ @YamlProperty(name = "parquet-avro", type =
"object:org.apache.camel.model.dataformat.ParquetAvroDataFormat"),
@YamlProperty(name = "pgp", type =
"object:org.apache.camel.model.dataformat.PGPDataFormat"),
@YamlProperty(name = "protobuf", type =
"object:org.apache.camel.model.dataformat.ProtobufDataFormat"),
@YamlProperty(name = "rss", type =
"object:org.apache.camel.model.dataformat.RssDataFormat"),
@@ -3814,6 +3815,26 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setDataFormats(existing);
break;
}
+ case "parquet-avro": {
+ org.apache.camel.model.dataformat.ParquetAvroDataFormat
val = asType(node,
org.apache.camel.model.dataformat.ParquetAvroDataFormat.class);
+
java.util.List<org.apache.camel.model.DataFormatDefinition> existing =
target.getDataFormats();
+ if (existing == null) {
+ existing = new java.util.ArrayList<>();
+ }
+ existing.add(val);
+ target.setDataFormats(existing);
+ break;
+ }
+ case "pgp": {
+ org.apache.camel.model.dataformat.PGPDataFormat val =
asType(node, org.apache.camel.model.dataformat.PGPDataFormat.class);
+
java.util.List<org.apache.camel.model.DataFormatDefinition> existing =
target.getDataFormats();
+ if (existing == null) {
+ existing = new java.util.ArrayList<>();
+ }
+ existing.add(val);
+ target.setDataFormats(existing);
+ break;
+ }
case "protobuf": {
org.apache.camel.model.dataformat.ProtobufDataFormat val =
asType(node, org.apache.camel.model.dataformat.ProtobufDataFormat.class);
java.util.List<org.apache.camel.model.DataFormatDefinition> existing =
target.getDataFormats();
@@ -3944,16 +3965,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setDataFormats(existing);
break;
}
- case "pgp": {
- org.apache.camel.model.dataformat.PGPDataFormat val =
asType(node, org.apache.camel.model.dataformat.PGPDataFormat.class);
-
java.util.List<org.apache.camel.model.DataFormatDefinition> existing =
target.getDataFormats();
- if (existing == null) {
- existing = new java.util.ArrayList<>();
- }
- existing.add(val);
- target.setDataFormats(existing);
- break;
- }
case "yaml": {
org.apache.camel.model.dataformat.YAMLDataFormat val =
asType(node, org.apache.camel.model.dataformat.YAMLDataFormat.class);
java.util.List<org.apache.camel.model.DataFormatDefinition> existing =
target.getDataFormats();
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index 02a273ee6c1..f00873555a9 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -6701,6 +6701,9 @@
"mime-multipart" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.MimeMultipartDataFormat"
},
+ "parquet-avro" : {
+ "$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.ParquetAvroDataFormat"
+ },
"pgp" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.PGPDataFormat"
},
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 12ca04ee566..6e7f9dcb269 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
@@ -6611,6 +6611,9 @@
"mimeMultipart" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.MimeMultipartDataFormat"
},
+ "parquetAvro" : {
+ "$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.ParquetAvroDataFormat"
+ },
"pgp" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.PGPDataFormat"
},
