This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch df2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit d905c72f4f361cd1795a2f64b61a6b0b2ec56f7f Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 15:51:35 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../org/apache/camel/catalog/dataformats/flatpack.json | 2 +- .../resources/org/apache/camel/catalog/dataformats/hl7.json | 3 ++- .../resources/org/apache/camel/catalog/models/flatpack.json | 2 +- .../resources/org/apache/camel/catalog/models/hl7.json | 3 ++- .../org/apache/camel/catalog/schemas/camel-spring.xsd | 11 ++++++++++- .../org/apache/camel/catalog/schemas/camel-xml-io.xsd | 11 ++++++++++- .../camel/dsl/yaml/deserializers/ModelDeserializers.java | 12 +++++++++--- .../src/generated/resources/schema/camelYamlDsl.json | 9 +++++++-- 8 files changed, 42 insertions(+), 11 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json index 89d2b11e607..4bfb04c115c 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json @@ -24,6 +24,6 @@ "allowShortLines": { "index": 5, "kind": "attribute", "displayName": "Allow Short Lines", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be shorter than expected and ignores the extra characters" }, "ignoreExtraColumns": { "index": 6, "kind": "attribute", "displayName": "Ignore Extra Columns", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be longer than expected and ignores the extra characters." }, "textQualifier": { "index": 7, "kind": "attribute", "displayName": "Text Qualifier", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If the text is qualified with a character. Uses quote character by default." }, - "parserFactoryRef": { "index": 8, "kind": "attribute", "displayName": "Parser Factory Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } + "parserFactory": { "index": 8, "kind": "attribute", "displayName": "Parser Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.flatpack.ParserFactory", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json index 5f1a14a7edb..c062656e493 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json @@ -17,6 +17,7 @@ }, "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" }, - "validate": { "index": 1, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } + "parser": { "index": 1, "kind": "attribute", "displayName": "Parser", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "ca.uhn.hl7v2.parser.Parser", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HL7 parser" }, + "validate": { "index": 2, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json index e50aced2627..217792c0895 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json @@ -21,6 +21,6 @@ "allowShortLines": { "index": 5, "kind": "attribute", "displayName": "Allow Short Lines", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be shorter than expected and ignores the extra characters" }, "ignoreExtraColumns": { "index": 6, "kind": "attribute", "displayName": "Ignore Extra Columns", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be longer than expected and ignores the extra characters." }, "textQualifier": { "index": 7, "kind": "attribute", "displayName": "Text Qualifier", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If the text is qualified with a character. Uses quote character by default." }, - "parserFactoryRef": { "index": 8, "kind": "attribute", "displayName": "Parser Factory Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } + "parserFactory": { "index": 8, "kind": "attribute", "displayName": "Parser Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.flatpack.ParserFactory", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7.json index 61e6e8ad894..0276a225212 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7.json @@ -14,6 +14,7 @@ }, "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" }, - "validate": { "index": 1, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } + "parser": { "index": 1, "kind": "attribute", "displayName": "Parser", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "ca.uhn.hl7v2.parser.Parser", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HL7 parser" }, + "validate": { "index": 2, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } } } 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 15c743edbca..f7895ee41d4 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 @@ -8855,7 +8855,7 @@ If the text is qualified with a character. Uses quote character by default. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="parserFactoryRef" type="xs:string"> + <xs:attribute name="parserFactory" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -8966,6 +8966,15 @@ Whether to capture named expressions only or not (i.e. %{IP:ip} but not ${IP}). <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> + <xs:attribute name="parser" type="xs:string"> + <xs:annotation> + <xs:documentation xml:lang="en"> +<![CDATA[ +To use a custom HL7 parser. +]]> + </xs:documentation> + </xs:annotation> + </xs:attribute> <xs:attribute name="validate" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> 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 d25ed527382..0c64f00ac63 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 @@ -7528,7 +7528,7 @@ If the text is qualified with a character. Uses quote character by default. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="parserFactoryRef" type="xs:string"> + <xs:attribute name="parserFactory" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ @@ -7639,6 +7639,15 @@ Whether to capture named expressions only or not (i.e. %{IP:ip} but not ${IP}). <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> + <xs:attribute name="parser" type="xs:string"> + <xs:annotation> + <xs:documentation xml:lang="en"> +<![CDATA[ +To use a custom HL7 parser. +]]> + </xs:documentation> + </xs:annotation> + </xs:attribute> <xs:attribute name="validate" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> 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 089b2f6b888..2e80a907564 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 @@ -6168,7 +6168,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id"), @YamlProperty(name = "ignoreExtraColumns", type = "boolean", description = "Allows for lines to be longer than expected and ignores the extra characters.", displayName = "Ignore Extra Columns"), @YamlProperty(name = "ignoreFirstRecord", type = "boolean", description = "Whether the first line is ignored for delimited files (for the column headers). Is by default true.", displayName = "Ignore First Record"), - @YamlProperty(name = "parserFactoryRef", type = "string", description = "References to a custom parser factory to lookup in the registry", displayName = "Parser Factory Ref"), + @YamlProperty(name = "parserFactory", type = "string", description = "References to a custom parser factory to lookup in the registry", displayName = "Parser Factory"), @YamlProperty(name = "textQualifier", type = "string", description = "If the text is qualified with a character. Uses quote character by default.", displayName = "Text Qualifier") } ) @@ -6222,9 +6222,9 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setIgnoreFirstRecord(val); break; } - case "parserFactoryRef": { + case "parserFactory": { String val = asText(node); - target.setParserFactoryRef(val); + target.setParserFactory(val); break; } case "textQualifier": { @@ -6731,6 +6731,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { deprecated = false, properties = { @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id"), + @YamlProperty(name = "parser", type = "string", description = "To use a custom HL7 parser", displayName = "Parser"), @YamlProperty(name = "validate", type = "boolean", description = "Whether to validate the HL7 message Is by default true.", displayName = "Validate") } ) @@ -6754,6 +6755,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setId(val); break; } + case "parser": { + String val = asText(node); + target.setParser(val); + break; + } case "validate": { String val = asText(node); target.setValidate(val); 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 983383db819..de7ca4b8542 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 @@ -11034,9 +11034,9 @@ "title" : "Ignore First Record", "description" : "Whether the first line is ignored for delimited files (for the column headers). Is by default true." }, - "parserFactoryRef" : { + "parserFactory" : { "type" : "string", - "title" : "Parser Factory Ref", + "title" : "Parser Factory", "description" : "References to a custom parser factory to lookup in the registry" }, "textQualifier" : { @@ -11137,6 +11137,11 @@ "title" : "Id", "description" : "The id of this node" }, + "parser" : { + "type" : "string", + "title" : "Parser", + "description" : "To use a custom HL7 parser" + }, "validate" : { "type" : "boolean", "title" : "Validate",
