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 0745ff58835ff6f5efd2a522e79561ce4c72f32e Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 14:43:36 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../org/apache/camel/catalog/dataformats/crypto.json | 6 +++--- .../org/apache/camel/catalog/models/crypto.json | 6 +++--- .../org/apache/camel/catalog/schemas/camel-spring.xsd | 6 +++--- .../org/apache/camel/catalog/schemas/camel-xml-io.xsd | 6 +++--- .../ROOT/pages/camel-4x-upgrade-guide-4_15.adoc | 13 +++++++++++++ .../dsl/yaml/deserializers/ModelDeserializers.java | 18 +++++++++--------- .../src/generated/resources/schema/camelYamlDsl.json | 12 ++++++------ 7 files changed, 40 insertions(+), 27 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json index c8e6de4c22f..a1ac745524f 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json @@ -18,10 +18,10 @@ "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" }, "algorithm": { "index": 1, "kind": "attribute", "displayName": "Algorithm", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The JCE algorithm name indicating the cryptographic algorithm that will be used." }, - "keyRef": { "index": 2, "kind": "attribute", "displayName": "Key Ref", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to the secret key to lookup from the register to use." }, + "key": { "index": 2, "kind": "attribute", "displayName": "Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.Key", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to the secret key to lookup from the register to use." }, "cryptoProvider": { "index": 3, "kind": "attribute", "displayName": "Crypto Provider", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the JCE Security Provider that should be used." }, - "initVectorRef": { "index": 4, "kind": "attribute", "displayName": "Init Vector Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a byte array containing the Initialization Vector that will be used to initialize the Cipher." }, - "algorithmParameterRef": { "index": 5, "kind": "attribute", "displayName": "Algorithm Parameter Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "A JCE AlgorithmParameterSpec used to initialize the Cipher. Will lookup the type using the given name as a java.security.spec.AlgorithmParameterSpec type." }, + "initVector": { "index": 4, "kind": "attribute", "displayName": "Init Vector", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "byte[]", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a byte array containing the Initialization Vector that will be used to initialize the Cipher." }, + "algorithmParameterSpec": { "index": 5, "kind": "attribute", "displayName": "Algorithm Parameter Spec", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.security.spec.AlgorithmParameterSpec", "deprecated": false, "autowired": false, "secret": false, "description": "A JCE AlgorithmParameterSpec used to initialize the Cipher. Will lookup the type using the given name as a java.security.spec.AlgorithmParameterSpec type." }, "bufferSize": { "index": 6, "kind": "attribute", "displayName": "Buffer Size", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "4096", "description": "The size of the buffer used in the signature process." }, "macAlgorithm": { "index": 7, "kind": "attribute", "displayName": "Mac Algorithm", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HmacSHA1", "description": "The JCE algorithm name indicating the Message Authentication algorithm." }, "shouldAppendHMAC": { "index": 8, "kind": "attribute", "displayName": "Should Append HMAC", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data." }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/crypto.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/crypto.json index 15955ae7717..792087934b0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/crypto.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/crypto.json @@ -15,10 +15,10 @@ "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" }, "algorithm": { "index": 1, "kind": "attribute", "displayName": "Algorithm", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The JCE algorithm name indicating the cryptographic algorithm that will be used." }, - "keyRef": { "index": 2, "kind": "attribute", "displayName": "Key Ref", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to the secret key to lookup from the register to use." }, + "key": { "index": 2, "kind": "attribute", "displayName": "Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.Key", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to the secret key to lookup from the register to use." }, "cryptoProvider": { "index": 3, "kind": "attribute", "displayName": "Crypto Provider", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the JCE Security Provider that should be used." }, - "initVectorRef": { "index": 4, "kind": "attribute", "displayName": "Init Vector Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a byte array containing the Initialization Vector that will be used to initialize the Cipher." }, - "algorithmParameterRef": { "index": 5, "kind": "attribute", "displayName": "Algorithm Parameter Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "A JCE AlgorithmParameterSpec used to initialize the Cipher. Will lookup the type using the given name as a java.security.spec.AlgorithmParameterSpec type." }, + "initVector": { "index": 4, "kind": "attribute", "displayName": "Init Vector", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "byte[]", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a byte array containing the Initialization Vector that will be used to initialize the Cipher." }, + "algorithmParameterSpec": { "index": 5, "kind": "attribute", "displayName": "Algorithm Parameter Spec", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.security.spec.AlgorithmParameterSpec", "deprecated": false, "autowired": false, "secret": false, "description": "A JCE AlgorithmParameterSpec used to initialize the Cipher. Will lookup the type using the given name as a java.security.spec.AlgorithmParameterSpec type." }, "bufferSize": { "index": 6, "kind": "attribute", "displayName": "Buffer Size", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "4096", "description": "The size of the buffer used in the signature process." }, "macAlgorithm": { "index": 7, "kind": "attribute", "displayName": "Mac Algorithm", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HmacSHA1", "description": "The JCE algorithm name indicating the Message Authentication algorithm." }, "shouldAppendHMAC": { "index": 8, "kind": "attribute", "displayName": "Should Append HMAC", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data." }, 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 caedc349206..02922dd0fee 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 @@ -8178,7 +8178,7 @@ The JCE algorithm name indicating the cryptographic algorithm that will be used. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="keyRef" type="xs:string"> + <xs:attribute name="key" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"> <