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 7161ddf557bfa7e00f7f23af8bc4372075510c5b Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 13:36:24 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../org/apache/camel/catalog/dataformats/barcode.json | 8 ++++---- .../resources/org/apache/camel/catalog/models/barcode.json | 8 ++++---- .../org/apache/camel/catalog/schemas/camel-spring.xsd | 8 ++++---- .../org/apache/camel/catalog/schemas/camel-xml-io.xsd | 8 ++++---- .../camel/dsl/yaml/deserializers/ModelDeserializers.java | 8 ++++---- .../src/generated/resources/schema/camelYamlDsl.json | 14 ++++++++++---- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json index cd912372eaa..9466fcd737a 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json @@ -17,9 +17,9 @@ }, "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" }, - "barcodeFormat": { "index": 1, "kind": "attribute", "displayName": "Barcode Format", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Barcode format such as QR-Code" }, - "imageType": { "index": 2, "kind": "attribute", "displayName": "Image Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Image type of the barcode such as png" }, - "width": { "index": 3, "kind": "attribute", "displayName": "Width", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Width of the barcode" }, - "height": { "index": 4, "kind": "attribute", "displayName": "Height", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Height of the barcode" } + "barcodeFormat": { "index": 1, "kind": "attribute", "displayName": "Barcode Format", "group": "common", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "AZTEC", "CODABAR", "CODE_39", "CODE_93", "CODE_128", "DATA_MATRIX", "EAN_8", "EAN_13", "ITF", "MAXICODE", "PDF_417", "QR_CODE", "RSS_14", "RSS_EXPANDED", "UPC_A", "UPC_E", "UPC_EAN_EXTENSION" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "QR_CODE", "description": "Barcode fo [...] + "imageType": { "index": 2, "kind": "attribute", "displayName": "Image Type", "group": "common", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "JPG", "GIF", "PNG" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "PNG", "description": "Image type of the barcode such as png" }, + "width": { "index": 3, "kind": "attribute", "displayName": "Width", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Width of the barcode" }, + "height": { "index": 4, "kind": "attribute", "displayName": "Height", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Height of the barcode" } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/barcode.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/barcode.json index efbb00c4563..aa8806c7b47 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/barcode.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/barcode.json @@ -14,9 +14,9 @@ }, "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" }, - "barcodeFormat": { "index": 1, "kind": "attribute", "displayName": "Barcode Format", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Barcode format such as QR-Code" }, - "imageType": { "index": 2, "kind": "attribute", "displayName": "Image Type", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Image type of the barcode such as png" }, - "width": { "index": 3, "kind": "attribute", "displayName": "Width", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Width of the barcode" }, - "height": { "index": 4, "kind": "attribute", "displayName": "Height", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Height of the barcode" } + "barcodeFormat": { "index": 1, "kind": "attribute", "displayName": "Barcode Format", "group": "common", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "AZTEC", "CODABAR", "CODE_39", "CODE_93", "CODE_128", "DATA_MATRIX", "EAN_8", "EAN_13", "ITF", "MAXICODE", "PDF_417", "QR_CODE", "RSS_14", "RSS_EXPANDED", "UPC_A", "UPC_E", "UPC_EAN_EXTENSION" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "QR_CODE", "description": "Barcode fo [...] + "imageType": { "index": 2, "kind": "attribute", "displayName": "Image Type", "group": "common", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "JPG", "GIF", "PNG" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "PNG", "description": "Image type of the barcode such as png" }, + "width": { "index": 3, "kind": "attribute", "displayName": "Width", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Width of the barcode" }, + "height": { "index": 4, "kind": "attribute", "displayName": "Height", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Height of the barcode" } } } 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 80e67c9923a..caedc349206 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 @@ -7850,7 +7850,7 @@ When not disabled, the SchemaResolver will be looked up into the registry. Defau <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Barcode format such as QR-Code. +Barcode format such as QR-Code. Default value: QR_CODE ]]> </xs:documentation> </xs:annotation> @@ -7859,7 +7859,7 @@ Barcode format such as QR-Code. <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Image type of the barcode such as png. +Image type of the barcode such as png. Default value: PNG ]]> </xs:documentation> </xs:annotation> @@ -7868,7 +7868,7 @@ Image type of the barcode such as png. <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Width of the barcode. +Width of the barcode. Default value: 100 ]]> </xs:documentation> </xs:annotation> @@ -7877,7 +7877,7 @@ Width of the barcode. <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Height of the barcode. +Height of the barcode. Default value: 100 ]]> </xs:documentation> </xs:annotation> 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 f81e7608398..e42ffbe6b2c 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 @@ -6523,7 +6523,7 @@ When not disabled, the SchemaResolver will be looked up into the registry. Defau <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Barcode format such as QR-Code. +Barcode format such as QR-Code. Default value: QR_CODE ]]> </xs:documentation> </xs:annotation> @@ -6532,7 +6532,7 @@ Barcode format such as QR-Code. <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Image type of the barcode such as png. +Image type of the barcode such as png. Default value: PNG ]]> </xs:documentation> </xs:annotation> @@ -6541,7 +6541,7 @@ Image type of the barcode such as png. <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Width of the barcode. +Width of the barcode. Default value: 100 ]]> </xs:documentation> </xs:annotation> @@ -6550,7 +6550,7 @@ Width of the barcode. <xs:annotation> <xs:documentation xml:lang="en"> <![CDATA[ -Height of the barcode. +Height of the barcode. Default value: 100 ]]> </xs:documentation> </xs:annotation> 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 e638e42353b..5c07f573d5f 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 @@ -788,11 +788,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { description = "Transform strings to various 1D/2D barcode bitmap formats and back.", deprecated = false, properties = { - @YamlProperty(name = "barcodeFormat", type = "string", description = "Barcode format such as QR-Code", displayName = "Barcode Format"), - @YamlProperty(name = "height", type = "number", description = "Height of the barcode", displayName = "Height"), + @YamlProperty(name = "barcodeFormat", type = "enum:AZTEC,CODABAR,CODE_39,CODE_93,CODE_128,DATA_MATRIX,EAN_8,EAN_13,ITF,MAXICODE,PDF_417,QR_CODE,RSS_14,RSS_EXPANDED,UPC_A,UPC_E,UPC_EAN_EXTENSION", defaultValue = "QR_CODE", description = "Barcode format such as QR-Code", displayName = "Barcode Format"), + @YamlProperty(name = "height", type = "number", defaultValue = "100", description = "Height of the barcode", displayName = "Height"), @YamlProperty(name = "id", type = "string", description = "The id of this node", displayName = "Id"), - @YamlProperty(name = "imageType", type = "string", description = "Image type of the barcode such as png", displayName = "Image Type"), - @YamlProperty(name = "width", type = "number", description = "Width of the barcode", displayName = "Width") + @YamlProperty(name = "imageType", type = "enum:JPG,GIF,PNG", defaultValue = "PNG", description = "Image type of the barcode such as png", displayName = "Image Type"), + @YamlProperty(name = "width", type = "number", defaultValue = "100", description = "Width of the barcode", displayName = "Width") } ) public static class BarcodeDataFormatDeserializer extends YamlDeserializerBase<BarcodeDataFormat> { 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 a34b1e80eaa..9e333423e59 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 @@ -10151,12 +10151,15 @@ "barcodeFormat" : { "type" : "string", "title" : "Barcode Format", - "description" : "Barcode format such as QR-Code" + "description" : "Barcode format such as QR-Code", + "default" : "QR_CODE", + "enum" : [ "AZTEC", "CODABAR", "CODE_39", "CODE_93", "CODE_128", "DATA_MATRIX", "EAN_8", "EAN_13", "ITF", "MAXICODE", "PDF_417", "QR_CODE", "RSS_14", "RSS_EXPANDED", "UPC_A", "UPC_E", "UPC_EAN_EXTENSION" ] }, "height" : { "type" : "number", "title" : "Height", - "description" : "Height of the barcode" + "description" : "Height of the barcode", + "default" : "100" }, "id" : { "type" : "string", @@ -10166,12 +10169,15 @@ "imageType" : { "type" : "string", "title" : "Image Type", - "description" : "Image type of the barcode such as png" + "description" : "Image type of the barcode such as png", + "default" : "PNG", + "enum" : [ "JPG", "GIF", "PNG" ] }, "width" : { "type" : "number", "title" : "Width", - "description" : "Width of the barcode" + "description" : "Width of the barcode", + "default" : "100" } } },
