Skip to content

Commit 67cd8e9

Browse files
committed
[Librarian] Regenerated @ fffff4e2a9903902262deb482f4cefeb44c2d081
1 parent c8169fd commit 67cd8e9

37 files changed

+729
-171
lines changed

CHANGES.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
twilio-java changelog
22
=====================
33

4+
[2023-05-18] Version 9.6.1
5+
--------------------------
6+
**Library - Fix**
7+
- [PR #743](https://github.com/twilio/twilio-java/pull/743): Removing org.json as this repo doesnot contain a direct dependency. Thanks to [@AsabuHere](https://github.com/AsabuHere)!
8+
9+
**Conversations**
10+
- Added `AddressCountry` parameter to Address Configuration endpoint, to support regional short code addresses
11+
- Added query parameters `start_date`, `end_date` and `state` in list Conversations resource for filtering
12+
13+
**Insights**
14+
- Added annotations parameters to list summary api
15+
16+
**Messaging**
17+
- Add GET domainByMessagingService endpoint to linkShortening service
18+
- Add `disable_https` to link shortening domain_config properties
19+
20+
**Numbers**
21+
- Add bulk_eligibility api under version `/v1`.
22+
23+
424
[2023-05-04] Version 9.6.0
525
--------------------------
626
**Conversations**

src/main/java/com/twilio/rest/conversations/v1/AddressConfiguration.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@JsonIgnoreProperties(ignoreUnknown = true)
4444
@ToString
4545
public class AddressConfiguration extends Resource {
46-
private static final long serialVersionUID = 160450785190727L;
46+
private static final long serialVersionUID = 162346024858734L;
4747

4848
public static AddressConfigurationCreator creator(final AddressConfiguration.Type type, final String address){
4949
return new AddressConfigurationCreator(type, address);
@@ -171,6 +171,7 @@ public static Type forValue(final String value) {
171171
private final ZonedDateTime dateCreated;
172172
private final ZonedDateTime dateUpdated;
173173
private final URI url;
174+
private final String addressCountry;
174175

175176
@JsonCreator
176177
private AddressConfiguration(
@@ -199,7 +200,10 @@ private AddressConfiguration(
199200
final String dateUpdated,
200201

201202
@JsonProperty("url")
202-
final URI url
203+
final URI url,
204+
205+
@JsonProperty("address_country")
206+
final String addressCountry
203207
) {
204208
this.sid = sid;
205209
this.accountSid = accountSid;
@@ -210,6 +214,7 @@ private AddressConfiguration(
210214
this.dateCreated = DateConverter.iso8601DateTimeFromString(dateCreated);
211215
this.dateUpdated = DateConverter.iso8601DateTimeFromString(dateUpdated);
212216
this.url = url;
217+
this.addressCountry = addressCountry;
213218
}
214219

215220
public final String getSid() {
@@ -239,6 +244,9 @@ public final ZonedDateTime getDateUpdated() {
239244
public final URI getUrl() {
240245
return this.url;
241246
}
247+
public final String getAddressCountry() {
248+
return this.addressCountry;
249+
}
242250

243251
@Override
244252
public boolean equals(final Object o) {
@@ -252,12 +260,12 @@ public boolean equals(final Object o) {
252260

253261
AddressConfiguration other = (AddressConfiguration) o;
254262

255-
return Objects.equals(sid, other.sid) && Objects.equals(accountSid, other.accountSid) && Objects.equals(type, other.type) && Objects.equals(address, other.address) && Objects.equals(friendlyName, other.friendlyName) && Objects.equals(autoCreation, other.autoCreation) && Objects.equals(dateCreated, other.dateCreated) && Objects.equals(dateUpdated, other.dateUpdated) && Objects.equals(url, other.url) ;
263+
return Objects.equals(sid, other.sid) && Objects.equals(accountSid, other.accountSid) && Objects.equals(type, other.type) && Objects.equals(address, other.address) && Objects.equals(friendlyName, other.friendlyName) && Objects.equals(autoCreation, other.autoCreation) && Objects.equals(dateCreated, other.dateCreated) && Objects.equals(dateUpdated, other.dateUpdated) && Objects.equals(url, other.url) && Objects.equals(addressCountry, other.addressCountry) ;
256264
}
257265

258266
@Override
259267
public int hashCode() {
260-
return Objects.hash(sid, accountSid, type, address, friendlyName, autoCreation, dateCreated, dateUpdated, url);
268+
return Objects.hash(sid, accountSid, type, address, friendlyName, autoCreation, dateCreated, dateUpdated, url, addressCountry);
261269
}
262270

263271
}

src/main/java/com/twilio/rest/conversations/v1/AddressConfigurationCreator.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class AddressConfigurationCreator extends Creator<AddressConfiguration>{
4242
private List<String> autoCreationWebhookFilters;
4343
private String autoCreationStudioFlowSid;
4444
private Integer autoCreationStudioRetryCount;
45+
private String addressCountry;
4546

4647
public AddressConfigurationCreator(final AddressConfiguration.Type type, final String address) {
4748
this.type = type;
@@ -95,6 +96,10 @@ public AddressConfigurationCreator setAutoCreationStudioRetryCount(final Integer
9596
this.autoCreationStudioRetryCount = autoCreationStudioRetryCount;
9697
return this;
9798
}
99+
public AddressConfigurationCreator setAddressCountry(final String addressCountry){
100+
this.addressCountry = addressCountry;
101+
return this;
102+
}
98103

99104
@Override
100105
public AddressConfiguration create(final TwilioRestClient client){
@@ -169,5 +174,9 @@ private void addPostParams(final Request request) {
169174
request.addPostParam("AutoCreation.StudioRetryCount", autoCreationStudioRetryCount.toString());
170175

171176
}
177+
if (addressCountry != null) {
178+
request.addPostParam("AddressCountry", addressCountry);
179+
180+
}
172181
}
173182
}

src/main/java/com/twilio/rest/conversations/v1/ConversationReader.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,26 @@
2929

3030

3131
public class ConversationReader extends Reader<Conversation> {
32+
private String startDate;
33+
private String endDate;
34+
private Conversation.State state;
3235
private Integer pageSize;
3336

3437
public ConversationReader(){
3538
}
3639

40+
public ConversationReader setStartDate(final String startDate){
41+
this.startDate = startDate;
42+
return this;
43+
}
44+
public ConversationReader setEndDate(final String endDate){
45+
this.endDate = endDate;
46+
return this;
47+
}
48+
public ConversationReader setState(final Conversation.State state){
49+
this.state = state;
50+
return this;
51+
}
3752
public ConversationReader setPageSize(final Integer pageSize){
3853
this.pageSize = pageSize;
3954
return this;
@@ -107,6 +122,18 @@ public Page<Conversation> getPage(final String targetUrl, final TwilioRestClient
107122
return pageForRequest(client, request);
108123
}
109124
private void addQueryParams(final Request request) {
125+
if (startDate != null) {
126+
127+
request.addQueryParam("StartDate", startDate);
128+
}
129+
if (endDate != null) {
130+
131+
request.addQueryParam("EndDate", endDate);
132+
}
133+
if (state != null) {
134+
135+
request.addQueryParam("State", state.toString());
136+
}
110137
if (pageSize != null) {
111138

112139
request.addQueryParam("PageSize", pageSize.toString());

src/main/java/com/twilio/rest/conversations/v1/service/ConversationReader.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,27 @@
3030

3131
public class ConversationReader extends Reader<Conversation> {
3232
private String pathChatServiceSid;
33+
private String startDate;
34+
private String endDate;
35+
private Conversation.State state;
3336
private Integer pageSize;
3437

3538
public ConversationReader(final String pathChatServiceSid){
3639
this.pathChatServiceSid = pathChatServiceSid;
3740
}
3841

42+
public ConversationReader setStartDate(final String startDate){
43+
this.startDate = startDate;
44+
return this;
45+
}
46+
public ConversationReader setEndDate(final String endDate){
47+
this.endDate = endDate;
48+
return this;
49+
}
50+
public ConversationReader setState(final Conversation.State state){
51+
this.state = state;
52+
return this;
53+
}
3954
public ConversationReader setPageSize(final Integer pageSize){
4055
this.pageSize = pageSize;
4156
return this;
@@ -110,6 +125,18 @@ public Page<Conversation> getPage(final String targetUrl, final TwilioRestClient
110125
return pageForRequest(client, request);
111126
}
112127
private void addQueryParams(final Request request) {
128+
if (startDate != null) {
129+
130+
request.addQueryParam("StartDate", startDate);
131+
}
132+
if (endDate != null) {
133+
134+
request.addQueryParam("EndDate", endDate);
135+
}
136+
if (state != null) {
137+
138+
request.addQueryParam("State", state.toString());
139+
}
113140
if (pageSize != null) {
114141

115142
request.addQueryParam("PageSize", pageSize.toString());

src/main/java/com/twilio/rest/flexapi/v1/Assessments.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
public class Assessments extends Resource {
4444
private static final long serialVersionUID = 249351913918322L;
4545

46-
public static AssessmentsCreator creator(final String categorySid, final String categoryName, final String segmentId, final String userName, final String userEmail, final String agentId, final BigDecimal offset, final String metricId, final String metricName, final String answerText, final String answerId, final String questionnaireSid){
47-
return new AssessmentsCreator(categorySid, categoryName, segmentId, userName, userEmail, agentId, offset, metricId, metricName, answerText, answerId, questionnaireSid);
46+
public static AssessmentsCreator creator(final String categorySid, final String categoryName, final String segmentId, final String agentId, final BigDecimal offset, final String metricId, final String metricName, final String answerText, final String answerId, final String questionnaireSid){
47+
return new AssessmentsCreator(categorySid, categoryName, segmentId, agentId, offset, metricId, metricName, answerText, answerId, questionnaireSid);
4848
}
4949

5050
public static AssessmentsReader reader(){

src/main/java/com/twilio/rest/flexapi/v1/AssessmentsCreator.java

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,19 @@ public class AssessmentsCreator extends Creator<Assessments>{
3333
private String categorySid;
3434
private String categoryName;
3535
private String segmentId;
36-
private String userName;
37-
private String userEmail;
3836
private String agentId;
3937
private BigDecimal offset;
4038
private String metricId;
4139
private String metricName;
4240
private String answerText;
4341
private String answerId;
4442
private String questionnaireSid;
45-
private String token;
43+
private String authorization;
4644

47-
public AssessmentsCreator(final String categorySid, final String categoryName, final String segmentId, final String userName, final String userEmail, final String agentId, final BigDecimal offset, final String metricId, final String metricName, final String answerText, final String answerId, final String questionnaireSid) {
45+
public AssessmentsCreator(final String categorySid, final String categoryName, final String segmentId, final String agentId, final BigDecimal offset, final String metricId, final String metricName, final String answerText, final String answerId, final String questionnaireSid) {
4846
this.categorySid = categorySid;
4947
this.categoryName = categoryName;
5048
this.segmentId = segmentId;
51-
this.userName = userName;
52-
this.userEmail = userEmail;
5349
this.agentId = agentId;
5450
this.offset = offset;
5551
this.metricId = metricId;
@@ -71,14 +67,6 @@ public AssessmentsCreator setSegmentId(final String segmentId){
7167
this.segmentId = segmentId;
7268
return this;
7369
}
74-
public AssessmentsCreator setUserName(final String userName){
75-
this.userName = userName;
76-
return this;
77-
}
78-
public AssessmentsCreator setUserEmail(final String userEmail){
79-
this.userEmail = userEmail;
80-
return this;
81-
}
8270
public AssessmentsCreator setAgentId(final String agentId){
8371
this.agentId = agentId;
8472
return this;
@@ -107,8 +95,8 @@ public AssessmentsCreator setQuestionnaireSid(final String questionnaireSid){
10795
this.questionnaireSid = questionnaireSid;
10896
return this;
10997
}
110-
public AssessmentsCreator setToken(final String token){
111-
this.token = token;
98+
public AssessmentsCreator setAuthorization(final String authorization){
99+
this.authorization = authorization;
112100
return this;
113101
}
114102

@@ -119,8 +107,6 @@ public Assessments create(final TwilioRestClient client){
119107
path = path.replace("{"+"CategorySid"+"}", this.categorySid.toString());
120108
path = path.replace("{"+"CategoryName"+"}", this.categoryName.toString());
121109
path = path.replace("{"+"SegmentId"+"}", this.segmentId.toString());
122-
path = path.replace("{"+"UserName"+"}", this.userName.toString());
123-
path = path.replace("{"+"UserEmail"+"}", this.userEmail.toString());
124110
path = path.replace("{"+"AgentId"+"}", this.agentId.toString());
125111
path = path.replace("{"+"Offset"+"}", this.offset.toString());
126112
path = path.replace("{"+"MetricId"+"}", this.metricId.toString());
@@ -161,14 +147,6 @@ private void addPostParams(final Request request) {
161147
if (segmentId != null) {
162148
request.addPostParam("SegmentId", segmentId);
163149

164-
}
165-
if (userName != null) {
166-
request.addPostParam("UserName", userName);
167-
168-
}
169-
if (userEmail != null) {
170-
request.addPostParam("UserEmail", userEmail);
171-
172150
}
173151
if (agentId != null) {
174152
request.addPostParam("AgentId", agentId);
@@ -200,8 +178,8 @@ private void addPostParams(final Request request) {
200178
}
201179
}
202180
private void addHeaderParams(final Request request) {
203-
if (token != null) {
204-
request.addHeaderParam("Token", token);
181+
if (authorization != null) {
182+
request.addHeaderParam("Authorization", authorization);
205183

206184
}
207185
}

src/main/java/com/twilio/rest/flexapi/v1/AssessmentsReader.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929

3030

3131
public class AssessmentsReader extends Reader<Assessments> {
32-
private String token;
32+
private String authorization;
3333
private String segmentId;
3434
private Integer pageSize;
3535

3636
public AssessmentsReader(){
3737
}
3838

39-
public AssessmentsReader setToken(final String token){
40-
this.token = token;
39+
public AssessmentsReader setAuthorization(final String authorization){
40+
this.authorization = authorization;
4141
return this;
4242
}
4343
public AssessmentsReader setSegmentId(final String segmentId){
@@ -118,8 +118,8 @@ public Page<Assessments> getPage(final String targetUrl, final TwilioRestClient
118118
return pageForRequest(client, request);
119119
}
120120
private void addHeaderParams(final Request request) {
121-
if (token != null) {
122-
request.addHeaderParam("Token", token);
121+
if (authorization != null) {
122+
request.addHeaderParam("Authorization", authorization);
123123

124124
}
125125
}

src/main/java/com/twilio/rest/flexapi/v1/AssessmentsUpdater.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class AssessmentsUpdater extends Updater<Assessments>{
3333
private BigDecimal offset;
3434
private String answerText;
3535
private String answerId;
36-
private String token;
36+
private String authorization;
3737

3838
public AssessmentsUpdater(final String pathAssessmentSid, final BigDecimal offset, final String answerText, final String answerId){
3939
this.pathAssessmentSid = pathAssessmentSid;
@@ -54,8 +54,8 @@ public AssessmentsUpdater setAnswerId(final String answerId){
5454
this.answerId = answerId;
5555
return this;
5656
}
57-
public AssessmentsUpdater setToken(final String token){
58-
this.token = token;
57+
public AssessmentsUpdater setAuthorization(final String authorization){
58+
this.authorization = authorization;
5959
return this;
6060
}
6161

@@ -103,8 +103,8 @@ private void addPostParams(final Request request) {
103103
}
104104
}
105105
private void addHeaderParams(final Request request) {
106-
if (token != null) {
107-
request.addHeaderParam("Token", token);
106+
if (authorization != null) {
107+
request.addHeaderParam("Authorization", authorization);
108108

109109
}
110110
}

src/main/java/com/twilio/rest/flexapi/v1/InsightsAssessmentsComment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
public class InsightsAssessmentsComment extends Resource {
4444
private static final long serialVersionUID = 175598645429423L;
4545

46-
public static InsightsAssessmentsCommentCreator creator(final String categoryId, final String categoryName, final String comment, final String segmentId, final String userName, final String userEmail, final String agentId, final BigDecimal offset){
47-
return new InsightsAssessmentsCommentCreator(categoryId, categoryName, comment, segmentId, userName, userEmail, agentId, offset);
46+
public static InsightsAssessmentsCommentCreator creator(final String categoryId, final String categoryName, final String comment, final String segmentId, final String agentId, final BigDecimal offset){
47+
return new InsightsAssessmentsCommentCreator(categoryId, categoryName, comment, segmentId, agentId, offset);
4848
}
4949

5050
public static InsightsAssessmentsCommentReader reader(){

0 commit comments

Comments
 (0)