Skip to content

Commit

Permalink
[Librarian] Regenerated @ 84df4a97cab4aa96362a9d21aaf3909bbd2dbf5a
Browse files Browse the repository at this point in the history
  • Loading branch information
twilio-dx committed Mar 14, 2024
1 parent 505efe7 commit 666dd5f
Show file tree
Hide file tree
Showing 13 changed files with 823 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
twilio-java changelog
=====================

[2024-03-14] Version 10.1.2
---------------------------
**Oauth**
- Add new APIs for vendor authorize and token endpoints


[2024-03-12] Version 10.1.1
---------------------------
**Api**
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/twilio/Domains.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public enum Domains {
MONITOR("monitor"),
NOTIFY("notify"),
NUMBERS("numbers"),
OAUTH("oauth"),
PREVIEW("preview"),
PRICING("pricing"),
PROXY("proxy"),
Expand Down
54 changes: 50 additions & 4 deletions src/main/java/com/twilio/rest/api/v2010/account/CallReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.twilio.http.TwilioRestClient;
import com.twilio.rest.Domains;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class CallReader extends Reader<Call> {

Expand All @@ -36,7 +37,11 @@ public class CallReader extends Reader<Call> {
private String parentCallSid;
private Call.Status status;
private ZonedDateTime startTime;
private ZonedDateTime startTimeBefore;
private ZonedDateTime startTimeAfter;
private ZonedDateTime endTime;
private ZonedDateTime endTimeBefore;
private ZonedDateTime endTimeAfter;
private Integer pageSize;

public CallReader() {}
Expand Down Expand Up @@ -78,11 +83,31 @@ public CallReader setStartTime(final ZonedDateTime startTime) {
return this;
}

public CallReader setStartTimeBefore(final ZonedDateTime startTimeBefore) {
this.startTimeBefore = startTimeBefore;
return this;
}

public CallReader setStartTimeAfter(final ZonedDateTime startTimeAfter) {
this.startTimeAfter = startTimeAfter;
return this;
}

public CallReader setEndTime(final ZonedDateTime endTime) {
this.endTime = endTime;
return this;
}

public CallReader setEndTimeBefore(final ZonedDateTime endTimeBefore) {
this.endTimeBefore = endTimeBefore;
return this;
}

public CallReader setEndTimeAfter(final ZonedDateTime endTimeAfter) {
this.endTimeAfter = endTimeAfter;
return this;
}

public CallReader setPageSize(final Integer pageSize) {
this.pageSize = pageSize;
return this;
Expand Down Expand Up @@ -197,14 +222,35 @@ private void addQueryParams(final Request request) {
if (startTime != null) {
request.addQueryParam(
"StartTime",
startTime.toInstant().toString()
startTime.format(
DateTimeFormatter.ofPattern(
Request.QUERY_STRING_DATE_TIME_FORMAT
)
)
);
} else if (startTimeAfter != null || startTimeBefore != null) {
request.addQueryDateTimeRange(
"StartTime",
startTimeAfter,
startTimeBefore
);
}

if (endTime != null) {
request.addQueryParam("EndTime", endTime.toInstant().toString());
request.addQueryParam(
"EndTime",
endTime.format(
DateTimeFormatter.ofPattern(
Request.QUERY_STRING_DATE_TIME_FORMAT
)
)
);
} else if (endTimeAfter != null || endTimeBefore != null) {
request.addQueryDateTimeRange(
"EndTime",
endTimeAfter,
endTimeBefore
);
}

if (pageSize != null) {
request.addQueryParam("PageSize", pageSize.toString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.twilio.base.Page;
import com.twilio.base.Reader;
import com.twilio.base.ResourceSet;
import com.twilio.converter.DateConverter;
import com.twilio.exception.ApiConnectionException;
import com.twilio.exception.ApiException;
import com.twilio.exception.RestException;
Expand All @@ -27,12 +26,17 @@
import com.twilio.http.TwilioRestClient;
import com.twilio.rest.Domains;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;

public class ConferenceReader extends Reader<Conference> {

private String pathAccountSid;
private LocalDate dateCreated;
private LocalDate dateCreatedBefore;
private LocalDate dateCreatedAfter;
private LocalDate dateUpdated;
private LocalDate dateUpdatedBefore;
private LocalDate dateUpdatedAfter;
private String friendlyName;
private Conference.Status status;
private Integer pageSize;
Expand All @@ -48,11 +52,39 @@ public ConferenceReader setDateCreated(final LocalDate dateCreated) {
return this;
}

public ConferenceReader setDateCreatedBefore(
final LocalDate dateCreatedBefore
) {
this.dateCreatedBefore = dateCreatedBefore;
return this;
}

public ConferenceReader setDateCreatedAfter(
final LocalDate dateCreatedAfter
) {
this.dateCreatedAfter = dateCreatedAfter;
return this;
}

public ConferenceReader setDateUpdated(final LocalDate dateUpdated) {
this.dateUpdated = dateUpdated;
return this;
}

public ConferenceReader setDateUpdatedBefore(
final LocalDate dateUpdatedBefore
) {
this.dateUpdatedBefore = dateUpdatedBefore;
return this;
}

public ConferenceReader setDateUpdatedAfter(
final LocalDate dateUpdatedAfter
) {
this.dateUpdatedAfter = dateUpdatedAfter;
return this;
}

public ConferenceReader setFriendlyName(final String friendlyName) {
this.friendlyName = friendlyName;
return this;
Expand Down Expand Up @@ -165,17 +197,35 @@ private void addQueryParams(final Request request) {
if (dateCreated != null) {
request.addQueryParam(
"DateCreated",
DateConverter.dateStringFromLocalDate(dateCreated)
dateCreated.format(
DateTimeFormatter.ofPattern(
Request.QUERY_STRING_DATE_FORMAT
)
)
);
} else if (dateCreatedAfter != null || dateCreatedBefore != null) {
request.addQueryDateRange(
"DateCreated",
dateCreatedAfter,
dateCreatedBefore
);
}

if (dateUpdated != null) {
request.addQueryParam(
"DateUpdated",
DateConverter.dateStringFromLocalDate(dateUpdated)
dateUpdated.format(
DateTimeFormatter.ofPattern(
Request.QUERY_STRING_DATE_FORMAT
)
)
);
} else if (dateUpdatedAfter != null || dateUpdatedBefore != null) {
request.addQueryDateRange(
"DateUpdated",
dateUpdatedAfter,
dateUpdatedBefore
);
}

if (friendlyName != null) {
request.addQueryParam("FriendlyName", friendlyName);
}
Expand Down
29 changes: 27 additions & 2 deletions src/main/java/com/twilio/rest/api/v2010/account/MessageReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,16 @@
import com.twilio.http.TwilioRestClient;
import com.twilio.rest.Domains;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;

public class MessageReader extends Reader<Message> {

private String pathAccountSid;
private com.twilio.type.PhoneNumber to;
private com.twilio.type.PhoneNumber from;
private ZonedDateTime dateSent;
private ZonedDateTime dateSentBefore;
private ZonedDateTime dateSentAfter;
private Integer pageSize;

public MessageReader() {}
Expand Down Expand Up @@ -65,6 +68,16 @@ public MessageReader setDateSent(final ZonedDateTime dateSent) {
return this;
}

public MessageReader setDateSentBefore(final ZonedDateTime dateSentBefore) {
this.dateSentBefore = dateSentBefore;
return this;
}

public MessageReader setDateSentAfter(final ZonedDateTime dateSentAfter) {
this.dateSentAfter = dateSentAfter;
return this;
}

public MessageReader setPageSize(final Integer pageSize) {
this.pageSize = pageSize;
return this;
Expand Down Expand Up @@ -171,9 +184,21 @@ private void addQueryParams(final Request request) {
request.addQueryParam("From", from.toString());
}
if (dateSent != null) {
request.addQueryParam("DateSent", dateSent.toInstant().toString());
request.addQueryParam(
"DateSent",
dateSent.format(
DateTimeFormatter.ofPattern(
Request.QUERY_STRING_DATE_TIME_FORMAT
)
)
);
} else if (dateSentAfter != null || dateSentBefore != null) {
request.addQueryDateTimeRange(
"DateSent",
dateSentAfter,
dateSentBefore
);
}

if (pageSize != null) {
request.addQueryParam("PageSize", pageSize.toString());
}
Expand Down
100 changes: 100 additions & 0 deletions src/main/java/com/twilio/rest/content/v1/Content.java
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,100 @@ public static TwilioCard fromJson(
}
}

@ToString
public static class CatalogItem {

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("id")
@Getter
@Setter
private String id;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("section_title")
@Getter
@Setter
private String sectionTitle;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("name")
@Getter
@Setter
private String name;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("media_url")
@Getter
@Setter
private String mediaUrl;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("price")
@Getter
@Setter
private BigDecimal price;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("description")
@Getter
@Setter
private String description;

public static CatalogItem fromJson(
String jsonString,
ObjectMapper mapper
) throws IOException {
return mapper.readValue(jsonString, CatalogItem.class);
}
}

@ToString
public static class TwilioCatalog {

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("title")
@Getter
@Setter
private String title;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("body")
@Getter
@Setter
private String body;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("subtitle")
@Getter
@Setter
private String subtitle;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("id")
@Getter
@Setter
private String id;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("items")
@Getter
@Setter
private List<CatalogItem> items;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("dynamic_items")
@Getter
@Setter
private String dynamicItems;

public static TwilioCatalog fromJson(
String jsonString,
ObjectMapper mapper
) throws IOException {
return mapper.readValue(jsonString, TwilioCatalog.class);
}
}

@ToString
public static class WhatsappCard {

Expand Down Expand Up @@ -502,6 +596,12 @@ public static class Types {
@Setter
private TwilioCard twilioCard;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("twilio/catalog")
@Getter
@Setter
private TwilioCatalog twilioCatalog;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonProperty("whatsapp/card")
@Getter
Expand Down
Loading

0 comments on commit 666dd5f

Please sign in to comment.