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 a1d62d07a8d Regen
a1d62d07a8d is described below
commit a1d62d07a8dd961a3f2ceb29e6cb00c3da377e40
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Dec 27 11:23:02 2024 +0100
Regen
---
.../camel/springboot/catalog/components/mina.json | 20 +++++++++++---------
.../camel-mina-starter/src/main/docs/mina.json | 22 +++++++++++++++-------
.../springboot/MinaComponentConfiguration.java | 20 ++++++++++++++++++++
3 files changed, 46 insertions(+), 16 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
index de4973eb303..769fa812fa7 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
@@ -40,17 +40,18 @@
"disconnectOnNoReply": { "index": 13, "kind": "property", "displayName":
"Disconnect On No Reply", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true,
"configurationClass": "org.apache.camel.component.mina.MinaConfiguration",
"configurationField": "configuration", "description": "If sync is enabled then
this option dictates MinaConsumer if it should disco [...]
"maximumPoolSize": { "index": 14, "kind": "property", "displayName":
"Maximum Pool Size", "group": "advanced", "label": "advanced", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 16, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Number of worker threads in the worker pool
for TCP and UDP" },
"orderedThreadPoolExecutor": { "index": 15, "kind": "property",
"displayName": "Ordered Thread Pool Executor", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"configurationClass": "org.apache.camel.component.mina.MinaConfiguration",
"configurationField": "configuration", "description": "Whether to use ordered
thread pool, to ensure events are process [...]
- "transferExchange": { "index": 16, "kind": "property", "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.mina.MinaConfiguration",
"configurationField": "configuration", "description": "Only used for TCP. You
can transfer the exchange over the wire instead of just the [...]
+ "transferExchange": { "index": 16, "kind": "property", "displayName":
"Transfer Exchange", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": true,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.mina.MinaConfiguration",
"configurationField": "configuration", "description": "Only used for TCP. You
can transfer the exchange over the wire instead of just the b [...]
"allowDefaultCodec": { "index": 17, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "The mina component installs a default codec if
both, codec is null and textline is fals [...]
"codec": { "index": 18, "kind": "property", "displayName": "Codec",
"group": "codec", "label": "codec", "required": false, "type": "object",
"javaType": "org.apache.mina.filter.codec.ProtocolCodecFactory", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To use a custom minda codec implementation." },
"decoderMaxLineLength": { "index": 19, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To set the textline protocol decoder max line
length. By default the default value o [...]
"encoderMaxLineLength": { "index": 20, "kind": "property", "displayName":
"Encoder Max Line Length", "group": "codec", "label": "codec", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": -1, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To set the textline protocol encoder max line
length. By default the default value of [...]
"encoding": { "index": 21, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "You can configure the encoding (a charset
name) to use for the TCP textline codec and the UDP protocol. If not provided,
[...]
"filters": { "index": 22, "kind": "property", "displayName": "Filters",
"group": "codec", "label": "codec", "required": false, "type": "array",
"javaType": "java.util.List<org.apache.mina.core.filterchain.IoFilter>",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "You can set a list of Mina IoFilters to use."
},
- "textline": { "index": 23, "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.mina.MinaConfiguration", "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 [...]
- "textlineDelimiter": { "index": 24, "kind": "property", "displayName":
"Textline Delimiter", "group": "codec", "label": "codec", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.mina.MinaTextLineDelimiter", "enum": [ "DEFAULT",
"AUTO", "UNIX", "WINDOWS", "MAC" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Only use [...]
- "sslContextParameters": { "index": 25, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To configure SSL security." },
- "useGlobalSslContextParameters": { "index": 26, "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." }
+ "objectCodecPattern": { "index": 23, "kind": "property", "displayName":
"Object Codec Pattern", "group": "codec", "label": "codec", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Accept the wildcard specified classes for
Object deserialization, unless they are otherwise rejecte [...]
+ "textline": { "index": 24, "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.mina.MinaConfiguration", "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 [...]
+ "textlineDelimiter": { "index": 25, "kind": "property", "displayName":
"Textline Delimiter", "group": "codec", "label": "codec", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.mina.MinaTextLineDelimiter", "enum": [ "DEFAULT",
"AUTO", "UNIX", "WINDOWS", "MAC" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Only use [...]
+ "sslContextParameters": { "index": 26, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To configure SSL security." },
+ "useGlobalSslContextParameters": { "index": 27, "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." }
},
"headers": {
"CamelMinaCloseSessionWhenComplete": { "index": 0, "kind": "header",
"displayName": "", "group": "common", "label": "", "required": false,
"javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Indicates whether the session should be
closed after complete", "constantName":
"org.apache.camel.component.mina.MinaConstants#MINA_CLOSE_SESSION_WHEN_COMPLETE"
},
@@ -78,15 +79,16 @@
"disconnectOnNoReply": { "index": 16, "kind": "parameter", "displayName":
"Disconnect On No Reply", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true,
"configurationClass": "org.apache.camel.component.mina.MinaConfiguration",
"configurationField": "configuration", "description": "If sync is enabled then
this option dictates MinaConsumer if it should disc [...]
"maximumPoolSize": { "index": 17, "kind": "parameter", "displayName":
"Maximum Pool Size", "group": "advanced", "label": "advanced", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 16, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Number of worker threads in the worker pool
for TCP and UDP" },
"orderedThreadPoolExecutor": { "index": 18, "kind": "parameter",
"displayName": "Ordered Thread Pool Executor", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"configurationClass": "org.apache.camel.component.mina.MinaConfiguration",
"configurationField": "configuration", "description": "Whether to use ordered
thread pool, to ensure events are proces [...]
- "transferExchange": { "index": 19, "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.mina.MinaConfiguration",
"configurationField": "configuration", "description": "Only used for TCP. You
can transfer the exchange over the wire instead of just the [...]
+ "transferExchange": { "index": 19, "kind": "parameter", "displayName":
"Transfer Exchange", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": true,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.mina.MinaConfiguration",
"configurationField": "configuration", "description": "Only used for TCP. You
can transfer the exchange over the wire instead of just the [...]
"allowDefaultCodec": { "index": 20, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "The mina component installs a default codec if
both, codec is null and textline is fal [...]
"codec": { "index": 21, "kind": "parameter", "displayName": "Codec",
"group": "codec", "label": "codec", "required": false, "type": "object",
"javaType": "org.apache.mina.filter.codec.ProtocolCodecFactory", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To use a custom minda codec implementation." },
"decoderMaxLineLength": { "index": 22, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To set the textline protocol decoder max line
length. By default the default value [...]
"encoderMaxLineLength": { "index": 23, "kind": "parameter", "displayName":
"Encoder Max Line Length", "group": "codec", "label": "codec", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": -1, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To set the textline protocol encoder max line
length. By default the default value of [...]
"encoding": { "index": 24, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "You can configure the encoding (a charset
name) to use for the TCP textline codec and the UDP protocol. If not provided,
[...]
"filters": { "index": 25, "kind": "parameter", "displayName": "Filters",
"group": "codec", "label": "codec", "required": false, "type": "array",
"javaType": "java.util.List<org.apache.mina.core.filterchain.IoFilter>",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "You can set a list of Mina IoFilters to use."
},
- "textline": { "index": 26, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Only used for TCP. If no codec is specified,
you can use this flag to indicate a text line based codec; i [...]
- "textlineDelimiter": { "index": 27, "kind": "parameter", "displayName":
"Textline Delimiter", "group": "codec", "label": "codec", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.mina.MinaTextLineDelimiter", "enum": [ "DEFAULT",
"AUTO", "UNIX", "WINDOWS", "MAC" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Only us [...]
- "sslContextParameters": { "index": 28, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To configure SSL security." }
+ "objectCodecPattern": { "index": 26, "kind": "parameter", "displayName":
"Object Codec Pattern", "group": "codec", "label": "codec", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Accept the wildcard specified classes for
Object deserialization, unless they are otherwise reject [...]
+ "textline": { "index": 27, "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Only used for TCP. If no codec is specified,
you can use this flag to indicate a text line based codec; i [...]
+ "textlineDelimiter": { "index": 28, "kind": "parameter", "displayName":
"Textline Delimiter", "group": "codec", "label": "codec", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.mina.MinaTextLineDelimiter", "enum": [ "DEFAULT",
"AUTO", "UNIX", "WINDOWS", "MAC" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.mina.MinaConfiguration", "configurationField":
"configuration", "description": "Only us [...]
+ "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.mina.MinaConfiguration", "configurationField":
"configuration", "description": "To configure SSL security." }
}
}
diff --git a/components-starter/camel-mina-starter/src/main/docs/mina.json
b/components-starter/camel-mina-starter/src/main/docs/mina.json
index e8a10238b04..de26dd7d41d 100644
--- a/components-starter/camel-mina-starter/src/main/docs/mina.json
+++ b/components-starter/camel-mina-starter/src/main/docs/mina.json
@@ -146,6 +146,12 @@
"sourceType":
"org.apache.camel.component.mina.springboot.MinaComponentConfiguration",
"defaultValue": "warn"
},
+ {
+ "name": "camel.component.mina.object-codec-pattern",
+ "type": "java.lang.String",
+ "description": "Accept the wildcard specified classes for Object
deserialization, unless they are otherwise rejected. Multiple patterns can be
separated by comma.",
+ "sourceType":
"org.apache.camel.component.mina.springboot.MinaComponentConfiguration"
+ },
{
"name": "camel.component.mina.ordered-thread-pool-executor",
"type": "java.lang.Boolean",
@@ -186,13 +192,6 @@
"sourceType":
"org.apache.camel.component.mina.springboot.MinaComponentConfiguration",
"defaultValue": 30000
},
- {
- "name": "camel.component.mina.transfer-exchange",
- "type": "java.lang.Boolean",
- "description": "Only used for TCP. You can transfer the exchange over
the wire instead of just the body. The following fields are transferred: In
body, Out body, fault body, In headers, Out headers, fault headers, exchange
properties, exchange exception. This requires that the objects are
serializable. Camel will exclude any non-serializable objects and log it at
WARN level.",
- "sourceType":
"org.apache.camel.component.mina.springboot.MinaComponentConfiguration",
- "defaultValue": false
- },
{
"name": "camel.component.mina.use-global-ssl-context-parameters",
"type": "java.lang.Boolean",
@@ -206,6 +205,15 @@
"description": "Maximum amount of time it should take to send data to
the MINA session. Default is 10000 milliseconds.",
"sourceType":
"org.apache.camel.component.mina.springboot.MinaComponentConfiguration",
"defaultValue": 10000
+ },
+ {
+ "name": "camel.component.mina.transfer-exchange",
+ "type": "java.lang.Boolean",
+ "description": "Only used for TCP. You can transfer the exchange over
the wire instead of just the body. The following fields are transferred: In
body, Out body, fault body, In headers, Out headers, fault headers, exchange
properties, exchange exception. This requires that the objects are
serializable. Camel will exclude any non-serializable objects and log it at
WARN level. Also make sure to configure objectCodecPattern to (star) to allow
transferring java objects.",
+ "sourceType":
"org.apache.camel.component.mina.springboot.MinaComponentConfiguration",
+ "defaultValue": false,
+ "deprecated": true,
+ "deprecation": {}
}
],
"hints": []
diff --git
a/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConfiguration.java
b/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConfiguration.java
index e5ee80585d8..e6e090222f1 100644
---
a/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConfiguration.java
+++
b/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConfiguration.java
@@ -26,6 +26,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import
org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
/**
* Socket level networking using TCP or UDP with Apache Mina 2.x.
@@ -146,7 +147,10 @@ public class MinaComponentConfiguration
* fault body, In headers, Out headers, fault headers, exchange properties,
* exchange exception. This requires that the objects are serializable.
* Camel will exclude any non-serializable objects and log it at WARN
level.
+ * Also make sure to configure objectCodecPattern to (star) to allow
+ * transferring java objects.
*/
+ @Deprecated
private Boolean transferExchange = false;
/**
* The mina component installs a default codec if both, codec is null and
@@ -181,6 +185,11 @@ public class MinaComponentConfiguration
* You can set a list of Mina IoFilters to use.
*/
private List<IoFilter> filters;
+ /**
+ * Accept the wildcard specified classes for Object deserialization, unless
+ * they are otherwise rejected. Multiple patterns can be separated by
comma.
+ */
+ private String objectCodecPattern;
/**
* Only used for TCP. If no codec is specified, you can use this flag to
* indicate a text line based codec; if not specified or the value is
false,
@@ -331,10 +340,13 @@ public class MinaComponentConfiguration
this.orderedThreadPoolExecutor = orderedThreadPoolExecutor;
}
+ @Deprecated
+ @DeprecatedConfigurationProperty
public Boolean getTransferExchange() {
return transferExchange;
}
+ @Deprecated
public void setTransferExchange(Boolean transferExchange) {
this.transferExchange = transferExchange;
}
@@ -387,6 +399,14 @@ public class MinaComponentConfiguration
this.filters = filters;
}
+ public String getObjectCodecPattern() {
+ return objectCodecPattern;
+ }
+
+ public void setObjectCodecPattern(String objectCodecPattern) {
+ this.objectCodecPattern = objectCodecPattern;
+ }
+
public Boolean getTextline() {
return textline;
}
