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 82bd8c8 Regen
82bd8c8 is described below
commit 82bd8c8eb0c006af00311ba0140915265f13c716
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 11 07:01:38 2021 +0200
Regen
---
.../apache/camel/springboot/catalog/components/smpp.json | 2 ++
.../apache/camel/springboot/catalog/components/smpps.json | 2 ++
.../camel-smpp-starter/src/main/docs/smpp-starter.adoc | 3 ++-
.../smpp/springboot/SmppComponentConfiguration.java | 14 ++++++++++++++
docs/modules/ROOT/pages/smpp-starter.adoc | 3 ++-
docs/modules/ROOT/pages/spring-boot.adoc | 2 +-
6 files changed, 23 insertions(+), 3 deletions(-)
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 f2e4b69..04187cb 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
@@ -51,6 +51,7 @@
"pduProcessorDegree": { "kind": "property", "displayName": "Pdu Processor
Degree", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "3", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the number of threads which can read PDU
and process them in parallel." },
"pduProcessorQueueCapacity": { "kind": "property", "displayName": "Pdu
Processor Queue Capacity", "group": "advanced", "label": "advanced",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"100", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the capacity of the working queue for PDU
processing." },
"sessionStateListener": { "kind": "property", "displayName": "Session
State Listener", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "org.jsmpp.session.SessionStateListener",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "You can refer to a
org.jsmpp.session.SessionStateListener in the Registry to rec [...]
+ "singleDLR": { "kind": "property", "displayName": "Single DLR", "group":
"advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "When true, the SMSC delivery receipt would be
requested only for the last segment of a multi-segment (long) me [...]
"transactionTimer": { "kind": "property", "displayName": "Transaction
Timer", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10000", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the maximum period of inactivity
allowed after a transaction, after which an [...]
"alphabet": { "kind": "property", "displayName": "Alphabet", "group":
"codec", "label": "codec", "required": false, "type": "integer", "javaType":
"byte", "enum": [ "0", "4", "8" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines encoding of data according the SMPP
3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alpha [...]
"dataCoding": { "kind": "property", "displayName": "Data Coding", "group":
"codec", "label": "codec", "required": false, "type": "integer", "javaType":
"byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "Defines the data coding
according the SMPP 3.4 specification, section 5.2.19. Example data encodings
are: 0: SMSC Default Alphabet 3: Latin [...]
@@ -95,6 +96,7 @@
"pduProcessorDegree": { "kind": "parameter", "displayName": "Pdu Processor
Degree", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "3", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the number of threads which can read PDU
and process them in parallel." },
"pduProcessorQueueCapacity": { "kind": "parameter", "displayName": "Pdu
Processor Queue Capacity", "group": "advanced", "label": "advanced",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"100", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the capacity of the working queue for PDU
processing." },
"sessionStateListener": { "kind": "parameter", "displayName": "Session
State Listener", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "org.jsmpp.session.SessionStateListener",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "You can refer to a
org.jsmpp.session.SessionStateListener in the Registry to re [...]
+ "singleDLR": { "kind": "parameter", "displayName": "Single DLR", "group":
"advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "When true, the SMSC delivery receipt would be
requested only for the last segment of a multi-segment (long) m [...]
"transactionTimer": { "kind": "parameter", "displayName": "Transaction
Timer", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10000", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the maximum period of inactivity
allowed after a transaction, after which a [...]
"alphabet": { "kind": "parameter", "displayName": "Alphabet", "group":
"codec", "label": "codec", "required": false, "type": "integer", "javaType":
"byte", "enum": [ "0", "4", "8" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines encoding of data according the SMPP
3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alph [...]
"dataCoding": { "kind": "parameter", "displayName": "Data Coding",
"group": "codec", "label": "codec", "required": false, "type": "integer",
"javaType": "byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "Defines the data coding
according the SMPP 3.4 specification, section 5.2.19. Example data encodings
are: 0: SMSC Default Alphabet 3: Latin [...]
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 1b15cc9..50d83ab 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
@@ -51,6 +51,7 @@
"pduProcessorDegree": { "kind": "property", "displayName": "Pdu Processor
Degree", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "3", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the number of threads which can read PDU
and process them in parallel." },
"pduProcessorQueueCapacity": { "kind": "property", "displayName": "Pdu
Processor Queue Capacity", "group": "advanced", "label": "advanced",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"100", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the capacity of the working queue for PDU
processing." },
"sessionStateListener": { "kind": "property", "displayName": "Session
State Listener", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "org.jsmpp.session.SessionStateListener",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "You can refer to a
org.jsmpp.session.SessionStateListener in the Registry to rec [...]
+ "singleDLR": { "kind": "property", "displayName": "Single DLR", "group":
"advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "When true, the SMSC delivery receipt would be
requested only for the last segment of a multi-segment (long) me [...]
"transactionTimer": { "kind": "property", "displayName": "Transaction
Timer", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10000", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the maximum period of inactivity
allowed after a transaction, after which an [...]
"alphabet": { "kind": "property", "displayName": "Alphabet", "group":
"codec", "label": "codec", "required": false, "type": "integer", "javaType":
"byte", "enum": [ "0", "4", "8" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines encoding of data according the SMPP
3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alpha [...]
"dataCoding": { "kind": "property", "displayName": "Data Coding", "group":
"codec", "label": "codec", "required": false, "type": "integer", "javaType":
"byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "Defines the data coding
according the SMPP 3.4 specification, section 5.2.19. Example data encodings
are: 0: SMSC Default Alphabet 3: Latin [...]
@@ -95,6 +96,7 @@
"pduProcessorDegree": { "kind": "parameter", "displayName": "Pdu Processor
Degree", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "3", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the number of threads which can read PDU
and process them in parallel." },
"pduProcessorQueueCapacity": { "kind": "parameter", "displayName": "Pdu
Processor Queue Capacity", "group": "advanced", "label": "advanced",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"100", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Sets the capacity of the working queue for PDU
processing." },
"sessionStateListener": { "kind": "parameter", "displayName": "Session
State Listener", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "org.jsmpp.session.SessionStateListener",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "You can refer to a
org.jsmpp.session.SessionStateListener in the Registry to re [...]
+ "singleDLR": { "kind": "parameter", "displayName": "Single DLR", "group":
"advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "When true, the SMSC delivery receipt would be
requested only for the last segment of a multi-segment (long) m [...]
"transactionTimer": { "kind": "parameter", "displayName": "Transaction
Timer", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "10000", "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines the maximum period of inactivity
allowed after a transaction, after which a [...]
"alphabet": { "kind": "parameter", "displayName": "Alphabet", "group":
"codec", "label": "codec", "required": false, "type": "integer", "javaType":
"byte", "enum": [ "0", "4", "8" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.smpp.SmppConfiguration", "configurationField":
"configuration", "description": "Defines encoding of data according the SMPP
3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alph [...]
"dataCoding": { "kind": "parameter", "displayName": "Data Coding",
"group": "codec", "label": "codec", "required": false, "type": "integer",
"javaType": "byte", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.smpp.SmppConfiguration",
"configurationField": "configuration", "description": "Defines the data coding
according the SMPP 3.4 specification, section 5.2.19. Example data encodings
are: 0: SMSC Default Alphabet 3: Latin [...]
diff --git
a/components-starter/camel-smpp-starter/src/main/docs/smpp-starter.adoc
b/components-starter/camel-smpp-starter/src/main/docs/smpp-starter.adoc
index ec08dc8..7033146 100644
--- a/components-starter/camel-smpp-starter/src/main/docs/smpp-starter.adoc
+++ b/components-starter/camel-smpp-starter/src/main/docs/smpp-starter.adoc
@@ -17,7 +17,7 @@ When using smpp with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 41 options, which are listed below.
+The component supports 42 options, which are listed below.
@@ -56,6 +56,7 @@ The component supports 41 options, which are listed below.
| *camel.component.smpp.replace-if-present-flag* | Used to request the SMSC to
replace a previously submitted message, that is still pending delivery. The
SMSC will replace an existing message provided that the source address,
destination address and service type match the same fields in the new message.
The following replace if present flag values are defined: 0: Don't replace 1:
Replace | | Byte
| *camel.component.smpp.service-type* | The service type parameter can be used
to indicate the SMS Application service associated with the message. The
following generic service_types are defined: CMT: Cellular Messaging CPT:
Cellular Paging VMN: Voice Mail Notification VMA: Voice Mail Alerting WAP:
Wireless Application Protocol USSD: Unstructured Supplementary Services Data |
| String
| *camel.component.smpp.session-state-listener* | You can refer to a
org.jsmpp.session.SessionStateListener in the Registry to receive callbacks
when the session state changed. The option is a
org.jsmpp.session.SessionStateListener type. | | SessionStateListener
+| *camel.component.smpp.single-d-l-r* | When true, the SMSC delivery receipt
would be requested only for the last segment of a multi-segment (long) message.
For short messages, with only 1 segment the behaviour is unchanged. | false |
Boolean
| *camel.component.smpp.source-addr* | Defines the address of SME (Short
Message Entity) which originated this message. | 1616 | String
| *camel.component.smpp.source-addr-npi* | Defines the numeric plan indicator
(NPI) to be used in the SME originator address parameters. The following NPI
values are defined: 0: Unknown 1: ISDN (E163/E164) 2: Data (X.121) 3: Telex
(F.69) 6: Land Mobile (E.212) 8: National 9: Private 10: ERMES 13: Internet
(IP) 18: WAP Client Id (to be defined by WAP Forum) | | Byte
| *camel.component.smpp.source-addr-ton* | Defines the type of number (TON) to
be used in the SME originator address parameters. The following TON values are
defined: 0: Unknown 1: International 2: National 3: Network Specific 4:
Subscriber Number 5: Alphanumeric 6: Abbreviated | | 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 b9f692c..1633078 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
@@ -234,6 +234,12 @@ public class SmppComponentConfiguration
*/
private SessionStateListener sessionStateListener;
/**
+ * When true, the SMSC delivery receipt would be requested only for the
last
+ * segment of a multi-segment (long) message. For short messages, with only
+ * 1 segment the behaviour is unchanged.
+ */
+ private Boolean singleDLR = false;
+ /**
* Defines the maximum period of inactivity allowed after a transaction,
* after which an SMPP entity may assume that the session is no longer
* active. This timer may be active on either communicating SMPP entity
@@ -520,6 +526,14 @@ public class SmppComponentConfiguration
this.sessionStateListener = sessionStateListener;
}
+ public Boolean getSingleDLR() {
+ return singleDLR;
+ }
+
+ public void setSingleDLR(Boolean singleDLR) {
+ this.singleDLR = singleDLR;
+ }
+
public Integer getTransactionTimer() {
return transactionTimer;
}
diff --git a/docs/modules/ROOT/pages/smpp-starter.adoc
b/docs/modules/ROOT/pages/smpp-starter.adoc
index ec08dc8..7033146 100644
--- a/docs/modules/ROOT/pages/smpp-starter.adoc
+++ b/docs/modules/ROOT/pages/smpp-starter.adoc
@@ -17,7 +17,7 @@ When using smpp with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 41 options, which are listed below.
+The component supports 42 options, which are listed below.
@@ -56,6 +56,7 @@ The component supports 41 options, which are listed below.
| *camel.component.smpp.replace-if-present-flag* | Used to request the SMSC to
replace a previously submitted message, that is still pending delivery. The
SMSC will replace an existing message provided that the source address,
destination address and service type match the same fields in the new message.
The following replace if present flag values are defined: 0: Don't replace 1:
Replace | | Byte
| *camel.component.smpp.service-type* | The service type parameter can be used
to indicate the SMS Application service associated with the message. The
following generic service_types are defined: CMT: Cellular Messaging CPT:
Cellular Paging VMN: Voice Mail Notification VMA: Voice Mail Alerting WAP:
Wireless Application Protocol USSD: Unstructured Supplementary Services Data |
| String
| *camel.component.smpp.session-state-listener* | You can refer to a
org.jsmpp.session.SessionStateListener in the Registry to receive callbacks
when the session state changed. The option is a
org.jsmpp.session.SessionStateListener type. | | SessionStateListener
+| *camel.component.smpp.single-d-l-r* | When true, the SMSC delivery receipt
would be requested only for the last segment of a multi-segment (long) message.
For short messages, with only 1 segment the behaviour is unchanged. | false |
Boolean
| *camel.component.smpp.source-addr* | Defines the address of SME (Short
Message Entity) which originated this message. | 1616 | String
| *camel.component.smpp.source-addr-npi* | Defines the numeric plan indicator
(NPI) to be used in the SME originator address parameters. The following NPI
values are defined: 0: Unknown 1: ISDN (E163/E164) 2: Data (X.121) 3: Telex
(F.69) 6: Land Mobile (E.212) 8: National 9: Private 10: ERMES 13: Internet
(IP) 18: WAP Client Id (to be defined by WAP Forum) | | Byte
| *camel.component.smpp.source-addr-ton* | Defines the type of number (TON) to
be used in the SME originator address parameters. The following TON values are
defined: 0: Unknown 1: International 2: National 3: Network Specific 4:
Subscriber Number 5: Alphanumeric 6: Abbreviated | | Byte
diff --git a/docs/modules/ROOT/pages/spring-boot.adoc
b/docs/modules/ROOT/pages/spring-boot.adoc
index 8f130bb..6252432 100644
--- a/docs/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/modules/ROOT/pages/spring-boot.adoc
@@ -169,7 +169,7 @@ The component supports 173 options, which are listed below.
| *camel.springboot.exchange-factory-capacity* | The capacity the pool (for
each consumer) uses for storing exchanges. The default capacity is 100. | 100 |
Integer
| *camel.springboot.exchange-factory-statistics-enabled* | Configures whether
statistics is enabled on exchange factory. | false | Boolean
| *camel.springboot.file-configurations* | Directory to load additional
configuration files that contains configuration values that takes precedence
over any other configuration. This can be used to refer to files that may have
secret configuration that has been mounted on the file system for containers.
You must use either file: or classpath: as prefix to load from file system or
classpath. Then you can specify a pattern to load from sub directories and a
name pattern such as file:/var/ [...]
-| *camel.springboot.global-options* | | | Map
+| *camel.springboot.global-options* | Sets global options that can be
referenced in the camel context Important: This has nothing to do with property
placeholders, and is just a plain set of key/value pairs which are used to
configure global options on CamelContext, such as a maximum debug logging
length etc. | | Map
| *camel.springboot.include-non-singletons* | Whether to include non-singleton
beans (prototypes) when scanning for RouteBuilder instances. By default only
singleton beans is included in the context scan. | false | Boolean
| *camel.springboot.inflight-repository-browse-enabled* | Sets whether the
inflight repository should allow browsing each inflight exchange. This is by
default disabled as there is a very slight performance overhead when enabled. |
false | Boolean
| *camel.springboot.java-routes-exclude-pattern* | Used for exclusive
filtering RouteBuilder classes which are collected from the registry or via
classpath scanning. The exclusive filtering takes precedence over inclusive
filtering. The pattern is using Ant-path style pattern. Multiple patterns can
be specified separated by comma. For example to exclude all classes starting
with Bar use: **/Bar* To exclude all routes form a specific package
use: com/mycompany/bar/* To exc [...]
