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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 603ca3af9f3 CAMEL-22354: dataformats - Align all data formats getter
setters to model
603ca3af9f3 is described below
commit 603ca3af9f3594f84328453c5686d30c5fe55416
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Aug 19 13:36:56 2025 +0200
CAMEL-22354: dataformats - Align all data formats getter setters to model
---
.../springboot/catalog/dataformats/barcode.json | 8 +--
.../springboot/catalog/dataformats/crypto.json | 6 +-
.../camel/springboot/catalog/dataformats/csv.json | 57 +++++++++---------
.../springboot/catalog/dataformats/flatpack.json | 2 +-
.../camel/springboot/catalog/dataformats/hl7.json | 3 +-
.../camel/springboot/catalog/dataformats/jaxb.json | 2 +-
.../springboot/catalog/dataformats/snakeYaml.json | 2 +-
.../camel/springboot/catalog/dataformats/soap.json | 7 ++-
.../springboot/catalog/dataformats/swiftMt.json | 2 +-
.../springboot/catalog/dataformats/swiftMx.json | 8 +--
.../catalog/dataformats/xmlSecurity.json | 5 +-
.../src/main/docs/barcode.json | 12 ++--
.../springboot/BarcodeDataFormatConfiguration.java | 8 +--
.../camel-crypto-starter/src/main/docs/crypto.json | 12 ++--
.../springboot/CryptoDataFormatConfiguration.java | 34 ++++++-----
.../springboot/CryptoDataFormatConverter.java | 66 +++++++++++++++++++++
.../camel-csv-starter/src/main/docs/csv.json | 14 ++---
.../csv/springboot/CsvDataFormatConfiguration.java | 34 ++++-------
.../src/main/docs/flatpack.json | 4 +-
.../FlatpackDataFormatConfiguration.java | 13 +++--
.../springboot/FlatpackDataFormatConverter.java | 64 ++++++++++++++++++++
.../camel-hl7-starter/src/main/docs/hl7.json | 6 ++
.../hl7/springboot/HL7DataFormatConfiguration.java | 13 +++++
.../hl7/springboot/HL7DataFormatConverter.java | 64 ++++++++++++++++++++
.../hl7/springboot/test/HL7ValidateTest.java | 10 +++-
.../camel-jaxb-starter/src/main/docs/jaxb.json | 6 +-
.../springboot/JaxbDataFormatConfiguration.java | 13 +++--
.../src/main/docs/snakeyaml.json | 6 ++
.../SnakeYAMLDataFormatConfiguration.java | 13 +++++
.../camel-soap-starter/src/main/docs/soap.json | 15 +++--
.../springboot/SoapDataFormatConfiguration.java | 39 +++++++++----
.../soap/springboot/SoapDataFormatConverter.java | 64 ++++++++++++++++++++
.../camel-swift-starter/src/main/docs/swift.json | 10 ++--
.../springboot/SwiftMxDataFormatConfiguration.java | 43 +++++++-------
.../mx/springboot/SwiftMxDataFormatConverter.java | 68 ++++++++++++++++++++++
.../src/main/docs/xmlsecurity.json | 10 +++-
.../XMLSecurityDataFormatConfiguration.java | 27 ++++++---
.../springboot/XMLSecurityDataFormatConverter.java | 64 ++++++++++++++++++++
tooling/camel-spring-boot-dependencies/pom.xml | 2 +-
39 files changed, 653 insertions(+), 183 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/barcode.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/barcode.json
index 20a92074885..3454a2da70f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/barcode.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/crypto.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/crypto.json
index 835318652db..ddaba6c648b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/crypto.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/csv.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/csv.json
index 6c78a9c7511..13e54e7ade3 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/csv.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/csv.json
@@ -17,34 +17,33 @@
},
"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" },
- "formatRef": { "index": 1, "kind": "attribute", "displayName": "Format
Ref", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The reference format to use, it will be
updated with the other format options, the default value is CSVFormat.DEFAULT"
},
- "formatName": { "index": 2, "kind": "attribute", "displayName": "Format
Name", "group": "advanced", "label": "advanced", "required": false, "type":
"enum", "javaType": "java.lang.String", "enum": [ "DEFAULT", "EXCEL",
"INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ], "deprecated":
false, "autowired": false, "secret": false, "defaultValue": "DEFAULT",
"description": "The name of the format to use, the default value is
CSVFormat.DEFAULT" },
- "commentMarkerDisabled": { "index": 3, "kind": "attribute", "displayName":
"Comment Marker Disabled", "group": "advanced", "label": "advanced",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Disables the comment marker of the reference format." },
- "commentMarker": { "index": 4, "kind": "attribute", "displayName":
"Comment Marker", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the comment marker of
the reference format." },
- "delimiter": { "index": 5, "kind": "attribute", "displayName":
"Delimiter", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the delimiter to use. The default value
is , (comma)" },
- "escapeDisabled": { "index": 6, "kind": "attribute", "displayName":
"Escape Disabled", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Use
for disabling using escape character" },
- "escape": { "index": 7, "kind": "attribute", "displayName": "Escape",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the escape character to use" },
- "headerDisabled": { "index": 8, "kind": "attribute", "displayName":
"Header Disabled", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Use for disabling
headers" },
- "header": { "index": 9, "kind": "element", "displayName": "Header",
"group": "common", "required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "To configure the CSV headers" },
- "allowMissingColumnNames": { "index": 10, "kind": "attribute",
"displayName": "Allow Missing Column Names", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to allow missing column names." },
- "ignoreEmptyLines": { "index": 11, "kind": "attribute", "displayName":
"Ignore Empty Lines", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to ignore empty
lines." },
- "ignoreSurroundingSpaces": { "index": 12, "kind": "attribute",
"displayName": "Ignore Surrounding Spaces", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to ignore surrounding spaces" },
- "nullStringDisabled": { "index": 13, "kind": "attribute", "displayName":
"Null String Disabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Used to disable null strings" },
- "nullString": { "index": 14, "kind": "attribute", "displayName": "Null
String", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Sets the null string" },
- "quoteDisabled": { "index": 15, "kind": "attribute", "displayName": "Quote
Disabled", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Used to disable quotes" },
- "quote": { "index": 16, "kind": "attribute", "displayName": "Quote",
"group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the quote to use which by default is double-quote
character" },
- "recordSeparatorDisabled": { "index": 17, "kind": "attribute",
"displayName": "Record Separator Disabled", "group": "common", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Used for disabling record
separator" },
- "recordSeparator": { "index": 18, "kind": "attribute", "displayName":
"Record Separator", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the record separator (aka new line) which
by default is new line characters (CRLF)" },
- "skipHeaderRecord": { "index": 19, "kind": "attribute", "displayName":
"Skip Header Record", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to skip the
header record in the output" },
- "quoteMode": { "index": 20, "kind": "attribute", "displayName": "Quote
Mode", "group": "common", "required": false, "type": "enum", "javaType":
"java.lang.String", "enum": [ "ALL", "ALL_NON_NULL", "MINIMAL", "NON_NUMERIC",
"NONE" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the quote mode" },
- "ignoreHeaderCase": { "index": 21, "kind": "attribute", "displayName":
"Ignore Header Case", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether or not to
ignore case when accessing header names." },
- "trim": { "index": 22, "kind": "attribute", "displayName": "Trim",
"group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Sets whether or not to trim leading and
trailing blanks." },
- "trailingDelimiter": { "index": 23, "kind": "attribute", "displayName":
"Trailing Delimiter", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether or not to
add a trailing delimiter." },
- "marshallerFactoryRef": { "index": 24, "kind": "attribute", "displayName":
"Marshaller Factory Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the implementation of
the CsvMarshallerFactory interface which is able to customize
marshalling\/unmarshalling behavior by extending CsvMarshaller or creating it
from scratch." },
- "lazyLoad": { "index": 25, "kind": "attribute", "displayName": "Lazy
Load", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Whether the
unmarshalling should produce an iterator that reads the lines on the fly or if
all the lines must be read at one." },
- "useMaps": { "index": 26, "kind": "attribute", "displayName": "Use Maps",
"group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the unmarshalling should produce
maps (HashMap)for the lines values instead of lists. It requires to have header
(either defined or collected)." },
- "useOrderedMaps": { "index": 27, "kind": "attribute", "displayName": "Use
Ordered Maps", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the
unmarshalling should produce ordered maps (LinkedHashMap) for the lines values
instead of lists. It requires to have header (either defined or collected)." },
- "recordConverterRef": { "index": 28, "kind": "attribute", "displayName":
"Record Converter Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a custom
CsvRecordConverter to lookup from the registry to use." },
- "captureHeaderRecord": { "index": 29, "kind": "attribute", "displayName":
"Capture Header Record", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the unmarshalling should capture the header record and store it in the
message header" }
+ "format": { "index": 1, "kind": "attribute", "displayName": "Format",
"group": "common", "required": false, "type": "enum", "javaType":
"java.lang.String", "enum": [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD",
"INFORMIX_UNLOAD_CSV", "MONGODB_CSV", "MONGODB_TSV", "MYSQL", "ORACLE",
"POSTGRESQL_CSV", "POSTGRESQL_TEXT", "RFC4180" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "DEFAULT", "description":
"The format to use." },
+ "commentMarkerDisabled": { "index": 2, "kind": "attribute", "displayName":
"Comment Marker Disabled", "group": "advanced", "label": "advanced",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Disables the comment marker of the reference format." },
+ "commentMarker": { "index": 3, "kind": "attribute", "displayName":
"Comment Marker", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the comment marker of
the reference format." },
+ "delimiter": { "index": 4, "kind": "attribute", "displayName":
"Delimiter", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the delimiter to use. The default value
is , (comma)" },
+ "escapeDisabled": { "index": 5, "kind": "attribute", "displayName":
"Escape Disabled", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Use
for disabling using escape character" },
+ "escape": { "index": 6, "kind": "attribute", "displayName": "Escape",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the escape character to use" },
+ "headerDisabled": { "index": 7, "kind": "attribute", "displayName":
"Header Disabled", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Use for disabling
headers" },
+ "header": { "index": 8, "kind": "attribute", "displayName": "Header",
"group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To configure the CSV headers. Multiple headers can be separated
by comma." },
+ "allowMissingColumnNames": { "index": 9, "kind": "attribute",
"displayName": "Allow Missing Column Names", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to allow missing column names." },
+ "ignoreEmptyLines": { "index": 10, "kind": "attribute", "displayName":
"Ignore Empty Lines", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to ignore empty
lines." },
+ "ignoreSurroundingSpaces": { "index": 11, "kind": "attribute",
"displayName": "Ignore Surrounding Spaces", "group": "common", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to ignore surrounding spaces" },
+ "nullStringDisabled": { "index": 12, "kind": "attribute", "displayName":
"Null String Disabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Used to disable null strings" },
+ "nullString": { "index": 13, "kind": "attribute", "displayName": "Null
String", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Sets the null string" },
+ "quoteDisabled": { "index": 14, "kind": "attribute", "displayName": "Quote
Disabled", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Used to disable quotes" },
+ "quote": { "index": 15, "kind": "attribute", "displayName": "Quote",
"group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the quote to use which by default is double-quote
character" },
+ "recordSeparatorDisabled": { "index": 16, "kind": "attribute",
"displayName": "Record Separator Disabled", "group": "common", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Used for disabling record
separator" },
+ "recordSeparator": { "index": 17, "kind": "attribute", "displayName":
"Record Separator", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the record separator (aka new line) which
by default is new line characters (CRLF)" },
+ "skipHeaderRecord": { "index": 18, "kind": "attribute", "displayName":
"Skip Header Record", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether to skip the
header record in the output" },
+ "quoteMode": { "index": 19, "kind": "attribute", "displayName": "Quote
Mode", "group": "common", "required": false, "type": "enum", "javaType":
"java.lang.String", "enum": [ "ALL", "ALL_NON_NULL", "MINIMAL", "NON_NUMERIC",
"NONE" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the quote mode" },
+ "ignoreHeaderCase": { "index": 20, "kind": "attribute", "displayName":
"Ignore Header Case", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether or not to
ignore case when accessing header names." },
+ "trim": { "index": 21, "kind": "attribute", "displayName": "Trim",
"group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Sets whether or not to trim leading and
trailing blanks." },
+ "trailingDelimiter": { "index": 22, "kind": "attribute", "displayName":
"Trailing Delimiter", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether or not to
add a trailing delimiter." },
+ "marshallerFactoryRef": { "index": 23, "kind": "attribute", "displayName":
"Marshaller Factory Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the implementation of
the CsvMarshallerFactory interface which is able to customize
marshalling\/unmarshalling behavior by extending CsvMarshaller or creating it
from scratch." },
+ "lazyLoad": { "index": 24, "kind": "attribute", "displayName": "Lazy
Load", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Whether the
unmarshalling should produce an iterator that reads the lines on the fly or if
all the lines must be read at one." },
+ "useMaps": { "index": 25, "kind": "attribute", "displayName": "Use Maps",
"group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the unmarshalling should produce
maps (HashMap)for the lines values instead of lists. It requires to have header
(either defined or collected)." },
+ "useOrderedMaps": { "index": 26, "kind": "attribute", "displayName": "Use
Ordered Maps", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the
unmarshalling should produce ordered maps (LinkedHashMap) for the lines values
instead of lists. It requires to have header (either defined or collected)." },
+ "recordConverterRef": { "index": 27, "kind": "attribute", "displayName":
"Record Converter Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a custom
CsvRecordConverter to lookup from the registry to use." },
+ "captureHeaderRecord": { "index": 28, "kind": "attribute", "displayName":
"Capture Header Record", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the unmarshalling should capture the header record and store it in the
message header" }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/flatpack.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/flatpack.json
index a76782c6da5..41352ea3fd5 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/flatpack.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/hl7.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/hl7.json
index b34e7cdad26..f557d02b1da 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/hl7.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
index fc83d1062c9..fd3050be53d 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
@@ -30,7 +30,7 @@
"fragment": { "index": 11, "kind": "attribute", "displayName": "Fragment",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "To turn on marshalling
XML fragment trees. By default JAXB looks for XmlRootElement annotation on
given class to operate on whole XML tree. This is useful but not always -
sometimes generated code does n [...]
"partClass": { "index": 12, "kind": "attribute", "displayName": "Part
Class", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Name of class used for fragment
parsing. See more details at the fragment option." },
"partNamespace": { "index": 13, "kind": "attribute", "displayName": "Part
Namespace", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "XML namespace to use for
fragment parsing. See more details at the fragment option." },
- "namespacePrefixRef": { "index": 14, "kind": "attribute", "displayName":
"Namespace Prefix Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "When marshalling using
JAXB or SOAP then the JAXB implementation will automatic assign namespace
prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you
to refer to a map which contai [...]
+ "namespacePrefix": { "index": 14, "kind": "attribute", "displayName":
"Namespace Prefix", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.Map", "deprecated": false,
"autowired": false, "secret": false, "description": "When marshalling using
JAXB or SOAP then the JAXB implementation will automatically assign namespace
prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you
to refer to a map which contains the [...]
"xmlStreamWriterWrapper": { "index": 15, "kind": "attribute",
"displayName": "Xml Stream Writer Wrapper", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To use a custom xml stream writer." },
"schemaLocation": { "index": 16, "kind": "attribute", "displayName":
"Schema Location", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "To define the location of the schema" },
"noNamespaceSchemaLocation": { "index": 17, "kind": "attribute",
"displayName": "No Namespace Schema Location", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To define the location of the namespaceless schema" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/snakeYaml.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/snakeYaml.json
index 92fd6f7ea6e..7657b582708 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/snakeYaml.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/snakeYaml.json
@@ -26,7 +26,7 @@
"useApplicationContextClassLoader": { "index": 7, "kind": "attribute",
"displayName": "Use Application Context Class Loader", "group": "common",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Use ApplicationContextClassLoader as custom ClassLoader" },
"prettyFlow": { "index": 8, "kind": "attribute", "displayName": "Pretty
Flow", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Force the emitter to produce a pretty
YAML document when using the flow style." },
"allowAnyType": { "index": 9, "kind": "attribute", "displayName": "Allow
Any Type", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allow any class to be un-marshaled" },
- "typeFilter": { "index": 10, "kind": "element", "displayName": "Type
Filter", "group": "common", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.dataformat.YAMLTypeFilterDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Set
the types SnakeYAML is allowed to un-marshall" },
+ "typeFilter": { "index": 10, "kind": "attribute", "displayName": "Type
Filter", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Set the types SnakeYAML is allowed to
un-marshall. Multiple types can be separated by comma." },
"maxAliasesForCollections": { "index": 11, "kind": "attribute",
"displayName": "Max Aliases For Collections", "group": "advanced", "label":
"advanced", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "50", "description": "Set the maximum amount of aliases allowed
for collections." },
"allowRecursiveKeys": { "index": 12, "kind": "attribute", "displayName":
"Allow Recursive Keys", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Set
whether recursive keys are allowed." }
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/soap.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/soap.json
index 6484942db28..dc9c169d440 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/soap.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/soap.json
@@ -19,9 +19,10 @@
"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" },
"contextPath": { "index": 1, "kind": "attribute", "displayName": "Context
Path", "group": "common", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Package name where your JAXB classes are located." },
"encoding": { "index": 2, "kind": "attribute", "displayName": "Encoding",
"group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To overrule and use a specific encoding" },
- "elementNameStrategyRef": { "index": 3, "kind": "attribute",
"displayName": "Element Name Strategy Ref", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to an element strategy to lookup from the registry. An
element name strategy is used for two purposes. The first is to find a xml
element name for a given object and soap action when marshali [...]
+ "elementNameStrategy": { "index": 3, "kind": "attribute", "displayName":
"Element Name Strategy", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType":
"org.apache.camel.dataformat.soap.name.ElementNameStrategy", "deprecated":
false, "autowired": false, "secret": false, "description": "Refers to an
element strategy to lookup from the registry. An element name strategy is used
for two purposes. The first is to find a xml element name for a given ob [...]
"version": { "index": 4, "kind": "attribute", "displayName": "Version",
"group": "common", "required": false, "type": "enum", "javaType":
"java.lang.String", "enum": [ "1.1", "1.2" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "1.1", "description": "SOAP version
should either be 1.1 or 1.2. Is by default 1.1" },
- "namespacePrefixRef": { "index": 5, "kind": "attribute", "displayName":
"Namespace Prefix Ref", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "When marshalling using
JAXB or SOAP then the JAXB implementation will automatic assign namespace
prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you
to refer to a map which contain [...]
- "schema": { "index": 6, "kind": "attribute", "displayName": "Schema",
"group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To validate against an existing schema. Your can use the prefix
classpath:, file: or http: to specify how the resource should be resolved. You
can separate multiple schema files by using the ',' character." }
+ "namespacePrefix": { "index": 5, "kind": "attribute", "displayName":
"Namespace Prefix", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.Map", "deprecated": false,
"autowired": false, "secret": false, "description": "When marshalling using
JAXB or SOAP then the JAXB implementation will automatic assign namespace
prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you
to refer to a map which contains the desi [...]
+ "schema": { "index": 6, "kind": "attribute", "displayName": "Schema",
"group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To validate against an existing schema. Your can use the prefix
classpath:, file: or http: to specify how the resource should be resolved. You
can separate multiple schema files by using the ',' character." },
+ "ignoreUnmarshalledHeaders": { "index": 7, "kind": "attribute",
"displayName": "Ignore Unmarshalled Headers", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to ignore headers that was not
unmarshalled. By default, headers which could not be unmarshalled is recorded
in the org.apache.camel.dataformat.soap.UNMARSHALLE [...]
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMt.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMt.json
index 8f35bb9b6d1..b24ab6771ac 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMt.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMt.json
@@ -17,6 +17,6 @@
},
"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" },
- "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In
Json", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "The flag
indicating that messages must be marshalled in a JSON format." }
+ "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In
Json", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "The flag indicating that messages must
be marshalled in a JSON format." }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMx.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMx.json
index ed0938bc522..5dc0efe57b0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMx.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/swiftMx.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" },
- "writeConfigRef": { "index": 1, "kind": "attribute", "displayName": "Write
Config Ref", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a specific
configuration to use when marshalling a message to lookup from the registry." },
- "writeInJson": { "index": 2, "kind": "attribute", "displayName": "Write In
Json", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "The flag
indicating that messages must be marshalled in a JSON format." },
- "readMessageId": { "index": 3, "kind": "attribute", "displayName": "Read
Message Id", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The type of MX message to
produce when unmarshalling an input stream. If not set, it will be
automatically detected from the namespace used." },
- "readConfigRef": { "index": 4, "kind": "attribute", "displayName": "Read
Config Ref", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a specific
configuration to use when unmarshalling an input stream to lookup from the
registry." }
+ "writeInJson": { "index": 1, "kind": "attribute", "displayName": "Write In
Json", "group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "The flag indicating that messages must
be marshalled in a JSON format." },
+ "readMessageId": { "index": 2, "kind": "attribute", "displayName": "Read
Message Id", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "com.prowidesoftware.swift.model.MxId",
"deprecated": false, "autowired": false, "secret": false, "description": "The
type of MX message to produce when unmarshalling an input stream. If not set,
it will be automatically detected from the namespace used." },
+ "readConfig": { "index": 3, "kind": "attribute", "displayName": "Read
Config", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "com.prowidesoftware.swift.model.mx.MxReadConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to a specific configuration to use when unmarshalling an input stream
to lookup from the registry." },
+ "writeConfig": { "index": 4, "kind": "attribute", "displayName": "Write
Config", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType":
"com.prowidesoftware.swift.model.mx.MxWriteConfiguration", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a specific
configuration to use when marshalling a message to lookup from the registry." }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xmlSecurity.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xmlSecurity.json
index 2525192d70a..653fbb95e07 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xmlSecurity.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xmlSecurity.json
@@ -24,10 +24,11 @@
"secureTagContents": { "index": 5, "kind": "attribute", "displayName":
"Secure Tag Contents", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "A boolean value to
specify whether the XML Element is to be encrypted or the contents of the XML
Element. false = Element Level. true = Element Content Level." },
"keyCipherAlgorithm": { "index": 6, "kind": "attribute", "displayName":
"Key Cipher Algorithm", "group": "common", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "RSA_v1dot5", "RSA_OAEP",
"RSA_OAEP_11" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "RSA_OAEP", "description": "The cipher algorithm to be used for
encryption\/decryption of the asymmetric key. The available choices are:
XMLCipher.RSA_v1dot5 XMLCipher.RSA_OAEP XM [...]
"recipientKeyAlias": { "index": 7, "kind": "attribute", "displayName":
"Recipient Key Alias", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The key alias to be used when retrieving the
recipient's public or private key from a KeyStore when performing asymmetric
key encryption or decryption." },
- "keyOrTrustStoreParametersRef": { "index": 8, "kind": "attribute",
"displayName": "Key Or Trust Store Parameters Ref", "group": "common",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to a KeyStore instance to lookup in the registry, which is used for
configuration options for creating and loading a KeyStore instance that
represents the sender's trustStore or recipient's keyStore." },
+ "keyOrTrustStoreParameters": { "index": 8, "kind": "attribute",
"displayName": "Key Or Trust Store Parameters", "group": "common", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.KeyStoreParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a KeyStore
instance to lookup in the registry, which is used for configuration options for
creating and loading a KeyStore instance that represents the sender's
trustStore [...]
"keyPassword": { "index": 9, "kind": "attribute", "displayName": "Key
Password", "group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The password to be used for retrieving the private key from the
KeyStore. This key is used for asymmetric decryption." },
"digestAlgorithm": { "index": 10, "kind": "attribute", "displayName":
"Digest Algorithm", "group": "common", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "SHA1", "SHA256", "SHA512" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"SHA1", "description": "The digest algorithm to use with the RSA OAEP
algorithm. The available choices are: XMLCipher.SHA1 XMLCipher.SHA256
XMLCipher.SHA512 The default value is XMLCipher.SHA1" },
"mgfAlgorithm": { "index": 11, "kind": "attribute", "displayName": "Mgf
Algorithm", "group": "common", "required": false, "type": "enum", "javaType":
"java.lang.String", "enum": [ "MGF1_SHA1", "MGF1_SHA256", "MGF1_SHA512" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"MGF1_SHA1", "description": "The MGF Algorithm to use with the RSA OAEP
algorithm. The available choices are: EncryptionConstants.MGF1_SHA1
EncryptionConstants.MGF1_SHA256 EncryptionConstan [...]
- "addKeyValueForEncryptedKey": { "index": 12, "kind": "attribute",
"displayName": "Add Key Value For Encrypted Key", "group": "common",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether to add the public key used to encrypt the session key
as a KeyValue in the EncryptedKey structure or not." }
+ "addKeyValueForEncryptedKey": { "index": 12, "kind": "attribute",
"displayName": "Add Key Value For Encrypted Key", "group": "common",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether to add the public key used to encrypt the session key
as a KeyValue in the EncryptedKey structure or not." },
+ "namespace": { "index": 13, "kind": "attribute", "displayName":
"Namespace", "group": "common", "required": false, "type": "object",
"javaType": "java.util.Map", "deprecated": false, "autowired": false, "secret":
false, "description": "Refers to a Map XML Namespaces of prefix - uri mappings"
}
}
}
diff --git
a/components-starter/camel-barcode-starter/src/main/docs/barcode.json
b/components-starter/camel-barcode-starter/src/main/docs/barcode.json
index c30c6b7dfe6..4b95427176d 100644
--- a/components-starter/camel-barcode-starter/src/main/docs/barcode.json
+++ b/components-starter/camel-barcode-starter/src/main/docs/barcode.json
@@ -17,7 +17,8 @@
"name": "camel.dataformat.barcode.barcode-format",
"type": "java.lang.String",
"description": "Barcode format such as QR-Code",
- "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration"
+ "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration",
+ "defaultValue": "QR_CODE"
},
{
"name": "camel.dataformat.barcode.customizer.enabled",
@@ -34,19 +35,22 @@
"name": "camel.dataformat.barcode.height",
"type": "java.lang.Integer",
"description": "Height of the barcode",
- "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration"
+ "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration",
+ "defaultValue": 100
},
{
"name": "camel.dataformat.barcode.image-type",
"type": "java.lang.String",
"description": "Image type of the barcode such as png",
- "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration"
+ "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration",
+ "defaultValue": "PNG"
},
{
"name": "camel.dataformat.barcode.width",
"type": "java.lang.Integer",
"description": "Width of the barcode",
- "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration"
+ "sourceType":
"org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration",
+ "defaultValue": 100
}
],
"hints": [],
diff --git
a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatConfiguration.java
b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatConfiguration.java
index f05995cae7c..94ac67e3ad0 100644
---
a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatConfiguration.java
+++
b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatConfiguration.java
@@ -37,19 +37,19 @@ public class BarcodeDataFormatConfiguration
/**
* Barcode format such as QR-Code
*/
- private String barcodeFormat;
+ private String barcodeFormat = "QR_CODE";
/**
* Image type of the barcode such as png
*/
- private String imageType;
+ private String imageType = "PNG";
/**
* Width of the barcode
*/
- private Integer width;
+ private Integer width = 100;
/**
* Height of the barcode
*/
- private Integer height;
+ private Integer height = 100;
public String getBarcodeFormat() {
return barcodeFormat;
diff --git a/components-starter/camel-crypto-starter/src/main/docs/crypto.json
b/components-starter/camel-crypto-starter/src/main/docs/crypto.json
index 1e85e0a0e78..7e53baafa8c 100644
--- a/components-starter/camel-crypto-starter/src/main/docs/crypto.json
+++ b/components-starter/camel-crypto-starter/src/main/docs/crypto.json
@@ -173,9 +173,9 @@
"sourceType":
"org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration"
},
{
- "name": "camel.dataformat.crypto.algorithm-parameter-ref",
+ "name": "camel.dataformat.crypto.algorithm-parameter-spec",
"type": "java.lang.String",
- "description": "A JCE AlgorithmParameterSpec used to initialize the
Cipher. Will lookup the type using the given name as a
java.security.spec.AlgorithmParameterSpec type.",
+ "description": "A JCE AlgorithmParameterSpec used to initialize the
Cipher. Will lookup the type using the given name as a
java.security.spec.AlgorithmParameterSpec type. The option is a
java.security.spec.AlgorithmParameterSpec type.",
"sourceType":
"org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration"
},
{
@@ -203,8 +203,8 @@
"sourceType":
"org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration"
},
{
- "name": "camel.dataformat.crypto.init-vector-ref",
- "type": "java.lang.String",
+ "name": "camel.dataformat.crypto.init-vector",
+ "type": "java.lang.Byte[]",
"description": "Refers to a byte array containing the Initialization
Vector that will be used to initialize the Cipher.",
"sourceType":
"org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration"
},
@@ -216,9 +216,9 @@
"defaultValue": false
},
{
- "name": "camel.dataformat.crypto.key-ref",
+ "name": "camel.dataformat.crypto.key",
"type": "java.lang.String",
- "description": "Refers to the secret key to lookup from the register to
use.",
+ "description": "Refers to the secret key to lookup from the register to
use. The option is a java.security.Key type.",
"sourceType":
"org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration"
},
{
diff --git
a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
index cbb6efd373c..d541cf66026 100644
---
a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
+++
b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConfiguration.java
@@ -40,9 +40,10 @@ public class CryptoDataFormatConfiguration
*/
private String algorithm;
/**
- * Refers to the secret key to lookup from the register to use.
+ * Refers to the secret key to lookup from the register to use. The option
+ * is a java.security.Key type.
*/
- private String keyRef;
+ private String key;
/**
* The name of the JCE Security Provider that should be used.
*/
@@ -51,13 +52,14 @@ public class CryptoDataFormatConfiguration
* Refers to a byte array containing the Initialization Vector that will be
* used to initialize the Cipher.
*/
- private String initVectorRef;
+ private byte[] initVector;
/**
* A JCE AlgorithmParameterSpec used to initialize the Cipher. Will lookup
* the type using the given name as a
+ * java.security.spec.AlgorithmParameterSpec type. The option is a
* java.security.spec.AlgorithmParameterSpec type.
*/
- private String algorithmParameterRef;
+ private String algorithmParameterSpec;
/**
* The size of the buffer used in the signature process.
*/
@@ -85,12 +87,12 @@ public class CryptoDataFormatConfiguration
this.algorithm = algorithm;
}
- public String getKeyRef() {
- return keyRef;
+ public String getKey() {
+ return key;
}
- public void setKeyRef(String keyRef) {
- this.keyRef = keyRef;
+ public void setKey(String key) {
+ this.key = key;
}
public String getCryptoProvider() {
@@ -101,20 +103,20 @@ public class CryptoDataFormatConfiguration
this.cryptoProvider = cryptoProvider;
}
- public String getInitVectorRef() {
- return initVectorRef;
+ public byte[] getInitVector() {
+ return initVector;
}
- public void setInitVectorRef(String initVectorRef) {
- this.initVectorRef = initVectorRef;
+ public void setInitVector(byte[] initVector) {
+ this.initVector = initVector;
}
- public String getAlgorithmParameterRef() {
- return algorithmParameterRef;
+ public String getAlgorithmParameterSpec() {
+ return algorithmParameterSpec;
}
- public void setAlgorithmParameterRef(String algorithmParameterRef) {
- this.algorithmParameterRef = algorithmParameterRef;
+ public void setAlgorithmParameterSpec(String algorithmParameterSpec) {
+ this.algorithmParameterSpec = algorithmParameterSpec;
}
public Integer getBufferSize() {
diff --git
a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConverter.java
b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConverter.java
new file mode 100644
index 00000000000..cab40a8a461
--- /dev/null
+++
b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatConverter.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.converter.crypto.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CryptoDataFormatConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class, java.security.Key.class));
+ answer.add(new ConvertiblePair(String.class,
java.security.spec.AlgorithmParameterSpec.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "java.security.Key": return applicationContext.getBean(ref,
java.security.Key.class);
+ case "java.security.spec.AlgorithmParameterSpec": return
applicationContext.getBean(ref,
java.security.spec.AlgorithmParameterSpec.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/components-starter/camel-csv-starter/src/main/docs/csv.json
b/components-starter/camel-csv-starter/src/main/docs/csv.json
index ce50451d448..3fe74c6e363 100644
--- a/components-starter/camel-csv-starter/src/main/docs/csv.json
+++ b/components-starter/camel-csv-starter/src/main/docs/csv.json
@@ -71,22 +71,16 @@
"defaultValue": false
},
{
- "name": "camel.dataformat.csv.format-name",
+ "name": "camel.dataformat.csv.format",
"type": "java.lang.String",
- "description": "The name of the format to use, the default value is
CSVFormat.DEFAULT",
+ "description": "The format to use.",
"sourceType":
"org.apache.camel.dataformat.csv.springboot.CsvDataFormatConfiguration",
"defaultValue": "DEFAULT"
},
- {
- "name": "camel.dataformat.csv.format-ref",
- "type": "java.lang.String",
- "description": "The reference format to use, it will be updated with the
other format options, the default value is CSVFormat.DEFAULT",
- "sourceType":
"org.apache.camel.dataformat.csv.springboot.CsvDataFormatConfiguration"
- },
{
"name": "camel.dataformat.csv.header",
- "type": "java.util.List<java.lang.String>",
- "description": "To configure the CSV headers",
+ "type": "java.lang.String",
+ "description": "To configure the CSV headers. Multiple headers can be
separated by comma.",
"sourceType":
"org.apache.camel.dataformat.csv.springboot.CsvDataFormatConfiguration"
},
{
diff --git
a/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
b/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
index fbe50026074..c18d846523b 100644
---
a/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
+++
b/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatConfiguration.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.csv.springboot;
-import java.util.List;
import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -36,14 +35,9 @@ public class CsvDataFormatConfiguration
*/
private Boolean enabled;
/**
- * The reference format to use, it will be updated with the other format
- * options, the default value is CSVFormat.DEFAULT
+ * The format to use.
*/
- private String formatRef;
- /**
- * The name of the format to use, the default value is CSVFormat.DEFAULT
- */
- private String formatName = "DEFAULT";
+ private String format = "DEFAULT";
/**
* Disables the comment marker of the reference format.
*/
@@ -69,9 +63,9 @@ public class CsvDataFormatConfiguration
*/
private Boolean headerDisabled = false;
/**
- * To configure the CSV headers
+ * To configure the CSV headers. Multiple headers can be separated by
comma.
*/
- private List<String> header;
+ private String header;
/**
* Whether to allow missing column names.
*/
@@ -162,20 +156,12 @@ public class CsvDataFormatConfiguration
*/
private Boolean captureHeaderRecord = false;
- public String getFormatRef() {
- return formatRef;
- }
-
- public void setFormatRef(String formatRef) {
- this.formatRef = formatRef;
- }
-
- public String getFormatName() {
- return formatName;
+ public String getFormat() {
+ return format;
}
- public void setFormatName(String formatName) {
- this.formatName = formatName;
+ public void setFormat(String format) {
+ this.format = format;
}
public Boolean getCommentMarkerDisabled() {
@@ -226,11 +212,11 @@ public class CsvDataFormatConfiguration
this.headerDisabled = headerDisabled;
}
- public List<String> getHeader() {
+ public String getHeader() {
return header;
}
- public void setHeader(List<String> header) {
+ public void setHeader(String header) {
this.header = header;
}
diff --git
a/components-starter/camel-flatpack-starter/src/main/docs/flatpack.json
b/components-starter/camel-flatpack-starter/src/main/docs/flatpack.json
index 118113a57bc..b86413e6bbf 100644
--- a/components-starter/camel-flatpack-starter/src/main/docs/flatpack.json
+++ b/components-starter/camel-flatpack-starter/src/main/docs/flatpack.json
@@ -109,9 +109,9 @@
"defaultValue": true
},
{
- "name": "camel.dataformat.flatpack.parser-factory-ref",
+ "name": "camel.dataformat.flatpack.parser-factory",
"type": "java.lang.String",
- "description": "References to a custom parser factory to lookup in the
registry",
+ "description": "References to a custom parser factory to lookup in the
registry. The option is a net.sf.flatpack.ParserFactory type.",
"sourceType":
"org.apache.camel.dataformat.flatpack.springboot.FlatpackDataFormatConfiguration"
},
{
diff --git
a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java
b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java
index 5bdebfb3d09..006e066bb8e 100644
---
a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java
+++
b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConfiguration.java
@@ -69,9 +69,10 @@ public class FlatpackDataFormatConfiguration
*/
private String textQualifier;
/**
- * References to a custom parser factory to lookup in the registry
+ * References to a custom parser factory to lookup in the registry. The
+ * option is a net.sf.flatpack.ParserFactory type.
*/
- private String parserFactoryRef;
+ private String parserFactory;
public String getDefinition() {
return definition;
@@ -129,11 +130,11 @@ public class FlatpackDataFormatConfiguration
this.textQualifier = textQualifier;
}
- public String getParserFactoryRef() {
- return parserFactoryRef;
+ public String getParserFactory() {
+ return parserFactory;
}
- public void setParserFactoryRef(String parserFactoryRef) {
- this.parserFactoryRef = parserFactoryRef;
+ public void setParserFactory(String parserFactory) {
+ this.parserFactory = parserFactory;
}
}
\ No newline at end of file
diff --git
a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConverter.java
b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConverter.java
new file mode 100644
index 00000000000..f6e82bdae33
--- /dev/null
+++
b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatConverter.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.flatpack.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class FlatpackDataFormatConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class,
net.sf.flatpack.ParserFactory.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "net.sf.flatpack.ParserFactory": return
applicationContext.getBean(ref, net.sf.flatpack.ParserFactory.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
index 66f3806e40b..68c36527bdd 100644
--- a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
+++ b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
@@ -35,6 +35,12 @@
"description": "Whether to enable auto configuration of the hl7 data
format. This is enabled by default.",
"sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration"
},
+ {
+ "name": "camel.dataformat.hl7.parser",
+ "type": "java.lang.String",
+ "description": "To use a custom HL7 parser. The option is a
ca.uhn.hl7v2.parser.Parser type.",
+ "sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration"
+ },
{
"name": "camel.dataformat.hl7.validate",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatConfiguration.java
b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatConfiguration.java
index 1b77eaf2985..5b434d368f6 100644
---
a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatConfiguration.java
+++
b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatConfiguration.java
@@ -35,11 +35,24 @@ public class HL7DataFormatConfiguration
* enabled by default.
*/
private Boolean enabled;
+ /**
+ * To use a custom HL7 parser. The option is a ca.uhn.hl7v2.parser.Parser
+ * type.
+ */
+ private String parser;
/**
* Whether to validate the HL7 message Is by default true.
*/
private Boolean validate = true;
+ public String getParser() {
+ return parser;
+ }
+
+ public void setParser(String parser) {
+ this.parser = parser;
+ }
+
public Boolean getValidate() {
return validate;
}
diff --git
a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatConverter.java
b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatConverter.java
new file mode 100644
index 00000000000..50e2ad4aae6
--- /dev/null
+++
b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatConverter.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.hl7.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class HL7DataFormatConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class,
ca.uhn.hl7v2.parser.Parser.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "ca.uhn.hl7v2.parser.Parser": return
applicationContext.getBean(ref, ca.uhn.hl7v2.parser.Parser.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git
a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java
b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java
index 9a204eddc50..baff17dc0a7 100644
---
a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java
+++
b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7ValidateTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.hl7.springboot.test;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
@@ -58,6 +59,9 @@ import
org.apache.camel.test.spring.junit5.CamelSpringBootTest;
HL7ValidateTest.TestConfiguration.class })
public class HL7ValidateTest extends HL7TestSupport {
+ @Autowired
+ CamelContext camelContext;
+
@Autowired
ProducerTemplate template;
@@ -147,7 +151,7 @@ public class HL7ValidateTest extends HL7TestSupport {
// *************************************
@Configuration
- public static class TestConfiguration {
+ public class TestConfiguration {
@Bean
public RouteBuilder routeBuilder() {
@@ -173,12 +177,14 @@ public class HL7ValidateTest extends HL7TestSupport {
HapiContext customContext = new
DefaultHapiContext(customValidationContext);
final Parser customParser = new GenericParser(customContext);
+ camelContext.getRegistry().bind("myParser", customParser);
+
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:unmarshalFailed").unmarshal().hl7().to("mock:unmarshal");
from("direct:unmarshalOk").unmarshal().hl7(false).to("mock:unmarshal");
from("direct:unmarshalOkCustom").unmarshal(hl7).to("mock:unmarshal");
-
from("direct:start1").marshal().hl7(customParser).to("mock:end");
+
from("direct:start1").marshal().hl7("myParser").to("mock:end");
from("direct:start2").marshal().hl7(true).to("mock:end");
}
diff --git a/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
b/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
index 3059c6baaf6..d9e8e1f67d0 100644
--- a/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
+++ b/components-starter/camel-jaxb-starter/src/main/docs/jaxb.json
@@ -92,9 +92,9 @@
"defaultValue": false
},
{
- "name": "camel.dataformat.jaxb.namespace-prefix-ref",
- "type": "java.lang.String",
- "description": "When marshalling using JAXB or SOAP then the JAXB
implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4
etc. To control this mapping, Camel allows you to refer to a map which contains
the desired mapping.",
+ "name": "camel.dataformat.jaxb.namespace-prefix",
+ "type": "java.util.Map",
+ "description": "When marshalling using JAXB or SOAP then the JAXB
implementation will automatically assign namespace prefixes, such as ns2, ns3,
ns4 etc. To control this mapping, Camel allows you to refer to a map which
contains the desired mapping.",
"sourceType":
"org.apache.camel.converter.jaxb.springboot.JaxbDataFormatConfiguration"
},
{
diff --git
a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
index ce0223cb5ba..54c64a61f45 100644
---
a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
+++
b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.converter.jaxb.springboot;
+import java.util.Map;
import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -110,11 +111,11 @@ public class JaxbDataFormatConfiguration
private String partNamespace;
/**
* When marshalling using JAXB or SOAP then the JAXB implementation will
- * automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To
+ * automatically assign namespace prefixes, such as ns2, ns3, ns4 etc. To
* control this mapping, Camel allows you to refer to a map which contains
* the desired mapping.
*/
- private String namespacePrefixRef;
+ private Map namespacePrefix;
/**
* To use a custom xml stream writer.
*/
@@ -253,12 +254,12 @@ public class JaxbDataFormatConfiguration
this.partNamespace = partNamespace;
}
- public String getNamespacePrefixRef() {
- return namespacePrefixRef;
+ public Map getNamespacePrefix() {
+ return namespacePrefix;
}
- public void setNamespacePrefixRef(String namespacePrefixRef) {
- this.namespacePrefixRef = namespacePrefixRef;
+ public void setNamespacePrefix(Map namespacePrefix) {
+ this.namespacePrefix = namespacePrefix;
}
public String getXmlStreamWriterWrapper() {
diff --git
a/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
b/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
index dee2f6c15e1..07c8f0d972f 100644
--- a/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
+++ b/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
@@ -76,6 +76,12 @@
"description": "Resolver to detect implicit type",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
+ {
+ "name": "camel.dataformat.snake-yaml.type-filter",
+ "type": "java.lang.String",
+ "description": "Set the types SnakeYAML is allowed to un-marshall.
Multiple types can be separated by comma.",
+ "sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
+ },
{
"name": "camel.dataformat.snake-yaml.unmarshal-type",
"type": "java.lang.String",
diff --git
a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
index 8942e0d8474..e02ee02e09d 100644
---
a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
+++
b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
@@ -67,6 +67,11 @@ public class SnakeYAMLDataFormatConfiguration
* Allow any class to be un-marshaled
*/
private Boolean allowAnyType = false;
+ /**
+ * Set the types SnakeYAML is allowed to un-marshall. Multiple types can be
+ * separated by comma.
+ */
+ private String typeFilter;
/**
* Set the maximum amount of aliases allowed for collections.
*/
@@ -141,6 +146,14 @@ public class SnakeYAMLDataFormatConfiguration
this.allowAnyType = allowAnyType;
}
+ public String getTypeFilter() {
+ return typeFilter;
+ }
+
+ public void setTypeFilter(String typeFilter) {
+ this.typeFilter = typeFilter;
+ }
+
public Integer getMaxAliasesForCollections() {
return maxAliasesForCollections;
}
diff --git a/components-starter/camel-soap-starter/src/main/docs/soap.json
b/components-starter/camel-soap-starter/src/main/docs/soap.json
index cb6f0883714..2ed7bd48019 100644
--- a/components-starter/camel-soap-starter/src/main/docs/soap.json
+++ b/components-starter/camel-soap-starter/src/main/docs/soap.json
@@ -25,9 +25,9 @@
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.soap.element-name-strategy-ref",
+ "name": "camel.dataformat.soap.element-name-strategy",
"type": "java.lang.String",
- "description": "Refers to an element strategy to lookup from the
registry. An element name strategy is used for two purposes. The first is to
find a xml element name for a given object and soap action when marshaling the
object into a SOAP message. The second is to find an Exception class for a
given soap fault name. The following three element strategy class name is
provided out of the box. QNameStrategy - Uses a fixed qName that is configured
on instantiation. Exception lookup is [...]
+ "description": "Refers to an element strategy to lookup from the
registry. An element name strategy is used for two purposes. The first is to
find a xml element name for a given object and soap action when marshaling the
object into a SOAP message. The second is to find an Exception class for a
given soap fault name. The following three element strategy class name is
provided out of the box. QNameStrategy - Uses a fixed qName that is configured
on instantiation. Exception lookup is [...]
"sourceType":
"org.apache.camel.dataformat.soap.springboot.SoapDataFormatConfiguration"
},
{
@@ -43,8 +43,15 @@
"sourceType":
"org.apache.camel.dataformat.soap.springboot.SoapDataFormatConfiguration"
},
{
- "name": "camel.dataformat.soap.namespace-prefix-ref",
- "type": "java.lang.String",
+ "name": "camel.dataformat.soap.ignore-unmarshalled-headers",
+ "type": "java.lang.Boolean",
+ "description": "Whether to ignore headers that was not unmarshalled. By
default, headers which could not be unmarshalled is recorded in the
org.apache.camel.dataformat.soap.UNMARSHALLED_HEADER_LIST header which allows
to inspect any problematic header.",
+ "sourceType":
"org.apache.camel.dataformat.soap.springboot.SoapDataFormatConfiguration",
+ "defaultValue": false
+ },
+ {
+ "name": "camel.dataformat.soap.namespace-prefix",
+ "type": "java.util.Map",
"description": "When marshalling using JAXB or SOAP then the JAXB
implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4
etc. To control this mapping, Camel allows you to refer to a map which contains
the desired mapping.",
"sourceType":
"org.apache.camel.dataformat.soap.springboot.SoapDataFormatConfiguration"
},
diff --git
a/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConfiguration.java
b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConfiguration.java
index 9ebc6d7632c..1d8457baaea 100644
---
a/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConfiguration.java
+++
b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dataformat.soap.springboot;
+import java.util.Map;
import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -59,9 +60,10 @@ public class SoapDataFormatConfiguration
* generated the web service stub code with cxf-codegen or a similar tool
* then you probably will want to use the ServiceInterfaceStrategy. In the
* case you have no annotated service interface you should use
QNameStrategy
- * or TypeNameStrategy.
+ * or TypeNameStrategy. The option is a
+ * org.apache.camel.dataformat.soap.name.ElementNameStrategy type.
*/
- private String elementNameStrategyRef;
+ private String elementNameStrategy;
/**
* SOAP version should either be 1.1 or 1.2. Is by default 1.1
*/
@@ -72,7 +74,7 @@ public class SoapDataFormatConfiguration
* control this mapping, Camel allows you to refer to a map which contains
* the desired mapping.
*/
- private String namespacePrefixRef;
+ private Map namespacePrefix;
/**
* To validate against an existing schema. Your can use the prefix
* classpath:, file: or http: to specify how the resource should be
@@ -80,6 +82,13 @@ public class SoapDataFormatConfiguration
* character.
*/
private String schema;
+ /**
+ * Whether to ignore headers that was not unmarshalled. By default, headers
+ * which could not be unmarshalled is recorded in the
+ * org.apache.camel.dataformat.soap.UNMARSHALLED_HEADER_LIST header which
+ * allows to inspect any problematic header.
+ */
+ private Boolean ignoreUnmarshalledHeaders = false;
public String getContextPath() {
return contextPath;
@@ -97,12 +106,12 @@ public class SoapDataFormatConfiguration
this.encoding = encoding;
}
- public String getElementNameStrategyRef() {
- return elementNameStrategyRef;
+ public String getElementNameStrategy() {
+ return elementNameStrategy;
}
- public void setElementNameStrategyRef(String elementNameStrategyRef) {
- this.elementNameStrategyRef = elementNameStrategyRef;
+ public void setElementNameStrategy(String elementNameStrategy) {
+ this.elementNameStrategy = elementNameStrategy;
}
public String getVersion() {
@@ -113,12 +122,12 @@ public class SoapDataFormatConfiguration
this.version = version;
}
- public String getNamespacePrefixRef() {
- return namespacePrefixRef;
+ public Map getNamespacePrefix() {
+ return namespacePrefix;
}
- public void setNamespacePrefixRef(String namespacePrefixRef) {
- this.namespacePrefixRef = namespacePrefixRef;
+ public void setNamespacePrefix(Map namespacePrefix) {
+ this.namespacePrefix = namespacePrefix;
}
public String getSchema() {
@@ -128,4 +137,12 @@ public class SoapDataFormatConfiguration
public void setSchema(String schema) {
this.schema = schema;
}
+
+ public Boolean getIgnoreUnmarshalledHeaders() {
+ return ignoreUnmarshalledHeaders;
+ }
+
+ public void setIgnoreUnmarshalledHeaders(Boolean
ignoreUnmarshalledHeaders) {
+ this.ignoreUnmarshalledHeaders = ignoreUnmarshalledHeaders;
+ }
}
\ No newline at end of file
diff --git
a/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConverter.java
b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConverter.java
new file mode 100644
index 00000000000..1cdab9aef40
--- /dev/null
+++
b/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapDataFormatConverter.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.soap.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class SoapDataFormatConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class,
org.apache.camel.dataformat.soap.name.ElementNameStrategy.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "org.apache.camel.dataformat.soap.name.ElementNameStrategy":
return applicationContext.getBean(ref,
org.apache.camel.dataformat.soap.name.ElementNameStrategy.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/components-starter/camel-swift-starter/src/main/docs/swift.json
b/components-starter/camel-swift-starter/src/main/docs/swift.json
index d426202e6a6..a4569918a72 100644
--- a/components-starter/camel-swift-starter/src/main/docs/swift.json
+++ b/components-starter/camel-swift-starter/src/main/docs/swift.json
@@ -54,21 +54,21 @@
"sourceType":
"org.apache.camel.dataformat.swift.mx.springboot.SwiftMxDataFormatConfiguration"
},
{
- "name": "camel.dataformat.swift-mx.read-config-ref",
+ "name": "camel.dataformat.swift-mx.read-config",
"type": "java.lang.String",
- "description": "Refers to a specific configuration to use when
unmarshalling an input stream to lookup from the registry.",
+ "description": "Refers to a specific configuration to use when
unmarshalling an input stream to lookup from the registry. The option is a
com.prowidesoftware.swift.model.mx.MxReadConfiguration type.",
"sourceType":
"org.apache.camel.dataformat.swift.mx.springboot.SwiftMxDataFormatConfiguration"
},
{
"name": "camel.dataformat.swift-mx.read-message-id",
"type": "java.lang.String",
- "description": "The type of MX message to produce when unmarshalling an
input stream. If not set, it will be automatically detected from the namespace
used.",
+ "description": "The type of MX message to produce when unmarshalling an
input stream. If not set, it will be automatically detected from the namespace
used. The option is a com.prowidesoftware.swift.model.MxId type.",
"sourceType":
"org.apache.camel.dataformat.swift.mx.springboot.SwiftMxDataFormatConfiguration"
},
{
- "name": "camel.dataformat.swift-mx.write-config-ref",
+ "name": "camel.dataformat.swift-mx.write-config",
"type": "java.lang.String",
- "description": "Refers to a specific configuration to use when
marshalling a message to lookup from the registry.",
+ "description": "Refers to a specific configuration to use when
marshalling a message to lookup from the registry. The option is a
com.prowidesoftware.swift.model.mx.MxWriteConfiguration type.",
"sourceType":
"org.apache.camel.dataformat.swift.mx.springboot.SwiftMxDataFormatConfiguration"
},
{
diff --git
a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConfiguration.java
b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConfiguration.java
index dc7c1a7429e..1cba010a5e6 100644
---
a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConfiguration.java
+++
b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConfiguration.java
@@ -34,33 +34,28 @@ public class SwiftMxDataFormatConfiguration
* enabled by default.
*/
private Boolean enabled;
- /**
- * Refers to a specific configuration to use when marshalling a message to
- * lookup from the registry.
- */
- private String writeConfigRef;
/**
* The flag indicating that messages must be marshalled in a JSON format.
*/
private Boolean writeInJson = false;
/**
* The type of MX message to produce when unmarshalling an input stream. If
- * not set, it will be automatically detected from the namespace used.
+ * not set, it will be automatically detected from the namespace used. The
+ * option is a com.prowidesoftware.swift.model.MxId type.
*/
private String readMessageId;
/**
* Refers to a specific configuration to use when unmarshalling an input
- * stream to lookup from the registry.
+ * stream to lookup from the registry. The option is a
+ * com.prowidesoftware.swift.model.mx.MxReadConfiguration type.
*/
- private String readConfigRef;
-
- public String getWriteConfigRef() {
- return writeConfigRef;
- }
-
- public void setWriteConfigRef(String writeConfigRef) {
- this.writeConfigRef = writeConfigRef;
- }
+ private String readConfig;
+ /**
+ * Refers to a specific configuration to use when marshalling a message to
+ * lookup from the registry. The option is a
+ * com.prowidesoftware.swift.model.mx.MxWriteConfiguration type.
+ */
+ private String writeConfig;
public Boolean getWriteInJson() {
return writeInJson;
@@ -78,11 +73,19 @@ public class SwiftMxDataFormatConfiguration
this.readMessageId = readMessageId;
}
- public String getReadConfigRef() {
- return readConfigRef;
+ public String getReadConfig() {
+ return readConfig;
+ }
+
+ public void setReadConfig(String readConfig) {
+ this.readConfig = readConfig;
+ }
+
+ public String getWriteConfig() {
+ return writeConfig;
}
- public void setReadConfigRef(String readConfigRef) {
- this.readConfigRef = readConfigRef;
+ public void setWriteConfig(String writeConfig) {
+ this.writeConfig = writeConfig;
}
}
\ No newline at end of file
diff --git
a/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConverter.java
b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConverter.java
new file mode 100644
index 00000000000..2d1780ca2c6
--- /dev/null
+++
b/components-starter/camel-swift-starter/src/main/java/org/apache/camel/dataformat/swift/mx/springboot/SwiftMxDataFormatConverter.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.swift.mx.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class SwiftMxDataFormatConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class,
com.prowidesoftware.swift.model.MxId.class));
+ answer.add(new ConvertiblePair(String.class,
com.prowidesoftware.swift.model.mx.MxReadConfiguration.class));
+ answer.add(new ConvertiblePair(String.class,
com.prowidesoftware.swift.model.mx.MxWriteConfiguration.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "com.prowidesoftware.swift.model.MxId": return
applicationContext.getBean(ref, com.prowidesoftware.swift.model.MxId.class);
+ case "com.prowidesoftware.swift.model.mx.MxReadConfiguration":
return applicationContext.getBean(ref,
com.prowidesoftware.swift.model.mx.MxReadConfiguration.class);
+ case "com.prowidesoftware.swift.model.mx.MxWriteConfiguration":
return applicationContext.getBean(ref,
com.prowidesoftware.swift.model.mx.MxWriteConfiguration.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git
a/components-starter/camel-xmlsecurity-starter/src/main/docs/xmlsecurity.json
b/components-starter/camel-xmlsecurity-starter/src/main/docs/xmlsecurity.json
index ee6dd198ff6..a993b5be36e 100644
---
a/components-starter/camel-xmlsecurity-starter/src/main/docs/xmlsecurity.json
+++
b/components-starter/camel-xmlsecurity-starter/src/main/docs/xmlsecurity.json
@@ -396,9 +396,9 @@
"defaultValue": "RSA_OAEP"
},
{
- "name":
"camel.dataformat.xml-security.key-or-trust-store-parameters-ref",
+ "name": "camel.dataformat.xml-security.key-or-trust-store-parameters",
"type": "java.lang.String",
- "description": "Refers to a KeyStore instance to lookup in the registry,
which is used for configuration options for creating and loading a KeyStore
instance that represents the sender's trustStore or recipient's keyStore.",
+ "description": "Refers to a KeyStore instance to lookup in the registry,
which is used for configuration options for creating and loading a KeyStore
instance that represents the sender's trustStore or recipient's keyStore. The
option is a org.apache.camel.support.jsse.KeyStoreParameters type.",
"sourceType":
"org.apache.camel.dataformat.xmlsecurity.springboot.XMLSecurityDataFormatConfiguration"
},
{
@@ -414,6 +414,12 @@
"sourceType":
"org.apache.camel.dataformat.xmlsecurity.springboot.XMLSecurityDataFormatConfiguration",
"defaultValue": "MGF1_SHA1"
},
+ {
+ "name": "camel.dataformat.xml-security.namespace",
+ "type": "java.util.Map",
+ "description": "Refers to a Map XML Namespaces of prefix - uri mappings",
+ "sourceType":
"org.apache.camel.dataformat.xmlsecurity.springboot.XMLSecurityDataFormatConfiguration"
+ },
{
"name": "camel.dataformat.xml-security.pass-phrase",
"type": "java.lang.String",
diff --git
a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConfiguration.java
b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConfiguration.java
index 87ab3f372fe..13f70853d99 100644
---
a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConfiguration.java
+++
b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dataformat.xmlsecurity.springboot;
+import java.util.Map;
import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -85,9 +86,10 @@ public class XMLSecurityDataFormatConfiguration
/**
* Refers to a KeyStore instance to lookup in the registry, which is used
* for configuration options for creating and loading a KeyStore instance
- * that represents the sender's trustStore or recipient's keyStore.
+ * that represents the sender's trustStore or recipient's keyStore. The
+ * option is a org.apache.camel.support.jsse.KeyStoreParameters type.
*/
- private String keyOrTrustStoreParametersRef;
+ private String keyOrTrustStoreParameters;
/**
* The password to be used for retrieving the private key from the
KeyStore.
* This key is used for asymmetric decryption.
@@ -111,6 +113,10 @@ public class XMLSecurityDataFormatConfiguration
* KeyValue in the EncryptedKey structure or not.
*/
private Boolean addKeyValueForEncryptedKey = true;
+ /**
+ * Refers to a Map XML Namespaces of prefix - uri mappings
+ */
+ private Map namespace;
public String getXmlCipherAlgorithm() {
return xmlCipherAlgorithm;
@@ -168,13 +174,12 @@ public class XMLSecurityDataFormatConfiguration
this.recipientKeyAlias = recipientKeyAlias;
}
- public String getKeyOrTrustStoreParametersRef() {
- return keyOrTrustStoreParametersRef;
+ public String getKeyOrTrustStoreParameters() {
+ return keyOrTrustStoreParameters;
}
- public void setKeyOrTrustStoreParametersRef(
- String keyOrTrustStoreParametersRef) {
- this.keyOrTrustStoreParametersRef = keyOrTrustStoreParametersRef;
+ public void setKeyOrTrustStoreParameters(String keyOrTrustStoreParameters)
{
+ this.keyOrTrustStoreParameters = keyOrTrustStoreParameters;
}
public String getKeyPassword() {
@@ -208,4 +213,12 @@ public class XMLSecurityDataFormatConfiguration
public void setAddKeyValueForEncryptedKey(Boolean
addKeyValueForEncryptedKey) {
this.addKeyValueForEncryptedKey = addKeyValueForEncryptedKey;
}
+
+ public Map getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(Map namespace) {
+ this.namespace = namespace;
+ }
}
\ No newline at end of file
diff --git
a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConverter.java
b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConverter.java
new file mode 100644
index 00000000000..92b79bb7c8b
--- /dev/null
+++
b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatConverter.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.xmlsecurity.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class XMLSecurityDataFormatConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class,
org.apache.camel.support.jsse.KeyStoreParameters.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "org.apache.camel.support.jsse.KeyStoreParameters": return
applicationContext.getBean(ref,
org.apache.camel.support.jsse.KeyStoreParameters.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 1ad6ef9eea8..29f78bee28e 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4557,7 +4557,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.11.3</version>
+ <version>3.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
