Skip to content

Commit feb9135

Browse files
committed
Travis update: Jan 2023 (Build 710)
[skip ci]
1 parent 555700a commit feb9135

12 files changed

Lines changed: 159 additions & 13 deletions

File tree

api/openapi.yaml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,10 +1948,17 @@ components:
19481948
description: Phone number or alphanumeric sender name
19491949
type: string
19501950
validity:
1951-
description: After how many minutes this channel is considered as failed
1952-
and the next channel is attempted
1951+
description: |-
1952+
After how many minutes this channel is considered as failed and the next channel is attempted.
1953+
Only one of "ttl" and "validity" can be used.
19531954
example: 360
19541955
type: integer
1956+
ttl:
1957+
description: |-
1958+
After how many seconds this channel is considered as failed and the next channel is attempted.
1959+
Only one of "ttl" and "validity" can be used.
1960+
example: 21600
1961+
type: integer
19551962
text:
19561963
description: Plaintext content for Viber
19571964
type: string
@@ -1987,6 +1994,12 @@ components:
19871994
considered as failed and the next channel is attempted
19881995
example: 360
19891996
type: integer
1997+
ttl:
1998+
description: |-
1999+
After how many seconds this channel is considered as failed and the next channel is attempted.
2000+
Only one of "ttl" and "validity" can be used.
2001+
example: 21600
2002+
type: integer
19902003
text:
19912004
$ref: '#/components/schemas/WhatsAppText'
19922005
image:
@@ -2045,10 +2058,17 @@ components:
20452058
description: Phone number or alphanumeric sender name
20462059
type: string
20472060
validity:
2048-
description: After how many minutes this channel is considered as failed
2049-
and the next channel is attempted
2061+
description: |-
2062+
After how many minutes this channel is considered as failed and the next channel is attempted.
2063+
Only one of "ttl" and "validity" can be used.
20502064
example: 360
20512065
type: integer
2066+
ttl:
2067+
description: |-
2068+
After how many seconds this channel is considered as failed and the next channel is attempted.
2069+
Only one of "ttl" and "validity" can be used.
2070+
example: 21600
2071+
type: integer
20522072
autoconvert:
20532073
description: "Defines how non-GSM characters will be treated:\n\n - \"\
20542074
on\" Use replacement settings from the account's [API Auto Replace settings\

docs/OmnimessageMessagesInner.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
|------------ | ------------- | ------------- | -------------|
1010
|**sender** | **String** | Phone number or alphanumeric sender name | [optional] |
1111
|**validity** | **Integer** | After how many minutes this channel is considered as failed and the next channel is attempted | [optional] |
12+
|**ttl** | **Integer** | After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used. | [optional] |
1213
|**text** | **String** | Plaintext content for Telegram | |
1314
|**imageUrl** | **String** | URL for the embedded image. Mutually exclusive with \"document_url\" and \"audio_url\" | [optional] |
1415
|**buttonUrl** | **String** | URL of the button, must be specified along with ''text'', ''button_text'' and ''image_url'' (optional) | [optional] |

docs/SMS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ SMS message content
1010
|------------ | ------------- | ------------- | -------------|
1111
|**text** | **String** | Text content of the SMS | |
1212
|**sender** | **String** | Phone number or alphanumeric sender name | [optional] |
13-
|**validity** | **Integer** | After how many minutes this channel is considered as failed and the next channel is attempted | [optional] |
13+
|**validity** | **Integer** | After how many minutes this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used. | [optional] |
14+
|**ttl** | **Integer** | After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used. | [optional] |
1415
|**autoconvert** | [**AutoconvertEnum**](#AutoconvertEnum) | Defines how non-GSM characters will be treated: - \"on\" Use replacement settings from the account's [API Auto Replace settings page](https://dashboard.messente.com/api-settings/auto-replace) (default) - \"full\" All non GSM 03.38 characters will be replaced with suitable alternatives - \"off\" Message content is not modified in any way | [optional] |
1516
|**udh** | **String** | hex-encoded string containing SMS UDH | [optional] |
1617
|**channel** | [**ChannelEnum**](#ChannelEnum) | The channel used to deliver the message | [optional] |

docs/Viber.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ Viber message content
99
| Name | Type | Description | Notes |
1010
|------------ | ------------- | ------------- | -------------|
1111
|**sender** | **String** | Phone number or alphanumeric sender name | [optional] |
12-
|**validity** | **Integer** | After how many minutes this channel is considered as failed and the next channel is attempted | [optional] |
12+
|**validity** | **Integer** | After how many minutes this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used. | [optional] |
13+
|**ttl** | **Integer** | After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used. | [optional] |
1314
|**text** | **String** | Plaintext content for Viber | [optional] |
1415
|**imageUrl** | **String** | URL for the embedded image Valid combinations: 1) image_url, 2) text, image_url, button_url, button_text | [optional] |
1516
|**buttonUrl** | **String** | URL of the button, must be specified along with ''text'', ''button_text'' and ''image_url'' (optional) | [optional] |

