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 2025/01/01 10:16:25 UTC
(camel-spring-boot) branch main updated: CAMEL-17881: Regen
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 780b513d848 CAMEL-17881: Regen
780b513d848 is described below
commit 780b513d848d9e6a1f429fdf09ead8624cfa6804
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 1 11:16:17 2025 +0100
CAMEL-17881: Regen
---
.../camel/springboot/catalog/components/mllp.json | 7 +++--
.../camel-mllp-starter/src/main/docs/mllp.json | 13 +++++++++
.../springboot/MllpComponentConfiguration.java | 32 ++++++++++++++++++++++
.../mllp/springboot/MllpComponentConverter.java | 2 ++
4 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json
index b93be4c0c10..975856ebb3a 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json
@@ -55,7 +55,9 @@
"receiveBufferSize": { "index": 28, "kind": "property", "displayName": "Receive Buffer Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_RCVBUF option to the specified value (in bytes)" },
"receiveTimeout": { "index": 29, "kind": "property", "displayName": "Receive Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 15000, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame" },
"sendBufferSize": { "index": 30, "kind": "property", "displayName": "Send Buffer Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_SNDBUF option to the specified value (in bytes)" },
- "idleTimeout": { "index": 31, "kind": "property", "displayName": "Idle Timeout", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value l [...]
+ "sslContextParameters": { "index": 31, "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SSLContextParameters for securing TCP connecti [...]
+ "useGlobalSslContextParameters": { "index": 32, "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable usage of global SSL context parameters." },
+ "idleTimeout": { "index": 33, "kind": "property", "displayName": "Idle Timeout", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value l [...]
},
"headers": {
"CamelMllpLocalAddress": { "index": 0, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The local TCP Address of the Socket", "constantName": "org.apache.camel.component.mllp.MllpConstants#MLLP_LOCAL_ADDRESS" },
@@ -107,6 +109,7 @@
"receiveBufferSize": { "index": 26, "kind": "parameter", "displayName": "Receive Buffer Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_RCVBUF option to the specified value (in bytes)" },
"receiveTimeout": { "index": 27, "kind": "parameter", "displayName": "Receive Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 15000, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame" },
"sendBufferSize": { "index": 28, "kind": "parameter", "displayName": "Send Buffer Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_SNDBUF option to the specified value (in bytes)" },
- "idleTimeout": { "index": 29, "kind": "parameter", "displayName": "Idle Timeout", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value [...]
+ "sslContextParameters": { "index": 29, "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SSLContextParameters for securing TCP connect [...]
+ "idleTimeout": { "index": 30, "kind": "parameter", "displayName": "Idle Timeout", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value [...]
}
}
diff --git a/components-starter/camel-mllp-starter/src/main/docs/mllp.json b/components-starter/camel-mllp-starter/src/main/docs/mllp.json
index 3f7bc1b92ad..e3ebf086f9d 100644
--- a/components-starter/camel-mllp-starter/src/main/docs/mllp.json
+++ b/components-starter/camel-mllp-starter/src/main/docs/mllp.json
@@ -224,6 +224,12 @@
"sourceType": "org.apache.camel.component.mllp.springboot.MllpComponentConfiguration",
"defaultValue": 8192
},
+ {
+ "name": "camel.component.mllp.ssl-context-parameters",
+ "type": "org.apache.camel.support.jsse.SSLContextParameters",
+ "description": "Sets the SSLContextParameters for securing TCP connections. If set, the MLLP component will use SSL\/TLS for securing both producer and consumer TCP connections. This allows the configuration of trust stores, key stores, protocols, and other SSL\/TLS settings. If not set, the MLLP component will use plain TCP communication. The option is a org.apache.camel.support.jsse.SSLContextParameters type.",
+ "sourceType": "org.apache.camel.component.mllp.springboot.MllpComponentConfiguration"
+ },
{
"name": "camel.component.mllp.string-payload",
"type": "java.lang.Boolean",
@@ -238,6 +244,13 @@
"sourceType": "org.apache.camel.component.mllp.springboot.MllpComponentConfiguration",
"defaultValue": true
},
+ {
+ "name": "camel.component.mllp.use-global-ssl-context-parameters",
+ "type": "java.lang.Boolean",
+ "description": "Enable usage of global SSL context parameters.",
+ "sourceType": "org.apache.camel.component.mllp.springboot.MllpComponentConfiguration",
+ "defaultValue": false
+ },
{
"name": "camel.component.mllp.validate-payload",
"type": "java.lang.Boolean",
diff --git a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConfiguration.java b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConfiguration.java
index 304604128aa..22d0f3da6bd 100644
--- a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConfiguration.java
+++ b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConfiguration.java
@@ -21,6 +21,7 @@ import org.apache.camel.component.mllp.MllpComponent;
import org.apache.camel.component.mllp.MllpConfiguration;
import org.apache.camel.component.mllp.MllpIdleTimeoutStrategy;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.apache.camel.support.jsse.SSLContextParameters;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -211,6 +212,19 @@ public class MllpComponentConfiguration
* Sets the SO_SNDBUF option to the specified value (in bytes)
*/
private Integer sendBufferSize = 8192;
+ /**
+ * Sets the SSLContextParameters for securing TCP connections. If set, the
+ * MLLP component will use SSL/TLS for securing both producer and consumer
+ * TCP connections. This allows the configuration of trust stores, key
+ * stores, protocols, and other SSL/TLS settings. If not set, the MLLP
+ * component will use plain TCP communication. The option is a
+ * org.apache.camel.support.jsse.SSLContextParameters type.
+ */
+ private SSLContextParameters sslContextParameters;
+ /**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
/**
* The approximate idle time allowed before the Client TCP Connection will
* be reset. A null value or a value less than or equal to zero will disable
@@ -467,6 +481,24 @@ public class MllpComponentConfiguration
this.sendBufferSize = sendBufferSize;
}
+ public SSLContextParameters getSslContextParameters() {
+ return sslContextParameters;
+ }
+
+ public void setSslContextParameters(
+ SSLContextParameters sslContextParameters) {
+ this.sslContextParameters = sslContextParameters;
+ }
+
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public Integer getIdleTimeout() {
return idleTimeout;
}
diff --git a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java
index aecd7c32b2e..a28589b6085 100644
--- a/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java
+++ b/components-starter/camel-mllp-starter/src/main/java/org/apache/camel/component/mllp/springboot/MllpComponentConverter.java
@@ -40,6 +40,7 @@ public class MllpComponentConverter implements GenericConverter {
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class, org.apache.camel.component.mllp.MllpConfiguration.class));
+ answer.add(new ConvertiblePair(String.class, org.apache.camel.support.jsse.SSLContextParameters.class));
return answer;
}
@@ -57,6 +58,7 @@ public class MllpComponentConverter implements GenericConverter {
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
case "org.apache.camel.component.mllp.MllpConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.mllp.MllpConfiguration.class);
+ case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
}
return null;
}