This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 13b1596a9cc7d7104a888d2963e6723fc3b77529 Author: nicolaferraro <ni.ferr...@gmail.com> AuthorDate: Fri May 14 10:33:46 2021 +0200 Regen DSL for avro-jackson and protobuf-jackson dataformats --- .../org/apache/camel/builder/DataFormatClause.java | 2 +- .../java/org/apache/camel/xml/in/ModelParser.java | 52 ++++ .../dsl/yaml/deserializers/ModelDeserializers.java | 276 +++++++++++++++++++++ .../deserializers/ModelDeserializersResolver.java | 4 + .../src/generated/resources/camel-yaml-dsl.json | 118 +++++++++ 5 files changed, 451 insertions(+), 1 deletion(-) 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 cdcc155..9a501e7 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 @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.StringJoiner; -import org.apache.camel.model.dataformat.ProtobufJacksonDataFormat; import org.w3c.dom.Node; import org.apache.camel.model.DataFormatDefinition; @@ -53,6 +52,7 @@ 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.ProtobufDataFormat; +import org.apache.camel.model.dataformat.ProtobufJacksonDataFormat; import org.apache.camel.model.dataformat.RssDataFormat; import org.apache.camel.model.dataformat.SoapJaxbDataFormat; import org.apache.camel.model.dataformat.SyslogDataFormat; 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 723e0d1..43695d0 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 @@ -1753,6 +1753,31 @@ public class ModelParser extends BaseParser { return identifiedTypeAttributeHandler().accept(def, key, val); }, noElementHandler(), noValueHandler()); } + protected AvroJacksonDataFormat doParseAvroJacksonDataFormat() throws IOException, XmlPullParserException { + return doParse(new AvroJacksonDataFormat(), (def, key, val) -> { + switch (key) { + case "allowJmsType": def.setAllowJmsType(val); break; + case "allowUnmarshallType": def.setAllowUnmarshallType(val); break; + case "autoDiscoverObjectMapper": def.setAutoDiscoverObjectMapper(val); break; + case "collectionTypeName": def.setCollectionTypeName(val); break; + case "contentTypeHeader": def.setContentTypeHeader(val); break; + case "disableFeatures": def.setDisableFeatures(val); break; + case "enableFeatures": def.setEnableFeatures(val); break; + case "include": def.setInclude(val); break; + case "jsonViewTypeName": def.setJsonViewTypeName(val); break; + case "moduleClassNames": def.setModuleClassNames(val); break; + case "moduleRefs": def.setModuleRefs(val); break; + case "objectMapper": def.setObjectMapper(val); break; + case "prettyPrint": def.setPrettyPrint(val); break; + case "timezone": def.setTimezone(val); break; + case "unmarshalTypeName": def.setUnmarshalTypeName(val); break; + case "useDefaultObjectMapper": def.setUseDefaultObjectMapper(val); break; + case "useList": def.setUseList(val); break; + default: return identifiedTypeAttributeHandler().accept(def, key, val); + } + return true; + }, noElementHandler(), noValueHandler()); + } protected BarcodeDataFormat doParseBarcodeDataFormat() throws IOException, XmlPullParserException { return doParse(new BarcodeDataFormat(), (def, key, val) -> { switch (key) { @@ -2123,6 +2148,31 @@ public class ModelParser extends BaseParser { return true; }, noElementHandler(), noValueHandler()); } + protected ProtobufJacksonDataFormat doParseProtobufJacksonDataFormat() throws IOException, XmlPullParserException { + return doParse(new ProtobufJacksonDataFormat(), (def, key, val) -> { + switch (key) { + case "allowJmsType": def.setAllowJmsType(val); break; + case "allowUnmarshallType": def.setAllowUnmarshallType(val); break; + case "autoDiscoverObjectMapper": def.setAutoDiscoverObjectMapper(val); break; + case "collectionTypeName": def.setCollectionTypeName(val); break; + case "contentTypeHeader": def.setContentTypeHeader(val); break; + case "disableFeatures": def.setDisableFeatures(val); break; + case "enableFeatures": def.setEnableFeatures(val); break; + case "include": def.setInclude(val); break; + case "jsonViewTypeName": def.setJsonViewTypeName(val); break; + case "moduleClassNames": def.setModuleClassNames(val); break; + case "moduleRefs": def.setModuleRefs(val); break; + case "objectMapper": def.setObjectMapper(val); break; + case "prettyPrint": def.setPrettyPrint(val); break; + case "timezone": def.setTimezone(val); break; + case "unmarshalTypeName": def.setUnmarshalTypeName(val); break; + case "useDefaultObjectMapper": def.setUseDefaultObjectMapper(val); break; + case "useList": def.setUseList(val); break; + default: return identifiedTypeAttributeHandler().accept(def, key, val); + } + return true; + }, noElementHandler(), noValueHandler()); + } protected RssDataFormat doParseRssDataFormat() throws IOException, XmlPullParserException { return doParse(new RssDataFormat(), identifiedTypeAttributeHandler(), noElementHandler(), noValueHandler()); @@ -3062,6 +3112,7 @@ public class ModelParser extends BaseParser { case "asn1": return doParseASN1DataFormat(); case "any23": return doParseAny23DataFormat(); case "avro": return doParseAvroDataFormat(); + case "avro-jackson": return doParseAvroJacksonDataFormat(); case "barcode": return doParseBarcodeDataFormat(); case "base64": return doParseBase64DataFormat(); case "beanio": return doParseBeanioDataFormat(); @@ -3085,6 +3136,7 @@ public class ModelParser extends BaseParser { case "mime-multipart": return doParseMimeMultipartDataFormat(); case "pgp": return doParsePGPDataFormat(); case "protobuf": return doParseProtobufDataFormat(); + case "protobuf-jackson": return doParseProtobufJacksonDataFormat(); case "rss": return doParseRssDataFormat(); case "soapjaxb": return doParseSoapJaxbDataFormat(); case "syslog": return doParseSyslogDataFormat(); 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 bf4bf0f..abab7bc 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 @@ -129,6 +129,7 @@ import org.apache.camel.model.config.StreamResequencerConfig; import org.apache.camel.model.dataformat.ASN1DataFormat; import org.apache.camel.model.dataformat.Any23DataFormat; import org.apache.camel.model.dataformat.AvroDataFormat; +import org.apache.camel.model.dataformat.AvroJacksonDataFormat; import org.apache.camel.model.dataformat.BarcodeDataFormat; import org.apache.camel.model.dataformat.Base64DataFormat; import org.apache.camel.model.dataformat.BeanioDataFormat; @@ -153,6 +154,7 @@ 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.ProtobufDataFormat; +import org.apache.camel.model.dataformat.ProtobufJacksonDataFormat; import org.apache.camel.model.dataformat.RssDataFormat; import org.apache.camel.model.dataformat.SoapJaxbDataFormat; import org.apache.camel.model.dataformat.SyslogDataFormat; @@ -605,6 +607,143 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @YamlType( + types = org.apache.camel.model.dataformat.AvroJacksonDataFormat.class, + order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, + nodes = "avro-jackson", + properties = { + @YamlProperty(name = "allow-jms-type", type = "boolean"), + @YamlProperty(name = "allow-unmarshall-type", type = "boolean"), + @YamlProperty(name = "auto-discover-object-mapper", type = "boolean"), + @YamlProperty(name = "collection-type-name", type = "string"), + @YamlProperty(name = "content-type-header", type = "boolean"), + @YamlProperty(name = "disable-features", type = "string"), + @YamlProperty(name = "enable-features", type = "string"), + @YamlProperty(name = "id", type = "string"), + @YamlProperty(name = "include", type = "string"), + @YamlProperty(name = "json-view-type-name", type = "string"), + @YamlProperty(name = "module-class-names", type = "string"), + @YamlProperty(name = "module-refs", type = "string"), + @YamlProperty(name = "object-mapper", type = "string"), + @YamlProperty(name = "pretty-print", type = "boolean"), + @YamlProperty(name = "timezone", type = "string"), + @YamlProperty(name = "unmarshal-type-name", type = "string"), + @YamlProperty(name = "use-default-object-mapper", type = "boolean"), + @YamlProperty(name = "use-list", type = "boolean") + } + ) + public static class AvroJacksonDataFormatDeserializer extends YamlDeserializerBase<AvroJacksonDataFormat> { + public AvroJacksonDataFormatDeserializer() { + super(AvroJacksonDataFormat.class); + } + + @Override + protected AvroJacksonDataFormat newInstance() { + return new AvroJacksonDataFormat(); + } + + @Override + protected boolean setProperty(AvroJacksonDataFormat target, String propertyKey, + String propertyName, Node node) { + switch(propertyKey) { + case "allow-jms-type": { + String val = asText(node); + target.setAllowJmsType(val); + break; + } + case "allow-unmarshall-type": { + String val = asText(node); + target.setAllowUnmarshallType(val); + break; + } + case "auto-discover-object-mapper": { + String val = asText(node); + target.setAutoDiscoverObjectMapper(val); + break; + } + case "collection-type-name": { + String val = asText(node); + target.setCollectionTypeName(val); + break; + } + case "content-type-header": { + String val = asText(node); + target.setContentTypeHeader(val); + break; + } + case "disable-features": { + String val = asText(node); + target.setDisableFeatures(val); + break; + } + case "enable-features": { + String val = asText(node); + target.setEnableFeatures(val); + break; + } + case "id": { + String val = asText(node); + target.setId(val); + break; + } + case "include": { + String val = asText(node); + target.setInclude(val); + break; + } + case "json-view-type-name": { + String val = asText(node); + target.setJsonViewTypeName(val); + break; + } + case "module-class-names": { + String val = asText(node); + target.setModuleClassNames(val); + break; + } + case "module-refs": { + String val = asText(node); + target.setModuleRefs(val); + break; + } + case "object-mapper": { + String val = asText(node); + target.setObjectMapper(val); + break; + } + case "pretty-print": { + String val = asText(node); + target.setPrettyPrint(val); + break; + } + case "timezone": { + String val = asText(node); + target.setTimezone(val); + break; + } + case "unmarshal-type-name": { + String val = asText(node); + target.setUnmarshalTypeName(val); + break; + } + case "use-default-object-mapper": { + String val = asText(node); + target.setUseDefaultObjectMapper(val); + break; + } + case "use-list": { + String val = asText(node); + target.setUseList(val); + break; + } + default: { + return false; + } + } + return true; + } + } + + @YamlType( types = org.apache.camel.model.dataformat.BarcodeDataFormat.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, nodes = "barcode", @@ -9570,6 +9709,143 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @YamlType( + types = org.apache.camel.model.dataformat.ProtobufJacksonDataFormat.class, + order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, + nodes = "protobuf-jackson", + properties = { + @YamlProperty(name = "allow-jms-type", type = "boolean"), + @YamlProperty(name = "allow-unmarshall-type", type = "boolean"), + @YamlProperty(name = "auto-discover-object-mapper", type = "boolean"), + @YamlProperty(name = "collection-type-name", type = "string"), + @YamlProperty(name = "content-type-header", type = "boolean"), + @YamlProperty(name = "disable-features", type = "string"), + @YamlProperty(name = "enable-features", type = "string"), + @YamlProperty(name = "id", type = "string"), + @YamlProperty(name = "include", type = "string"), + @YamlProperty(name = "json-view-type-name", type = "string"), + @YamlProperty(name = "module-class-names", type = "string"), + @YamlProperty(name = "module-refs", type = "string"), + @YamlProperty(name = "object-mapper", type = "string"), + @YamlProperty(name = "pretty-print", type = "boolean"), + @YamlProperty(name = "timezone", type = "string"), + @YamlProperty(name = "unmarshal-type-name", type = "string"), + @YamlProperty(name = "use-default-object-mapper", type = "boolean"), + @YamlProperty(name = "use-list", type = "boolean") + } + ) + public static class ProtobufJacksonDataFormatDeserializer extends YamlDeserializerBase<ProtobufJacksonDataFormat> { + public ProtobufJacksonDataFormatDeserializer() { + super(ProtobufJacksonDataFormat.class); + } + + @Override + protected ProtobufJacksonDataFormat newInstance() { + return new ProtobufJacksonDataFormat(); + } + + @Override + protected boolean setProperty(ProtobufJacksonDataFormat target, String propertyKey, + String propertyName, Node node) { + switch(propertyKey) { + case "allow-jms-type": { + String val = asText(node); + target.setAllowJmsType(val); + break; + } + case "allow-unmarshall-type": { + String val = asText(node); + target.setAllowUnmarshallType(val); + break; + } + case "auto-discover-object-mapper": { + String val = asText(node); + target.setAutoDiscoverObjectMapper(val); + break; + } + case "collection-type-name": { + String val = asText(node); + target.setCollectionTypeName(val); + break; + } + case "content-type-header": { + String val = asText(node); + target.setContentTypeHeader(val); + break; + } + case "disable-features": { + String val = asText(node); + target.setDisableFeatures(val); + break; + } + case "enable-features": { + String val = asText(node); + target.setEnableFeatures(val); + break; + } + case "id": { + String val = asText(node); + target.setId(val); + break; + } + case "include": { + String val = asText(node); + target.setInclude(val); + break; + } + case "json-view-type-name": { + String val = asText(node); + target.setJsonViewTypeName(val); + break; + } + case "module-class-names": { + String val = asText(node); + target.setModuleClassNames(val); + break; + } + case "module-refs": { + String val = asText(node); + target.setModuleRefs(val); + break; + } + case "object-mapper": { + String val = asText(node); + target.setObjectMapper(val); + break; + } + case "pretty-print": { + String val = asText(node); + target.setPrettyPrint(val); + break; + } + case "timezone": { + String val = asText(node); + target.setTimezone(val); + break; + } + case "unmarshal-type-name": { + String val = asText(node); + target.setUnmarshalTypeName(val); + break; + } + case "use-default-object-mapper": { + String val = asText(node); + target.setUseDefaultObjectMapper(val); + break; + } + case "use-list": { + String val = asText(node); + target.setUseList(val); + break; + } + default: { + return false; + } + } + return true; + } + } + + @YamlType( types = org.apache.camel.model.rest.PutVerbDefinition.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, nodes = "put", 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 737c084..f8be55d 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 @@ -23,6 +23,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve case "org.apache.camel.model.dataformat.Any23DataFormat": return new ModelDeserializers.Any23DataFormatDeserializer(); case "avro": return new ModelDeserializers.AvroDataFormatDeserializer(); case "org.apache.camel.model.dataformat.AvroDataFormat": return new ModelDeserializers.AvroDataFormatDeserializer(); + case "avro-jackson": return new ModelDeserializers.AvroJacksonDataFormatDeserializer(); + case "org.apache.camel.model.dataformat.AvroJacksonDataFormat": return new ModelDeserializers.AvroJacksonDataFormatDeserializer(); case "barcode": return new ModelDeserializers.BarcodeDataFormatDeserializer(); case "org.apache.camel.model.dataformat.BarcodeDataFormat": return new ModelDeserializers.BarcodeDataFormatDeserializer(); case "base64": return new ModelDeserializers.Base64DataFormatDeserializer(); @@ -232,6 +234,8 @@ public final class ModelDeserializersResolver implements YamlDeserializerResolve case "org.apache.camel.model.PropertyDefinition": return new ModelDeserializers.PropertyDefinitionDeserializer(); case "protobuf": return new ModelDeserializers.ProtobufDataFormatDeserializer(); case "org.apache.camel.model.dataformat.ProtobufDataFormat": return new ModelDeserializers.ProtobufDataFormatDeserializer(); + case "protobuf-jackson": return new ModelDeserializers.ProtobufJacksonDataFormatDeserializer(); + case "org.apache.camel.model.dataformat.ProtobufJacksonDataFormat": return new ModelDeserializers.ProtobufJacksonDataFormatDeserializer(); case "put": return new ModelDeserializers.PutVerbDefinitionDeserializer(); case "org.apache.camel.model.rest.PutVerbDefinition": return new ModelDeserializers.PutVerbDefinitionDeserializer(); case "random": return new ModelDeserializers.RandomLoadBalancerDefinitionDeserializer(); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json index 9b37036..080d18c 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json @@ -3684,6 +3684,65 @@ } ], "required" : [ "instance-class-name" ] }, + "org.apache.camel.model.dataformat.AvroJacksonDataFormat" : { + "type" : "object", + "properties" : { + "allow-jms-type" : { + "type" : "boolean" + }, + "allow-unmarshall-type" : { + "type" : "boolean" + }, + "auto-discover-object-mapper" : { + "type" : "boolean" + }, + "collection-type-name" : { + "type" : "string" + }, + "content-type-header" : { + "type" : "boolean" + }, + "disable-features" : { + "type" : "string" + }, + "enable-features" : { + "type" : "string" + }, + "id" : { + "type" : "string" + }, + "include" : { + "type" : "string" + }, + "json-view-type-name" : { + "type" : "string" + }, + "module-class-names" : { + "type" : "string" + }, + "module-refs" : { + "type" : "string" + }, + "object-mapper" : { + "type" : "string" + }, + "pretty-print" : { + "type" : "boolean" + }, + "timezone" : { + "type" : "string" + }, + "unmarshal-type-name" : { + "type" : "string" + }, + "use-default-object-mapper" : { + "type" : "boolean" + }, + "use-list" : { + "type" : "boolean" + } + } + }, "org.apache.camel.model.dataformat.BarcodeDataFormat" : { "type" : "object", "properties" : { @@ -4593,6 +4652,65 @@ } } ] }, + "org.apache.camel.model.dataformat.ProtobufJacksonDataFormat" : { + "type" : "object", + "properties" : { + "allow-jms-type" : { + "type" : "boolean" + }, + "allow-unmarshall-type" : { + "type" : "boolean" + }, + "auto-discover-object-mapper" : { + "type" : "boolean" + }, + "collection-type-name" : { + "type" : "string" + }, + "content-type-header" : { + "type" : "boolean" + }, + "disable-features" : { + "type" : "string" + }, + "enable-features" : { + "type" : "string" + }, + "id" : { + "type" : "string" + }, + "include" : { + "type" : "string" + }, + "json-view-type-name" : { + "type" : "string" + }, + "module-class-names" : { + "type" : "string" + }, + "module-refs" : { + "type" : "string" + }, + "object-mapper" : { + "type" : "string" + }, + "pretty-print" : { + "type" : "boolean" + }, + "timezone" : { + "type" : "string" + }, + "unmarshal-type-name" : { + "type" : "string" + }, + "use-default-object-mapper" : { + "type" : "boolean" + }, + "use-list" : { + "type" : "boolean" + } + } + }, "org.apache.camel.model.dataformat.RssDataFormat" : { "type" : "object", "properties" : {