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 59af3eb48b1 [create-pull-request] automated change (#692)
59af3eb48b1 is described below
commit 59af3eb48b1099e4a226a21f8f7287c691a93114
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 4 06:30:24 2023 +0100
[create-pull-request] automated change (#692)
Co-authored-by: oscerd <[email protected]>
---
.../apache/camel/springboot/catalog/components/atom.json | 8 ++++----
.../apache/camel/springboot/catalog/components/rss.json | 8 ++++----
.../camel/springboot/catalog/components/salesforce.json | 4 ++--
.../apache/camel/springboot/catalog/components/smpp.json | 2 ++
.../camel/springboot/catalog/components/smpps.json | 2 ++
.../camel/springboot/catalog/others/swagger-java.json | 2 +-
.../src/main/docs/salesforce.json | 2 +-
.../springboot/SalesforceComponentConfiguration.java | 2 +-
.../camel-smpp-starter/src/main/docs/smpp.json | 6 ++++++
.../smpp/springboot/SmppComponentConfiguration.java | 16 ++++++++++++++++
10 files changed, 39 insertions(+), 13 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
index 65a7632d1ac..28977a12c1f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
@@ -30,17 +30,15 @@
},
"properties": {
"feedUri": { "kind": "path", "displayName": "Feed Uri", "group":
"consumer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The URI to the feed to poll." },
- "feedHeader": { "kind": "parameter", "displayName": "Feed Header",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Sets whether to add the feed
object as a header." },
- "password": { "kind": "parameter", "displayName": "Password", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the password to be used for basic authentication when
polling from a HTTP feed." },
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send
Empty Message When Idle", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
the polling consumer did not poll any files, you can enable this option to send
an empty message (no body) instead." },
"sortEntries": { "kind": "parameter", "displayName": "Sort Entries",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Sets whether to sort entries by
published date. Only works when splitEntries = true." },
"splitEntries": { "kind": "parameter", "displayName": "Split Entries",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Sets whether or not entries should
be sent individually or whether the entire feed should be sent as a single
message" },
"throttleEntries": { "kind": "parameter", "displayName": "Throttle
Entries", "group": "consumer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Sets whether all entries
identified in a single feed poll should be delivered immediately. If true, only
one entry is processed per delay. Only applicable when splitEntries = true." },
- "username": { "kind": "parameter", "displayName": "Username", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the username to be used for basic authentication when
polling from a HTTP feed." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy",
"group": "consumer (advanced)", "label": "consumer,advanced", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "A pluggable
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your
custom implementation to control error handling usually occurred during the
poll operation [...]
+ "feedHeader": { "kind": "parameter", "displayName": "Feed Header",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Sets whether to add the feed
object as a header." },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff
Error Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "description": "The number of subsequent
error polls (failed due some error) that should happen before the
backoffMultipler should kick-in." },
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff
Idle Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "description": "The number of subsequent
idle polls that should happen before the backoffMultipler should kick-in." },
"backoffMultiplier": { "kind": "parameter", "displayName": "Backoff
Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "description": "To let the scheduled polling consumer
backoff if there has been a number of subsequent idles\/errors in a row. The
multiplier is then the number of polls that will be skipped before the next
actual attempt is happening agai [...]
@@ -54,6 +52,8 @@
"schedulerProperties": { "kind": "parameter", "displayName": "Scheduler
Properties", "group": "scheduler", "label": "consumer,scheduler", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.String,
java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated":
false, "autowired": false, "secret": false, "description": "To configure
additional properties when using a custom scheduler or any of the Quartz,
Spring based scheduler." },
"startScheduler": { "kind": "parameter", "displayName": "Start Scheduler",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the scheduler
should be auto started." },
"timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group":
"scheduler", "label": "consumer,scheduler", "required": false, "type":
"object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS",
"MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"MILLISECONDS", "description": "Time unit for initialDelay and delay options."
},
- "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Controls if fixed delay
or fixed rate is used. See ScheduledExecutorService in JDK for details." }
+ "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Controls if fixed delay
or fixed rate is used. See ScheduledExecutorService in JDK for details." },
+ "password": { "kind": "parameter", "displayName": "Password", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "description": "Sets the password to be used for basic
authentication when polling from a HTTP feed.Notice: Basic authentication is
not a secured method, and is not recommended to be used." },
+ "username": { "kind": "parameter", "displayName": "Username", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "description": "Sets the username to be used for basic
authentication when polling from a HTTP feed. Notice: Basic authentication is
not a secured method, and is not recommended to be used." }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
index 5ff8fb6dbc0..96579a4fd15 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
@@ -30,17 +30,15 @@
},
"properties": {
"feedUri": { "kind": "path", "displayName": "Feed Uri", "group":
"consumer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The URI to the feed to poll." },
- "feedHeader": { "kind": "parameter", "displayName": "Feed Header",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Sets whether to add the feed
object as a header." },
- "password": { "kind": "parameter", "displayName": "Password", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the password to be used for basic authentication when
polling from a HTTP feed." },
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send
Empty Message When Idle", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
the polling consumer did not poll any files, you can enable this option to send
an empty message (no body) instead." },
"sortEntries": { "kind": "parameter", "displayName": "Sort Entries",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Sets whether to sort entries by
published date. Only works when splitEntries = true." },
"splitEntries": { "kind": "parameter", "displayName": "Split Entries",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Sets whether or not entries should
be sent individually or whether the entire feed should be sent as a single
message" },
"throttleEntries": { "kind": "parameter", "displayName": "Throttle
Entries", "group": "consumer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Sets whether all entries
identified in a single feed poll should be delivered immediately. If true, only
one entry is processed per delay. Only applicable when splitEntries = true." },
- "username": { "kind": "parameter", "displayName": "Username", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the username to be used for basic authentication when
polling from a HTTP feed." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy",
"group": "consumer (advanced)", "label": "consumer,advanced", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "A pluggable
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your
custom implementation to control error handling usually occurred during the
poll operation [...]
+ "feedHeader": { "kind": "parameter", "displayName": "Feed Header",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Sets whether to add the feed
object as a header." },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff
Error Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "description": "The number of subsequent
error polls (failed due some error) that should happen before the
backoffMultipler should kick-in." },
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff
Idle Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "description": "The number of subsequent
idle polls that should happen before the backoffMultipler should kick-in." },
"backoffMultiplier": { "kind": "parameter", "displayName": "Backoff
Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "description": "To let the scheduled polling consumer
backoff if there has been a number of subsequent idles\/errors in a row. The
multiplier is then the number of polls that will be skipped before the next
actual attempt is happening agai [...]
@@ -54,6 +52,8 @@
"schedulerProperties": { "kind": "parameter", "displayName": "Scheduler
Properties", "group": "scheduler", "label": "consumer,scheduler", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.String,
java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated":
false, "autowired": false, "secret": false, "description": "To configure
additional properties when using a custom scheduler or any of the Quartz,
Spring based scheduler." },
"startScheduler": { "kind": "parameter", "displayName": "Start Scheduler",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the scheduler
should be auto started." },
"timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group":
"scheduler", "label": "consumer,scheduler", "required": false, "type":
"object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS",
"MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"MILLISECONDS", "description": "Time unit for initialDelay and delay options."
},
- "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Controls if fixed delay
or fixed rate is used. See ScheduledExecutorService in JDK for details." }
+ "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay",
"group": "scheduler", "label": "consumer,scheduler", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Controls if fixed delay
or fixed rate is used. See ScheduledExecutorService in JDK for details." },
+ "password": { "kind": "parameter", "displayName": "Password", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "description": "Sets the password to be used for basic
authentication when polling from a HTTP feed.Notice: Basic authentication is
not a secured method, and is not recommended to be used." },
+ "username": { "kind": "parameter", "displayName": "Username", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": true, "description": "Sets the username to be used for basic
authentication when polling from a HTTP feed. Notice: Basic authentication is
not a secured method, and is not recommended to be used." }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index 190e10a702a..7e412f7e3c8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -25,7 +25,7 @@
"componentProperties": {
"apexMethod": { "kind": "property", "displayName": "Apex Method", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "APEX method name" },
"apexQueryParams": { "kind": "property", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Query params for APEX method" },
- "apiVersion": { "kind": "property", "displayName": "Api Version", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "54.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce API version." },
+ "apiVersion": { "kind": "property", "displayName": "Api Version", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "56.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce API version." },
"backoffIncrement": { "kind": "property", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Backoff interval increment for
Streaming connection restart attempts for failures beyond CometD auto- [...]
"batchId": { "kind": "property", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Bulk API Batch ID" },
"contentType": { "kind": "property", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.api.dto.bulk.ContentType",
"enum": [ "XML", "CSV", "JSON", "ZIP_XML", "ZIP_CSV", "ZIP_JSON" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Bulk API co [...]
@@ -142,7 +142,7 @@
"topicName": { "kind": "path", "displayName": "Topic Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The name of the topic\/channel to use" },
"apexMethod": { "kind": "parameter", "displayName": "Apex Method",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "APEX method name" },
"apexQueryParams": { "kind": "parameter", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Query params for APEX
method" },
- "apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "54.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Salesforce API version."
},
+ "apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "56.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Salesforce API version."
},
"backoffIncrement": { "kind": "parameter", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Backoff interval
increment for Streaming connection restart attempts for failures beyond Come
[...]
"batchId": { "kind": "parameter", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Bulk API Batch ID" },
"contentType": { "kind": "parameter", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.api.dto.bulk.ContentType",
"enum": [ "XML", "CSV", "JSON", "ZIP_XML", "ZIP_CSV", "ZIP_JSON" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Bul [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpp.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpp.json
index f6fb741329d..81193206f72 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpp.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpp.json
@@ -35,6 +35,7 @@
"destAddrTon": { "kind": "property", "displayName": "Dest Addr Ton",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3", "4", "5", "6" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the type of number (TON) to be used in
the SME destination address parameter [...]
"lazySessionCreation": { "kind": "property", "displayName": "Lazy Session
Creation", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sessions can be lazily created to avoid
exceptions, if the SMSC is not available when the [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
+ "messageReceiverRouteId": { "kind": "property", "displayName": "Message
Receiver Route Id", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Set this on producer in order to benefit from
transceiver (TRX) binding type. So once set, you do [...]
"numberingPlanIndicator": { "kind": "property", "displayName": "Numbering
Plan Indicator", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "byte", "enum": [ "0", "1", "2", "3", "6", "8",
"9", "10", "13", "18" ], "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the numeric plan indicator (NPI) to
[...]
"priorityFlag": { "kind": "property", "displayName": "Priority Flag",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Allows the originating SME to assign a
priority level to the short message. Only for SubmitSm and [...]
"protocolId": { "kind": "property", "displayName": "Protocol Id", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "The protocol id" },
@@ -125,6 +126,7 @@
"destAddrNpi": { "kind": "parameter", "displayName": "Dest Addr Npi",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3", "6", "8", "9", "10", "13",
"18" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "Defines the type of
number (TON) to be used in the SME destinatio [...]
"destAddrTon": { "kind": "parameter", "displayName": "Dest Addr Ton",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3", "4", "5", "6" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the type of number (TON) to be used in
the SME destination address paramete [...]
"lazySessionCreation": { "kind": "parameter", "displayName": "Lazy Session
Creation", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sessions can be lazily created to avoid
exceptions, if the SMSC is not available when th [...]
+ "messageReceiverRouteId": { "kind": "parameter", "displayName": "Message
Receiver Route Id", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Set this on producer in order to benefit from
transceiver (TRX) binding type. So once set, you d [...]
"numberingPlanIndicator": { "kind": "parameter", "displayName": "Numbering
Plan Indicator", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "byte", "enum": [ "0", "1", "2", "3", "6", "8",
"9", "10", "13", "18" ], "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the numeric plan indicator (NPI) to
[...]
"priorityFlag": { "kind": "parameter", "displayName": "Priority Flag",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Allows the originating SME to assign a
priority level to the short message. Only for SubmitSm and [...]
"protocolId": { "kind": "parameter", "displayName": "Protocol Id",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "The protocol id" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpps.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpps.json
index dea95411735..0d8c36274fb 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpps.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smpps.json
@@ -35,6 +35,7 @@
"destAddrTon": { "kind": "property", "displayName": "Dest Addr Ton",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3", "4", "5", "6" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the type of number (TON) to be used in
the SME destination address parameter [...]
"lazySessionCreation": { "kind": "property", "displayName": "Lazy Session
Creation", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sessions can be lazily created to avoid
exceptions, if the SMSC is not available when the [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
+ "messageReceiverRouteId": { "kind": "property", "displayName": "Message
Receiver Route Id", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Set this on producer in order to benefit from
transceiver (TRX) binding type. So once set, you do [...]
"numberingPlanIndicator": { "kind": "property", "displayName": "Numbering
Plan Indicator", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "byte", "enum": [ "0", "1", "2", "3", "6", "8",
"9", "10", "13", "18" ], "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the numeric plan indicator (NPI) to
[...]
"priorityFlag": { "kind": "property", "displayName": "Priority Flag",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Allows the originating SME to assign a
priority level to the short message. Only for SubmitSm and [...]
"protocolId": { "kind": "property", "displayName": "Protocol Id", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "The protocol id" },
@@ -125,6 +126,7 @@
"destAddrNpi": { "kind": "parameter", "displayName": "Dest Addr Npi",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3", "6", "8", "9", "10", "13",
"18" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "Defines the type of
number (TON) to be used in the SME destinatio [...]
"destAddrTon": { "kind": "parameter", "displayName": "Dest Addr Ton",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3", "4", "5", "6" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the type of number (TON) to be used in
the SME destination address paramete [...]
"lazySessionCreation": { "kind": "parameter", "displayName": "Lazy Session
Creation", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sessions can be lazily created to avoid
exceptions, if the SMSC is not available when th [...]
+ "messageReceiverRouteId": { "kind": "parameter", "displayName": "Message
Receiver Route Id", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Set this on producer in order to benefit from
transceiver (TRX) binding type. So once set, you d [...]
"numberingPlanIndicator": { "kind": "parameter", "displayName": "Numbering
Plan Indicator", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "byte", "enum": [ "0", "1", "2", "3", "6", "8",
"9", "10", "13", "18" ], "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the numeric plan indicator (NPI) to
[...]
"priorityFlag": { "kind": "parameter", "displayName": "Priority Flag",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "enum": [ "0", "1", "2", "3" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Allows the originating SME to assign a
priority level to the short message. Only for SubmitSm and [...]
"protocolId": { "kind": "parameter", "displayName": "Protocol Id",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "The protocol id" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/swagger-java.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/swagger-java.json
index 13cb2206571..f7690f0d0af 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/swagger-java.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/swagger-java.json
@@ -4,7 +4,7 @@
"name": "swagger-java",
"title": "Swagger Java",
"description": "Rest-dsl support for using swagger api-doc",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.16.0",
"label": "rest,api",
"supportLevel": "Stable",
diff --git
a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
index 6dc9ade1fd3..1efc3e45c8c 100644
--- a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
+++ b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
@@ -43,7 +43,7 @@
"type": "java.lang.String",
"description": "Salesforce API version.",
"sourceType":
"org.apache.camel.component.salesforce.springboot.SalesforceComponentConfiguration",
- "defaultValue": "54.0"
+ "defaultValue": "56.0"
},
{
"name": "camel.component.salesforce.authentication-type",
diff --git
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index 64e76d3792e..069f8346dac 100644
---
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -63,7 +63,7 @@ public class SalesforceComponentConfiguration
/**
* Salesforce API version.
*/
- private String apiVersion = "54.0";
+ private String apiVersion = "56.0";
/**
* Backoff interval increment for Streaming connection restart attempts for
* failures beyond CometD auto-reconnect. The option is a long type.
diff --git a/components-starter/camel-smpp-starter/src/main/docs/smpp.json
b/components-starter/camel-smpp-starter/src/main/docs/smpp.json
index db9e2ebb232..b58cdb20966 100644
--- a/components-starter/camel-smpp-starter/src/main/docs/smpp.json
+++ b/components-starter/camel-smpp-starter/src/main/docs/smpp.json
@@ -148,6 +148,12 @@
"sourceType":
"org.apache.camel.component.smpp.springboot.SmppComponentConfiguration",
"defaultValue": 2147483647
},
+ {
+ "name": "camel.component.smpp.message-receiver-route-id",
+ "type": "java.lang.String",
+ "description": "Set this on producer in order to benefit from
transceiver (TRX) binding type. So once set, you don't need to define an 'SMTPP
consumer' endpoint anymore. You would set this to a 'Direct consumer' endpoint
instead. DISCALIMER: This feature is only tested with 'Direct consumer'
endpoint. The behavior with any other consumer type is unknown and not tested.",
+ "sourceType":
"org.apache.camel.component.smpp.springboot.SmppComponentConfiguration"
+ },
{
"name": "camel.component.smpp.numbering-plan-indicator",
"type": "java.lang.Byte",
diff --git
a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConfiguration.java
b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConfiguration.java
index 1633078593d..f2d15595061 100644
---
a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConfiguration.java
+++
b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentConfiguration.java
@@ -130,6 +130,14 @@ public class SmppComponentConfiguration
* and prolong the total processing time of the processing.
*/
private Boolean lazyStartProducer = false;
+ /**
+ * Set this on producer in order to benefit from transceiver (TRX) binding
+ * type. So once set, you don't need to define an 'SMTPP consumer' endpoint
+ * anymore. You would set this to a 'Direct consumer' endpoint instead.
+ * DISCALIMER: This feature is only tested with 'Direct consumer' endpoint.
+ * The behavior with any other consumer type is unknown and not tested.
+ */
+ private String messageReceiverRouteId;
/**
* Defines the numeric plan indicator (NPI) to be used in the SME. The
* following NPI values are defined: 0: Unknown 1: ISDN (E163/E164) 2: Data
@@ -397,6 +405,14 @@ public class SmppComponentConfiguration
this.lazyStartProducer = lazyStartProducer;
}
+ public String getMessageReceiverRouteId() {
+ return messageReceiverRouteId;
+ }
+
+ public void setMessageReceiverRouteId(String messageReceiverRouteId) {
+ this.messageReceiverRouteId = messageReceiverRouteId;
+ }
+
public Byte getNumberingPlanIndicator() {
return numberingPlanIndicator;
}