This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new f2bd8c7 Change SMPP default enquireLinkTimer from 5 seconds to 60 seconds. (#5090) f2bd8c7 is described below commit f2bd8c70de51d599109ee7b3516d172d54ae404a Author: Pim Moerenhout <pim.moerenh...@gmail.com> AuthorDate: Tue Feb 16 06:02:24 2021 +0100 Change SMPP default enquireLinkTimer from 5 seconds to 60 seconds. (#5090) * Change SMPP default enquireLinkTimer from 5 seconds to 60 seconds. * Keep sourcecheck happy on the imports. --- .../org/apache/camel/catalog/docs/smpp-component.adoc | 4 ++-- .../resources/org/apache/camel/component/smpp/smpp.json | 4 ++-- .../resources/org/apache/camel/component/smpp/smpps.json | 4 ++-- components/camel-smpp/src/main/docs/smpp-component.adoc | 4 ++-- .../org/apache/camel/component/smpp/SmppConfiguration.java | 4 ++-- .../apache/camel/component/smpp/SmppConfigurationTest.java | 8 ++++---- .../org/apache/camel/component/smpp/SmppConsumerTest.java | 2 +- .../component/smpp/SmppProducerLazySessionCreationTest.java | 2 +- .../org/apache/camel/component/smpp/SmppProducerTest.java | 2 +- .../builder/component/dsl/SmppComponentBuilderFactory.java | 2 +- .../builder/component/dsl/SmppsComponentBuilderFactory.java | 2 +- .../builder/endpoint/dsl/SmppEndpointBuilderFactory.java | 12 ++++++------ docs/components/modules/ROOT/pages/smpp-component.adoc | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/smpp-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/smpp-component.adoc index 5c0779e..4b94951 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/smpp-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/smpp-component.adoc @@ -197,7 +197,7 @@ The SMPP component supports 38 options, which are listed below. | *typeOfNumber* (producer) | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean | *configuration* (advanced) | To use the shared SmppConfiguration as configuration. | | SmppConfiguration -| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 5000 | Integer +| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 60000 | Integer | *sessionStateListener* (advanced) | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | | SessionStateListener | *transactionTimer* (advanced) | 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 (i.e. SMSC or ESME). | 10000 | Integer | *alphabet* (codec) | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet. There are 3 enums and the value can be one of: 0, 4, 8 | | byte @@ -269,7 +269,7 @@ with the following path and query parameters: | *sourceAddrNpi* (producer) | 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). There are 10 enums and the value can be one of: 0, 1, 2, 3, 6, 8, 9, 10, 13, 18 | | byte | *sourceAddrTon* (producer) | 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. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte | *typeOfNumber* (producer) | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte -| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 5000 | Integer +| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 60000 | Integer | *sessionStateListener* (advanced) | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | | SessionStateListener | *transactionTimer* (advanced) | 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 (i.e. SMSC or ESME). | 10000 | Integer | *alphabet* (codec) | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet. There are 3 enums and the value can be one of: 0, 4, 8 | | byte diff --git a/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpp.json b/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpp.json index 1aa9d36..c89178d 100644 --- a/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpp.json +++ b/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpp.json @@ -47,7 +47,7 @@ "typeOfNumber": { "kind": "property", "displayName": "Type Of Number", "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. The following TON values a [...] "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.smpp.SmppConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "To use the shared SmppConfiguration as configuration." }, - "enquireLinkTimer": { "kind": "property", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence c [...] + "enquireLinkTimer": { "kind": "property", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "60000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence [...] "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 [...] "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 [...] @@ -89,7 +89,7 @@ "sourceAddrNpi": { "kind": "parameter", "displayName": "Source 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 numeric plan indicator (NPI) to be used in the SM [...] "sourceAddrTon": { "kind": "parameter", "displayName": "Source 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 originator address param [...] "typeOfNumber": { "kind": "parameter", "displayName": "Type Of Number", "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. The following TON values [...] - "enquireLinkTimer": { "kind": "parameter", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence [...] + "enquireLinkTimer": { "kind": "parameter", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "60000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence [...] "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 [...] "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 [...] diff --git a/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpps.json b/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpps.json index a8d9d2c..ba74bf7 100644 --- a/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpps.json +++ b/components/camel-smpp/src/generated/resources/org/apache/camel/component/smpp/smpps.json @@ -47,7 +47,7 @@ "typeOfNumber": { "kind": "property", "displayName": "Type Of Number", "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. The following TON values a [...] "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.smpp.SmppConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "To use the shared SmppConfiguration as configuration." }, - "enquireLinkTimer": { "kind": "property", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence c [...] + "enquireLinkTimer": { "kind": "property", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "60000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence [...] "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 [...] "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 [...] @@ -89,7 +89,7 @@ "sourceAddrNpi": { "kind": "parameter", "displayName": "Source 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 numeric plan indicator (NPI) to be used in the SM [...] "sourceAddrTon": { "kind": "parameter", "displayName": "Source 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 originator address param [...] "typeOfNumber": { "kind": "parameter", "displayName": "Type Of Number", "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. The following TON values [...] - "enquireLinkTimer": { "kind": "parameter", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence [...] + "enquireLinkTimer": { "kind": "parameter", "displayName": "Enquire Link Timer", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "60000", "configurationClass": "org.apache.camel.component.smpp.SmppConfiguration", "configurationField": "configuration", "description": "Defines the interval in milliseconds between the confidence checks. The confidence [...] "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 [...] "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 [...] diff --git a/components/camel-smpp/src/main/docs/smpp-component.adoc b/components/camel-smpp/src/main/docs/smpp-component.adoc index 5c0779e..4b94951 100644 --- a/components/camel-smpp/src/main/docs/smpp-component.adoc +++ b/components/camel-smpp/src/main/docs/smpp-component.adoc @@ -197,7 +197,7 @@ The SMPP component supports 38 options, which are listed below. | *typeOfNumber* (producer) | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean | *configuration* (advanced) | To use the shared SmppConfiguration as configuration. | | SmppConfiguration -| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 5000 | Integer +| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 60000 | Integer | *sessionStateListener* (advanced) | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | | SessionStateListener | *transactionTimer* (advanced) | 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 (i.e. SMSC or ESME). | 10000 | Integer | *alphabet* (codec) | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet. There are 3 enums and the value can be one of: 0, 4, 8 | | byte @@ -269,7 +269,7 @@ with the following path and query parameters: | *sourceAddrNpi* (producer) | 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). There are 10 enums and the value can be one of: 0, 1, 2, 3, 6, 8, 9, 10, 13, 18 | | byte | *sourceAddrTon* (producer) | 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. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte | *typeOfNumber* (producer) | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte -| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 5000 | Integer +| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 60000 | Integer | *sessionStateListener* (advanced) | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | | SessionStateListener | *transactionTimer* (advanced) | 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 (i.e. SMSC or ESME). | 10000 | Integer | *alphabet* (codec) | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet. There are 3 enums and the value can be one of: 0, 4, 8 | | byte diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java index 5d6a9a4..0b58d69 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java @@ -56,8 +56,8 @@ public class SmppConfiguration implements Cloneable { private byte alphabet = Alphabet.ALPHA_DEFAULT.value(); @UriParam(label = "codec", defaultValue = "ISO-8859-1") private String encoding = "ISO-8859-1"; - @UriParam(label = "advanced", defaultValue = "5000") - private Integer enquireLinkTimer = 5000; + @UriParam(label = "advanced", defaultValue = "60000") + private Integer enquireLinkTimer = 60000; @UriParam(label = "advanced", defaultValue = "10000") private Integer transactionTimer = 10000; @UriParam(label = "producer", enums = "0,1,2") diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java index 1b7c664..a881aa0 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java @@ -52,7 +52,7 @@ public class SmppConfigurationTest { assertEquals(0x00, configuration.getDestAddrNpi()); assertEquals(0x00, configuration.getDestAddrTon()); assertEquals("", configuration.getAddressRange()); - assertEquals(Integer.valueOf(5000), configuration.getEnquireLinkTimer()); + assertEquals(Integer.valueOf(60000), configuration.getEnquireLinkTimer()); assertEquals("localhost", configuration.getHost()); assertEquals(null, configuration.getPassword()); assertEquals(Integer.valueOf(2775), configuration.getPort()); @@ -87,7 +87,7 @@ public class SmppConfigurationTest { assertEquals("1919", configuration.getDestAddr()); assertEquals(0x08, configuration.getDestAddrNpi()); assertEquals(0x02, configuration.getDestAddrTon()); - assertEquals(Integer.valueOf(5001), configuration.getEnquireLinkTimer()); + assertEquals(Integer.valueOf(60001), configuration.getEnquireLinkTimer()); assertEquals("127.0.0.1", configuration.getHost()); assertEquals("secret", configuration.getPassword()); assertEquals(Integer.valueOf(2776), configuration.getPort()); @@ -179,7 +179,7 @@ public class SmppConfigurationTest { public void toStringShouldListAllInstanceVariables() { String expected = "SmppConfiguration[" + "usingSSL=false, " - + "enquireLinkTimer=5000, " + + "enquireLinkTimer=60000, " + "host=localhost, " + "password=null, " + "port=2775, " @@ -221,7 +221,7 @@ public class SmppConfigurationTest { config.setDestAddr("1919"); config.setDestAddrNpi(NumberingPlanIndicator.NATIONAL.value()); config.setDestAddrTon(TypeOfNumber.NATIONAL.value()); - config.setEnquireLinkTimer(Integer.valueOf(5001)); + config.setEnquireLinkTimer(Integer.valueOf(60001)); config.setHost("127.0.0.1"); config.setPassword("secret"); config.setPort(Integer.valueOf(2776)); diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java index 09982ea..6404991 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java @@ -84,7 +84,7 @@ public class SmppConsumerTest { consumer.doStart(); - verify(session).setEnquireLinkTimer(5000); + verify(session).setEnquireLinkTimer(60000); verify(session).setTransactionTimer(10000); verify(session).addSessionStateListener(isA(SessionStateListener.class)); verify(session).setMessageReceiverListener(isA(MessageReceiverListener.class)); diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java index 6545b22..886629d 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java @@ -88,7 +88,7 @@ public class SmppProducerLazySessionCreationTest { producer.doStart(); producer.process(exchange); - verify(session).setEnquireLinkTimer(5000); + verify(session).setEnquireLinkTimer(60000); verify(session).setTransactionTimer(10000); verify(session).addSessionStateListener(isA(SessionStateListener.class)); verify(session).connectAndBind("localhost", Integer.valueOf(2775), expectedBindParameter); diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java index 6d093c8..6d89aca 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java @@ -76,7 +76,7 @@ public class SmppProducerTest { producer.doStart(); - verify(session).setEnquireLinkTimer(5000); + verify(session).setEnquireLinkTimer(60000); verify(session).setTransactionTimer(10000); verify(session).addSessionStateListener(isA(SessionStateListener.class)); verify(session).connectAndBind("localhost", Integer.valueOf(2775), expectedBindParameters); diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java index d8377c8..a5574c4 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java @@ -492,7 +492,7 @@ public interface SmppComponentBuilderFactory { * * The option is a: <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java index edb31ac..8ed3090 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java @@ -493,7 +493,7 @@ public interface SmppsComponentBuilderFactory { * * The option is a: <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java index fb4ea5d..7896fe3 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java @@ -611,7 +611,7 @@ public interface SmppEndpointBuilderFactory { * * The option is a: <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set @@ -630,7 +630,7 @@ public interface SmppEndpointBuilderFactory { * The option will be converted to a * <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set @@ -1660,7 +1660,7 @@ public interface SmppEndpointBuilderFactory { * * The option is a: <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set @@ -1679,7 +1679,7 @@ public interface SmppEndpointBuilderFactory { * The option will be converted to a * <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set @@ -2210,7 +2210,7 @@ public interface SmppEndpointBuilderFactory { * * The option is a: <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set @@ -2229,7 +2229,7 @@ public interface SmppEndpointBuilderFactory { * The option will be converted to a * <code>java.lang.Integer</code> type. * - * Default: 5000 + * Default: 60000 * Group: advanced * * @param enquireLinkTimer the value to set diff --git a/docs/components/modules/ROOT/pages/smpp-component.adoc b/docs/components/modules/ROOT/pages/smpp-component.adoc index 5dec083..b5bd06e 100644 --- a/docs/components/modules/ROOT/pages/smpp-component.adoc +++ b/docs/components/modules/ROOT/pages/smpp-component.adoc @@ -199,7 +199,7 @@ The SMPP component supports 38 options, which are listed below. | *typeOfNumber* (producer) | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte | *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean | *configuration* (advanced) | To use the shared SmppConfiguration as configuration. | | SmppConfiguration -| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 5000 | Integer +| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 60000 | Integer | *sessionStateListener* (advanced) | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | | SessionStateListener | *transactionTimer* (advanced) | 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 (i.e. SMSC or ESME). | 10000 | Integer | *alphabet* (codec) | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet. There are 3 enums and the value can be one of: 0, 4, 8 | | byte @@ -271,7 +271,7 @@ with the following path and query parameters: | *sourceAddrNpi* (producer) | 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). There are 10 enums and the value can be one of: 0, 1, 2, 3, 6, 8, 9, 10, 13, 18 | | byte | *sourceAddrTon* (producer) | 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. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte | *typeOfNumber* (producer) | Defines the type of number (TON) to be used in the SME. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: Abbreviated. There are 7 enums and the value can be one of: 0, 1, 2, 3, 4, 5, 6 | | byte -| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 5000 | Integer +| *enquireLinkTimer* (advanced) | Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC. | 60000 | Integer | *sessionStateListener* (advanced) | You can refer to a org.jsmpp.session.SessionStateListener in the Registry to receive callbacks when the session state changed. | | SessionStateListener | *transactionTimer* (advanced) | 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 (i.e. SMSC or ESME). | 10000 | Integer | *alphabet* (codec) | Defines encoding of data according the SMPP 3.4 specification, section 5.2.19. 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 Alphabet. There are 3 enums and the value can be one of: 0, 4, 8 | | byte