docs/WhatsApp.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ WhatsApp message content. Only one of \"text\", \"image\", \"document\" or \"a
1010
|------------ | ------------- | ------------- | -------------|
1111
|**sender** | **String** | Phone number or alphanumeric sender name | [optional] |
1212
|**validity** | **Integer** | After how many minutes this channel is considered as failed and the next channel is attempted | [optional] |
13+
|**ttl** | **Integer** | After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used. | [optional] |
1314
|**text** | [**WhatsAppText**](WhatsAppText.md) | | [optional] |
1415
|**image** | [**WhatsAppImage**](WhatsAppImage.md) | | [optional] |
1516
|**document** | [**WhatsAppDocument**](WhatsAppDocument.md) | | [optional] |

src/main/java/com/messente/api/SMS.java

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ public class SMS {
6262
@SerializedName(SERIALIZED_NAME_VALIDITY)
6363
private Integer validity;
6464

65+
public static final String SERIALIZED_NAME_TTL = "ttl";
66+
@SerializedName(SERIALIZED_NAME_TTL)
67+
private Integer ttl;
68+
6569
/**
6670
* Defines how non-GSM characters will be treated: - \"on\" Use replacement settings from the account's [API Auto Replace settings page](https://dashboard.messente.com/api-settings/auto-replace) (default) - \"full\" All non GSM 03.38 characters will be replaced with suitable alternatives - \"off\" Message content is not modified in any way
6771
*/
@@ -224,11 +228,11 @@ public SMS validity(Integer validity) {
224228
}
225229

226230
/**
227-
* After how many minutes this channel is considered as failed and the next channel is attempted
231+
* After how many minutes this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.
228232
* @return validity
229233
**/
230234
@javax.annotation.Nullable
231-
@ApiModelProperty(example = "360", value = "After how many minutes this channel is considered as failed and the next channel is attempted")
235+
@ApiModelProperty(example = "360", value = "After how many minutes this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.")
232236

233237
public Integer getValidity() {
234238
return validity;
@@ -240,6 +244,29 @@ public void setValidity(Integer validity) {
240244
}
241245

242246

247+
public SMS ttl(Integer ttl) {
248+
249+
this.ttl = ttl;
250+
return this;
251+
}
252+
253+
/**
254+
* After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.
255+
* @return ttl
256+
**/
257+
@javax.annotation.Nullable
258+
@ApiModelProperty(example = "21600", value = "After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.")
259+
260+
public Integer getTtl() {
261+
return ttl;
262+
}
263+
264+
265+
public void setTtl(Integer ttl) {
266+
this.ttl = ttl;
267+
}
268+
269+
243270
public SMS autoconvert(AutoconvertEnum autoconvert) {
244271

245272
this.autoconvert = autoconvert;
@@ -322,14 +349,15 @@ public boolean equals(Object o) {
322349
return Objects.equals(this.text, SMS.text) &&
323350
Objects.equals(this.sender, SMS.sender) &&
324351
Objects.equals(this.validity, SMS.validity) &&
352+
Objects.equals(this.ttl, SMS.ttl) &&
325353
Objects.equals(this.autoconvert, SMS.autoconvert) &&
326354
Objects.equals(this.udh, SMS.udh) &&
327355
Objects.equals(this.channel, SMS.channel);
328356
}
329357

330358
@Override
331359
public int hashCode() {
332-
return Objects.hash(text, sender, validity, autoconvert, udh, channel);
360+
return Objects.hash(text, sender, validity, ttl, autoconvert, udh, channel);
333361
}
334362

335363
@Override
@@ -339,6 +367,7 @@ public String toString() {
339367
sb.append(" text: ").append(toIndentedString(text)).append("\n");
340368
sb.append(" sender: ").append(toIndentedString(sender)).append("\n");
341369
sb.append(" validity: ").append(toIndentedString(validity)).append("\n");
370+
sb.append(" ttl: ").append(toIndentedString(ttl)).append("\n");
342371
sb.append(" autoconvert: ").append(toIndentedString(autoconvert)).append("\n");
343372
sb.append(" udh: ").append(toIndentedString(udh)).append("\n");
344373
sb.append(" channel: ").append(toIndentedString(channel)).append("\n");
@@ -367,6 +396,7 @@ private String toIndentedString(Object o) {
367396
openapiFields.add("text");
368397
openapiFields.add("sender");
369398
openapiFields.add("validity");
399+
openapiFields.add("ttl");
370400
openapiFields.add("autoconvert");
371401
openapiFields.add("udh");
372402
openapiFields.add("channel");

src/main/java/com/messente/api/Viber.java

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ public class Viber {
5858
@SerializedName(SERIALIZED_NAME_VALIDITY)
5959
private Integer validity;
6060

61+
public static final String SERIALIZED_NAME_TTL = "ttl";
62+
@SerializedName(SERIALIZED_NAME_TTL)
63+
private Integer ttl;
64+
6165
public static final String SERIALIZED_NAME_TEXT = "text";
6266
@SerializedName(SERIALIZED_NAME_TEXT)
6367
private String text;
@@ -156,11 +160,11 @@ public Viber validity(Integer validity) {
156160
}
157161

158162
/**
159-
* After how many minutes this channel is considered as failed and the next channel is attempted
163+
* After how many minutes this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.
160164
* @return validity
161165
**/
162166
@javax.annotation.Nullable
163-
@ApiModelProperty(example = "360", value = "After how many minutes this channel is considered as failed and the next channel is attempted")
167+
@ApiModelProperty(example = "360", value = "After how many minutes this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.")
164168

165169
public Integer getValidity() {
166170
return validity;
@@ -172,6 +176,29 @@ public void setValidity(Integer validity) {
172176
}
173177

174178

179+
public Viber ttl(Integer ttl) {
180+
181+
this.ttl = ttl;
182+
return this;
183+
}
184+
185+
/**
186+
* After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.
187+
* @return ttl
188+
**/
189+
@javax.annotation.Nullable
190+
@ApiModelProperty(example = "21600", value = "After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.")
191+
192+
public Integer getTtl() {
193+
return ttl;
194+
}
195+
196+
197+
public void setTtl(Integer ttl) {
198+
this.ttl = ttl;
199+
}
200+
201+
175202
public Viber text(String text) {
176203

177204
this.text = text;
@@ -299,6 +326,7 @@ public boolean equals(Object o) {
299326
Viber viber = (Viber) o;
300327
return Objects.equals(this.sender, viber.sender) &&
301328
Objects.equals(this.validity, viber.validity) &&
329+
Objects.equals(this.ttl, viber.ttl) &&
302330
Objects.equals(this.text, viber.text) &&
303331
Objects.equals(this.imageUrl, viber.imageUrl) &&
304332
Objects.equals(this.buttonUrl, viber.buttonUrl) &&
@@ -308,7 +336,7 @@ public boolean equals(Object o) {
308336

309337
@Override
310338
public int hashCode() {
311-
return Objects.hash(sender, validity, text, imageUrl, buttonUrl, buttonText, channel);
339+
return Objects.hash(sender, validity, ttl, text, imageUrl, buttonUrl, buttonText, channel);
312340
}
313341

314342
@Override
@@ -317,6 +345,7 @@ public String toString() {
317345
sb.append("class Viber {\n");
318346
sb.append(" sender: ").append(toIndentedString(sender)).append("\n");
319347
sb.append(" validity: ").append(toIndentedString(validity)).append("\n");
348+
sb.append(" ttl: ").append(toIndentedString(ttl)).append("\n");
320349
sb.append(" text: ").append(toIndentedString(text)).append("\n");
321350
sb.append(" imageUrl: ").append(toIndentedString(imageUrl)).append("\n");
322351
sb.append(" buttonUrl: ").append(toIndentedString(buttonUrl)).append("\n");
@@ -346,6 +375,7 @@ private String toIndentedString(Object o) {
346375
openapiFields = new HashSet<String>();
347376
openapiFields.add("sender");
348377
openapiFields.add("validity");
378+
openapiFields.add("ttl");
349379
openapiFields.add("text");
350380
openapiFields.add("image_url");
351381
openapiFields.add("button_url");

src/main/java/com/messente/api/WhatsApp.java

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ public class WhatsApp {
6262
@SerializedName(SERIALIZED_NAME_VALIDITY)
6363
private Integer validity;
6464

65+
public static final String SERIALIZED_NAME_TTL = "ttl";
66+
@SerializedName(SERIALIZED_NAME_TTL)
67+
private Integer ttl;
68+
6569
public static final String SERIALIZED_NAME_TEXT = "text";
6670
@SerializedName(SERIALIZED_NAME_TEXT)
6771
private WhatsAppText text;
@@ -176,6 +180,29 @@ public void setValidity(Integer validity) {
176180
}
177181

178182

183+
public WhatsApp ttl(Integer ttl) {
184+
185+
this.ttl = ttl;
186+
return this;
187+
}
188+
189+
/**
190+
* After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \&quot;ttl\&quot; and \&quot;validity\&quot; can be used.
191+
* @return ttl
192+
**/
193+
@javax.annotation.Nullable
194+
@ApiModelProperty(example = "21600", value = "After how many seconds this channel is considered as failed and the next channel is attempted. Only one of \"ttl\" and \"validity\" can be used.")
195+
196+
public Integer getTtl() {
197+
return ttl;
198+
}
199+
200+
201+
public void setTtl(Integer ttl) {
202+
this.ttl = ttl;
203+
}
204+
205+
179206
public WhatsApp text(WhatsAppText text) {
180207

181208
this.text = text;
@@ -303,6 +330,7 @@ public boolean equals(Object o) {
303330
WhatsApp whatsApp = (WhatsApp) o;
304331
return Objects.equals(this.sender, whatsApp.sender) &&
305332
Objects.equals(this.validity, whatsApp.validity) &&
333+
Objects.equals(this.ttl, whatsApp.ttl) &&
306334
Objects.equals(this.text, whatsApp.text) &&
307335
Objects.equals(this.image, whatsApp.image) &&
308336
Objects.equals(this.document, whatsApp.document) &&
@@ -312,7 +340,7 @@ public boolean equals(Object o) {
312340

313341
@Override
314342
public int hashCode() {
315-
return Objects.hash(sender, validity, text, image, document, audio, channel);
343+
return Objects.hash(sender, validity, ttl, text, image, document, audio, channel);
316344
}
317345

318346
@Override
@@ -321,6 +349,7 @@ public String toString() {
321349
sb.append("class WhatsApp {\n");
322350
sb.append(" sender: ").append(toIndentedString(sender)).append("\n");
323351
sb.append(" validity: ").append(toIndentedString(validity)).append("\n");
352+
sb.append(" ttl: ").append(toIndentedString(ttl)).append("\n");
324353
sb.append(" text: ").append(toIndentedString(text)).append("\n");
325354
sb.append(" image: ").append(toIndentedString(image)).append("\n");
326355
sb.append(" document: ").append(toIndentedString(document)).append("\n");
@@ -350,6 +379,7 @@ private String toIndentedString(Object o) {
350379
openapiFields = new HashSet<String>();
351380
openapiFields.add("sender");
352381
openapiFields.add("validity");
382+
openapiFields.add("ttl");
353383
openapiFields.add("text");
354384
openapiFields.add("image");
355385
openapiFields.add("document");

src/test/java/com/messente/api/OmnimessageMessagesInnerTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ public void validityTest() {
6262
// TODO: test validity
6363
}
6464

65+
/**
66+
* Test the property 'ttl'
67+
*/
68+
@Test
69+
public void ttlTest() {
70+
// TODO: test ttl
71+
}
72+
6573
/**
6674
* Test the property 'text'
6775
*/

src/test/java/com/messente/api/SMSTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ public void validityTest() {
6363
// TODO: test validity
6464
}
6565

66+
/**
67+
* Test the property 'ttl'
68+
*/
69+
@Test
70+
public void ttlTest() {
71+
// TODO: test ttl
72+
}
73+
6674
/**
6775
* Test the property 'autoconvert'
6876
*/

0 commit comments

Comments
 (0)