You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/04/28 19:34:46 UTC
[camel-spring-boot] branch camel-spring-boot-3.14.x updated (5b18ff7799a -> b16b5e866c0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-spring-boot-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
from 5b18ff7799a Upgrade to spring boot 2.6.6
new d42297e852a CAMEL-18011: upgrade to spring boot 2.6.7
new b16b5e866c0 Regen
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
archetypes/camel-archetype-spring-boot/pom.xml | 2 +-
.../camel/springboot/catalog/components/netty-http.json | 8 ++++----
.../apache/camel/springboot/catalog/components/netty.json | 8 ++++----
.../camel/springboot/catalog/dataformats/fhirJson.json | 2 +-
.../camel/springboot/catalog/dataformats/fhirXml.json | 2 +-
.../camel-fhir-starter/src/main/docs/fhir.json | 8 ++++----
.../fhir/springboot/FhirJsonDataFormatConfiguration.java | 4 ++--
.../fhir/springboot/FhirXmlDataFormatConfiguration.java | 4 ++--
.../camel-netty-http-starter/src/main/docs/netty-http.json | 4 ++--
.../http/springboot/NettyHttpComponentConfiguration.java | 14 ++++++--------
.../camel-netty-starter/src/main/docs/netty.json | 4 ++--
.../netty/springboot/NettyComponentConfiguration.java | 14 ++++++--------
pom.xml | 2 +-
13 files changed, 36 insertions(+), 40 deletions(-)
[camel-spring-boot] 01/02: CAMEL-18011: upgrade to spring boot 2.6.7
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit d42297e852af7b3ce52eb9815a2c8e526d37599c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 28 21:32:28 2022 +0200
CAMEL-18011: upgrade to spring boot 2.6.7
---
archetypes/camel-archetype-spring-boot/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml
index 5e641fc03c1..2543ef100a8 100644
--- a/archetypes/camel-archetype-spring-boot/pom.xml
+++ b/archetypes/camel-archetype-spring-boot/pom.xml
@@ -34,7 +34,7 @@
<packaging>maven-archetype</packaging>
<properties>
- <spring-boot-version>2.6.6</spring-boot-version>
+ <spring-boot-version>2.6.7</spring-boot-version>
<archetype.test.settingsFile>src/test/resources/settings.xml</archetype.test.settingsFile> <!-- Needed to download camel-spring-boot snapshots -->
</properties>
diff --git a/pom.xml b/pom.xml
index 2c55144fd94..5367d6b6668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
<compiler.fork>false</compiler.fork>
<!-- Spring-Boot target version -->
- <spring-boot-version>2.6.6</spring-boot-version>
+ <spring-boot-version>2.6.7</spring-boot-version>
<!-- Camel target version -->
<camel-version>3.14.3-SNAPSHOT</camel-version>
[camel-spring-boot] 02/02: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit b16b5e866c0ba0aa5b4613dafef2e29145e9598c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 28 21:34:33 2022 +0200
Regen
---
.../camel/springboot/catalog/components/netty-http.json | 8 ++++----
.../apache/camel/springboot/catalog/components/netty.json | 8 ++++----
.../camel/springboot/catalog/dataformats/fhirJson.json | 2 +-
.../camel/springboot/catalog/dataformats/fhirXml.json | 2 +-
.../camel-fhir-starter/src/main/docs/fhir.json | 8 ++++----
.../fhir/springboot/FhirJsonDataFormatConfiguration.java | 4 ++--
.../fhir/springboot/FhirXmlDataFormatConfiguration.java | 4 ++--
.../camel-netty-http-starter/src/main/docs/netty-http.json | 4 ++--
.../http/springboot/NettyHttpComponentConfiguration.java | 14 ++++++--------
.../camel-netty-starter/src/main/docs/netty.json | 4 ++--
.../netty/springboot/NettyComponentConfiguration.java | 14 ++++++--------
11 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
index 2d6245d081d..8032e34111a 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
@@ -80,9 +80,9 @@
"allowDefaultCodec": { "kind": "property", "displayName": "Allow Default Codec", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The netty component installs a default codec if both, encoder\/decoder is null and textline is fal [...]
"autoAppendDelimiter": { "kind": "property", "displayName": "Auto Append Delimiter", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Whether or not to auto append missing end delimiter when sending using the textline codec." },
"decoderMaxLineLength": { "kind": "property", "displayName": "Decoder Max Line Length", "group": "codec", "label": "codec", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1024, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The max line length to use for the textline codec." },
- "decoders": { "kind": "property", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the [...]
+ "decoders": { "kind": "property", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Re [...]
"delimiter": { "kind": "property", "displayName": "Delimiter", "group": "codec", "label": "codec", "required": false, "type": "object", "javaType": "org.apache.camel.component.netty.TextLineDelimiter", "enum": [ "LINE", "NULL" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "LINE", "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The delimiter to use for the textline codec. [...]
- "encoders": { "kind": "property", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the [...]
+ "encoders": { "kind": "property", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Re [...]
"encoding": { "kind": "property", "displayName": "Encoding", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset." },
"textline": { "kind": "property", "displayName": "Textline", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specif [...]
"enabledProtocols": { "kind": "property", "displayName": "Enabled Protocols", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2", "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Which protocols to enable when using SSL" },
@@ -169,8 +169,8 @@
"transferExchange": { "kind": "parameter", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Only used for TCP. You can transfer the exchange over the wire instead of just the b [...]
"workerCount": { "kind": "parameter", "displayName": "Worker Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default workerCount parameter from Netty (which is cpu_core_threads x 2). User can [...]
"workerGroup": { "kind": "parameter", "displayName": "Worker Group", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.channel.EventLoopGroup", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool w [...]
- "decoders": { "kind": "parameter", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, an [...]
- "encoders": { "kind": "parameter", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, an [...]
+ "decoders": { "kind": "parameter", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up [...]
+ "encoders": { "kind": "parameter", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up [...]
"enabledProtocols": { "kind": "parameter", "displayName": "Enabled Protocols", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2", "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Which protocols to enable when using SSL" },
"keyStoreFile": { "kind": "parameter", "displayName": "Key Store File", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.io.File", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Client side certificate keystore to be used for encryption" },
"keyStoreFormat": { "kind": "parameter", "displayName": "Key Store Format", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Keystore format to be used for payload encryption. Defaults to JKS if not set" },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
index 6b67a5bc943..7ac02c184c7 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
@@ -76,9 +76,9 @@
"allowDefaultCodec": { "kind": "property", "displayName": "Allow Default Codec", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The netty component installs a default codec if both, encoder\/decoder is null and textline is fal [...]
"autoAppendDelimiter": { "kind": "property", "displayName": "Auto Append Delimiter", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Whether or not to auto append missing end delimiter when sending using the textline codec." },
"decoderMaxLineLength": { "kind": "property", "displayName": "Decoder Max Line Length", "group": "codec", "label": "codec", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1024, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The max line length to use for the textline codec." },
- "decoders": { "kind": "property", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the [...]
+ "decoders": { "kind": "property", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Re [...]
"delimiter": { "kind": "property", "displayName": "Delimiter", "group": "codec", "label": "codec", "required": false, "type": "object", "javaType": "org.apache.camel.component.netty.TextLineDelimiter", "enum": [ "LINE", "NULL" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "LINE", "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The delimiter to use for the textline codec. [...]
- "encoders": { "kind": "property", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the [...]
+ "encoders": { "kind": "property", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Re [...]
"encoding": { "kind": "property", "displayName": "Encoding", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset." },
"textline": { "kind": "property", "displayName": "Textline", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specif [...]
"enabledProtocols": { "kind": "property", "displayName": "Enabled Protocols", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2", "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Which protocols to enable when using SSL" },
@@ -153,9 +153,9 @@
"allowDefaultCodec": { "kind": "parameter", "displayName": "Allow Default Codec", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The netty component installs a default codec if both, encoder\/decoder is null and textline is fa [...]
"autoAppendDelimiter": { "kind": "parameter", "displayName": "Auto Append Delimiter", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Whether or not to auto append missing end delimiter when sending using the textline codec." },
"decoderMaxLineLength": { "kind": "parameter", "displayName": "Decoder Max Line Length", "group": "codec", "label": "codec", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1024, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The max line length to use for the textline codec." },
- "decoders": { "kind": "parameter", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have th [...]
+ "decoders": { "kind": "parameter", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the R [...]
"delimiter": { "kind": "parameter", "displayName": "Delimiter", "group": "codec", "label": "codec", "required": false, "type": "object", "javaType": "org.apache.camel.component.netty.TextLineDelimiter", "enum": [ "LINE", "NULL" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "LINE", "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The delimiter to use for the textline codec [...]
- "encoders": { "kind": "parameter", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have th [...]
+ "encoders": { "kind": "parameter", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the R [...]
"encoding": { "kind": "parameter", "displayName": "Encoding", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset." },
"textline": { "kind": "parameter", "displayName": "Textline", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not speci [...]
"enabledProtocols": { "kind": "parameter", "displayName": "Enabled Protocols", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2", "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Which protocols to enable when using SSL" },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirJson.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirJson.json
index f3dea2a749b..50beb7655d8 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirJson.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirJson.json
@@ -16,7 +16,7 @@
"modelJavaType": "org.apache.camel.model.dataformat.FhirJsonDataFormat"
},
"properties": {
- "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+ "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
"serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
"omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirXml.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirXml.json
index 81cd48707b9..7482f43b9df 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirXml.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fhirXml.json
@@ -16,7 +16,7 @@
"modelJavaType": "org.apache.camel.model.dataformat.FhirXmlDataFormat"
},
"properties": {
- "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DSTU3", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4" },
+ "fhirVersion": { "kind": "attribute", "displayName": "Fhir Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DSTU2", "DSTU2_HL7ORG", "DSTU2_1", "DSTU3", "R4", "R5" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "R4", "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5" },
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets the pretty print flag, meaning that the parser will encode resources with human-readable spacing and newlines between elements instead of condensing output as much as possible." },
"serverBaseUrl": { "kind": "attribute", "displayName": "Server Base Url", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the server's base URL used by this parser. If a value is set, resource references will be turned into relative references if they are provided as absolute URLs but have a base matching the given base." },
"omitResourceId": { "kind": "attribute", "displayName": "Omit Resource Id", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) the ID of any resources being encoded will not be included in the output. Note that this does not apply to contained resources, only to root resources. In other words, if this is set to true, contained resource [...]
diff --git a/components-starter/camel-fhir-starter/src/main/docs/fhir.json b/components-starter/camel-fhir-starter/src/main/docs/fhir.json
index 6572affdd8d..2e48158494d 100644
--- a/components-starter/camel-fhir-starter/src/main/docs/fhir.json
+++ b/components-starter/camel-fhir-starter/src/main/docs/fhir.json
@@ -266,9 +266,9 @@
{
"name": "camel.dataformat.fhirjson.fhir-version",
"type": "java.lang.String",
- "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4",
+ "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5",
"sourceType": "org.apache.camel.component.fhir.springboot.FhirJsonDataFormatConfiguration",
- "defaultValue": "DSTU3"
+ "defaultValue": "R4"
},
{
"name": "camel.dataformat.fhirjson.omit-resource-id",
@@ -364,9 +364,9 @@
{
"name": "camel.dataformat.fhirxml.fhir-version",
"type": "java.lang.String",
- "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4",
+ "description": "The version of FHIR to use. Possible values are: DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5",
"sourceType": "org.apache.camel.component.fhir.springboot.FhirXmlDataFormatConfiguration",
- "defaultValue": "DSTU3"
+ "defaultValue": "R4"
},
{
"name": "camel.dataformat.fhirxml.omit-resource-id",
diff --git a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
index 89c5e97cb40..8daf687c870 100644
--- a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
+++ b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatConfiguration.java
@@ -40,9 +40,9 @@ public class FhirJsonDataFormatConfiguration
private Boolean enabled;
/**
* The version of FHIR to use. Possible values are:
- * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
+ * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5
*/
- private String fhirVersion = "DSTU3";
+ private String fhirVersion = "R4";
/**
* Sets the pretty print flag, meaning that the parser will encode resources
* with human-readable spacing and newlines between elements instead of
diff --git a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
index a4b8e04c53b..33a79f95a77 100644
--- a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
+++ b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatConfiguration.java
@@ -40,9 +40,9 @@ public class FhirXmlDataFormatConfiguration
private Boolean enabled;
/**
* The version of FHIR to use. Possible values are:
- * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4
+ * DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5
*/
- private String fhirVersion = "DSTU3";
+ private String fhirVersion = "R4";
/**
* Sets the pretty print flag, meaning that the parser will encode resources
* with human-readable spacing and newlines between elements instead of
diff --git a/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json b/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json
index 41b450f9f6b..1f1d58b48a7 100644
--- a/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json
+++ b/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json
@@ -91,7 +91,7 @@
},
{
"name": "camel.component.netty-http.decoders",
- "type": "java.util.List<io.netty.channel.ChannelHandler>",
+ "type": "java.lang.String",
"description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup.",
"sourceType": "org.apache.camel.component.netty.http.springboot.NettyHttpComponentConfiguration"
},
@@ -124,7 +124,7 @@
},
{
"name": "camel.component.netty-http.encoders",
- "type": "java.util.List<io.netty.channel.ChannelHandler>",
+ "type": "java.lang.String",
"description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup.",
"sourceType": "org.apache.camel.component.netty.http.springboot.NettyHttpComponentConfiguration"
},
diff --git a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
index f15acf54ac2..097416178d2 100644
--- a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
+++ b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
@@ -17,10 +17,8 @@
package org.apache.camel.component.netty.http.springboot;
import java.io.File;
-import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
-import io.netty.channel.ChannelHandler;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.group.ChannelGroup;
import io.netty.handler.ssl.SslHandler;
@@ -356,13 +354,13 @@ public class NettyHttpComponentConfiguration
* separated by comma, and have the values be looked up in the Registry.
* Just remember to prefix the value with # so Camel knows it should lookup.
*/
- private List<ChannelHandler> decoders;
+ private String decoders;
/**
* A list of encoders to be used. You can use a String which have values
* separated by comma, and have the values be looked up in the Registry.
* Just remember to prefix the value with # so Camel knows it should lookup.
*/
- private List<ChannelHandler> encoders;
+ private String encoders;
/**
* Which protocols to enable when using SSL
*/
@@ -816,19 +814,19 @@ public class NettyHttpComponentConfiguration
this.workerGroup = workerGroup;
}
- public List<ChannelHandler> getDecoders() {
+ public String getDecoders() {
return decoders;
}
- public void setDecoders(List<ChannelHandler> decoders) {
+ public void setDecoders(String decoders) {
this.decoders = decoders;
}
- public List<ChannelHandler> getEncoders() {
+ public String getEncoders() {
return encoders;
}
- public void setEncoders(List<ChannelHandler> encoders) {
+ public void setEncoders(String encoders) {
this.encoders = encoders;
}
diff --git a/components-starter/camel-netty-starter/src/main/docs/netty.json b/components-starter/camel-netty-starter/src/main/docs/netty.json
index d2f2b7dc4fa..fbc134377dd 100644
--- a/components-starter/camel-netty-starter/src/main/docs/netty.json
+++ b/components-starter/camel-netty-starter/src/main/docs/netty.json
@@ -126,7 +126,7 @@
},
{
"name": "camel.component.netty.decoders",
- "type": "java.util.List<io.netty.channel.ChannelHandler>",
+ "type": "java.lang.String",
"description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup.",
"sourceType": "org.apache.camel.component.netty.springboot.NettyComponentConfiguration"
},
@@ -165,7 +165,7 @@
},
{
"name": "camel.component.netty.encoders",
- "type": "java.util.List<io.netty.channel.ChannelHandler>",
+ "type": "java.lang.String",
"description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup.",
"sourceType": "org.apache.camel.component.netty.springboot.NettyComponentConfiguration"
},
diff --git a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
index 2d470bd8582..b9e99d025de 100644
--- a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
+++ b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
@@ -17,10 +17,8 @@
package org.apache.camel.component.netty.springboot;
import java.io.File;
-import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
-import io.netty.channel.ChannelHandler;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.group.ChannelGroup;
import io.netty.handler.ssl.SslHandler;
@@ -394,7 +392,7 @@ public class NettyComponentConfiguration
* separated by comma, and have the values be looked up in the Registry.
* Just remember to prefix the value with # so Camel knows it should lookup.
*/
- private List<ChannelHandler> decoders;
+ private String decoders;
/**
* The delimiter to use for the textline codec. Possible values are LINE and
* NULL.
@@ -405,7 +403,7 @@ public class NettyComponentConfiguration
* separated by comma, and have the values be looked up in the Registry.
* Just remember to prefix the value with # so Camel knows it should lookup.
*/
- private List<ChannelHandler> encoders;
+ private String encoders;
/**
* The encoding (a charset name) to use for the textline codec. If not
* provided, Camel will use the JVM default Charset.
@@ -926,11 +924,11 @@ public class NettyComponentConfiguration
this.decoderMaxLineLength = decoderMaxLineLength;
}
- public List<ChannelHandler> getDecoders() {
+ public String getDecoders() {
return decoders;
}
- public void setDecoders(List<ChannelHandler> decoders) {
+ public void setDecoders(String decoders) {
this.decoders = decoders;
}
@@ -942,11 +940,11 @@ public class NettyComponentConfiguration
this.delimiter = delimiter;
}
- public List<ChannelHandler> getEncoders() {
+ public String getEncoders() {
return encoders;
}
- public void setEncoders(List<ChannelHandler> encoders) {
+ public void setEncoders(String encoders) {
this.encoders = encoders;
}