diff --git a/src/main/java/com/twilio/rest/assistants/v1/Assistant.java b/src/main/java/com/twilio/rest/assistants/v1/Assistant.java index f8953a77b1..f451dc0622 100644 --- a/src/main/java/com/twilio/rest/assistants/v1/Assistant.java +++ b/src/main/java/com/twilio/rest/assistants/v1/Assistant.java @@ -68,6 +68,7 @@ public static AssistantUpdater updater(final String pathId) { } @JsonDeserialize(builder = AssistantsV1ServiceTool.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceTool { @@ -176,6 +177,7 @@ public static AssistantsV1ServiceTool fromJson( return mapper.readValue(jsonString, AssistantsV1ServiceTool.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -307,6 +309,7 @@ public int hashCode() { } @JsonDeserialize(builder = AssistantsV1ServiceCustomerAi.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceCustomerAi { @@ -347,6 +350,7 @@ public static AssistantsV1ServiceCustomerAi fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -411,6 +415,7 @@ public int hashCode() { @JsonDeserialize( builder = AssistantsV1ServiceUpdateAssistantRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceUpdateAssistantRequest { @@ -462,6 +467,7 @@ public static AssistantsV1ServiceUpdateAssistantRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -560,6 +566,7 @@ public int hashCode() { @JsonDeserialize( builder = AssistantsV1ServiceCreateAssistantRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceCreateAssistantRequest { @@ -611,6 +618,7 @@ public static AssistantsV1ServiceCreateAssistantRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -707,6 +715,7 @@ public int hashCode() { @JsonDeserialize( builder = AssistantsV1ServiceSegmentCredential.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceSegmentCredential { @@ -746,6 +755,7 @@ public static AssistantsV1ServiceSegmentCredential fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -810,6 +820,7 @@ public int hashCode() { } @JsonDeserialize(builder = AssistantsV1ServiceKnowledge.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceKnowledge { @@ -907,6 +918,7 @@ public static AssistantsV1ServiceKnowledge fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/assistants/v1/Knowledge.java b/src/main/java/com/twilio/rest/assistants/v1/Knowledge.java index 87aa839461..fb3b0c3215 100644 --- a/src/main/java/com/twilio/rest/assistants/v1/Knowledge.java +++ b/src/main/java/com/twilio/rest/assistants/v1/Knowledge.java @@ -69,6 +69,7 @@ public static KnowledgeUpdater updater(final String pathId) { @JsonDeserialize( builder = AssistantsV1ServiceUpdateKnowledgeRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceUpdateKnowledgeRequest { @@ -126,6 +127,7 @@ public static AssistantsV1ServiceUpdateKnowledgeRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -239,6 +241,7 @@ public int hashCode() { @JsonDeserialize( builder = AssistantsV1ServiceCreatePolicyRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceCreatePolicyRequest { @@ -290,6 +293,7 @@ public static AssistantsV1ServiceCreatePolicyRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -378,6 +382,7 @@ public int hashCode() { @JsonDeserialize( builder = AssistantsV1ServiceCreateKnowledgeRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceCreateKnowledgeRequest { @@ -441,6 +446,7 @@ public static AssistantsV1ServiceCreateKnowledgeRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/assistants/v1/Tool.java b/src/main/java/com/twilio/rest/assistants/v1/Tool.java index 5e64133147..bcfb6ec3cf 100644 --- a/src/main/java/com/twilio/rest/assistants/v1/Tool.java +++ b/src/main/java/com/twilio/rest/assistants/v1/Tool.java @@ -70,6 +70,7 @@ public static ToolUpdater updater(final String pathId) { @JsonDeserialize( builder = AssistantsV1ServiceCreatePolicyRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceCreatePolicyRequest { @@ -121,6 +122,7 @@ public static AssistantsV1ServiceCreatePolicyRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -209,6 +211,7 @@ public int hashCode() { @JsonDeserialize( builder = AssistantsV1ServiceUpdateToolRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceUpdateToolRequest { @@ -272,6 +275,7 @@ public static AssistantsV1ServiceUpdateToolRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -392,6 +396,7 @@ public int hashCode() { @JsonDeserialize( builder = AssistantsV1ServiceCreateToolRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceCreateToolRequest { @@ -459,6 +464,7 @@ public static AssistantsV1ServiceCreateToolRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -567,6 +573,7 @@ public int hashCode() { } @JsonDeserialize(builder = AssistantsV1ServicePolicy.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServicePolicy { @@ -649,6 +656,7 @@ public static AssistantsV1ServicePolicy fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/assistants/v1/assistant/Feedback.java b/src/main/java/com/twilio/rest/assistants/v1/assistant/Feedback.java index 7e35ca453e..beefb17d66 100644 --- a/src/main/java/com/twilio/rest/assistants/v1/assistant/Feedback.java +++ b/src/main/java/com/twilio/rest/assistants/v1/assistant/Feedback.java @@ -61,6 +61,7 @@ public static FeedbackReader reader(final String pathId) { @JsonDeserialize( builder = AssistantsV1ServiceCreateFeedbackRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceCreateFeedbackRequest { @@ -106,6 +107,7 @@ public static AssistantsV1ServiceCreateFeedbackRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/assistants/v1/assistant/Message.java b/src/main/java/com/twilio/rest/assistants/v1/assistant/Message.java index ce9d9fa670..bb5fa0c038 100644 --- a/src/main/java/com/twilio/rest/assistants/v1/assistant/Message.java +++ b/src/main/java/com/twilio/rest/assistants/v1/assistant/Message.java @@ -55,6 +55,7 @@ public static MessageCreator creator( @JsonDeserialize( builder = AssistantsV1ServiceAssistantSendMessageRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AssistantsV1ServiceAssistantSendMessageRequest { @@ -111,6 +112,7 @@ public static AssistantsV1ServiceAssistantSendMessageRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/content/v1/Content.java b/src/main/java/com/twilio/rest/content/v1/Content.java index cc982b0899..7bb03e26e9 100644 --- a/src/main/java/com/twilio/rest/content/v1/Content.java +++ b/src/main/java/com/twilio/rest/content/v1/Content.java @@ -218,6 +218,7 @@ public static CallToActionActionType forValue(final String value) { } @JsonDeserialize(builder = FlowsPage.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class FlowsPage { @@ -270,6 +271,7 @@ public static FlowsPage fromJson( return mapper.readValue(jsonString, FlowsPage.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -345,6 +347,7 @@ public int hashCode() { } @JsonDeserialize(builder = Types.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Types { @@ -445,6 +448,7 @@ public static Types fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Types.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -651,6 +655,7 @@ public int hashCode() { } @JsonDeserialize(builder = CallToActionAction.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CallToActionAction { @@ -708,6 +713,7 @@ public static CallToActionAction fromJson( return mapper.readValue(jsonString, CallToActionAction.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -799,6 +805,7 @@ public int hashCode() { } @JsonDeserialize(builder = CarouselAction.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CarouselAction { @@ -850,6 +857,7 @@ public static CarouselAction fromJson( return mapper.readValue(jsonString, CarouselAction.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -930,6 +938,7 @@ public int hashCode() { } @JsonDeserialize(builder = WhatsappCard.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class WhatsappCard { @@ -978,6 +987,7 @@ public static WhatsappCard fromJson( return mapper.readValue(jsonString, WhatsappCard.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1061,6 +1071,7 @@ public int hashCode() { } @JsonDeserialize(builder = WhatsappAuthentication.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class WhatsappAuthentication { @@ -1099,6 +1110,7 @@ public static WhatsappAuthentication fromJson( return mapper.readValue(jsonString, WhatsappAuthentication.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1178,6 +1190,7 @@ public int hashCode() { } @JsonDeserialize(builder = QuickReplyAction.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class QuickReplyAction { @@ -1214,6 +1227,7 @@ public static QuickReplyAction fromJson( return mapper.readValue(jsonString, QuickReplyAction.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1275,6 +1289,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioCard.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioCard { @@ -1317,6 +1332,7 @@ public static TwilioCard fromJson( return mapper.readValue(jsonString, TwilioCard.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1391,6 +1407,7 @@ public int hashCode() { } @JsonDeserialize(builder = AuthenticationAction.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AuthenticationAction { @@ -1424,6 +1441,7 @@ public static AuthenticationAction fromJson( return mapper.readValue(jsonString, AuthenticationAction.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1473,6 +1491,7 @@ public int hashCode() { } @JsonDeserialize(builder = ContentCreateRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ContentCreateRequest { @@ -1518,6 +1537,7 @@ public static ContentCreateRequest fromJson( return mapper.readValue(jsonString, ContentCreateRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1587,6 +1607,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioCallToAction.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioCallToAction { @@ -1620,6 +1641,7 @@ public static TwilioCallToAction fromJson( return mapper.readValue(jsonString, TwilioCallToAction.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1667,6 +1689,7 @@ public int hashCode() { } @JsonDeserialize(builder = ContentUpdateRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ContentUpdateRequest { @@ -1709,6 +1732,7 @@ public static ContentUpdateRequest fromJson( return mapper.readValue(jsonString, ContentUpdateRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1781,6 +1805,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioQuickReply.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioQuickReply { @@ -1814,6 +1839,7 @@ public static TwilioQuickReply fromJson( return mapper.readValue(jsonString, TwilioQuickReply.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1861,6 +1887,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioMedia.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioMedia { @@ -1891,6 +1918,7 @@ public static TwilioMedia fromJson( return mapper.readValue(jsonString, TwilioMedia.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1941,6 +1969,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioFlows.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioFlows { @@ -2000,6 +2029,7 @@ public static TwilioFlows fromJson( return mapper.readValue(jsonString, TwilioFlows.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2088,6 +2118,7 @@ public int hashCode() { } @JsonDeserialize(builder = FlowsPageComponent.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class FlowsPageComponent { @@ -2118,6 +2149,7 @@ public static FlowsPageComponent fromJson( return mapper.readValue(jsonString, FlowsPageComponent.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2168,6 +2200,7 @@ public int hashCode() { } @JsonDeserialize(builder = WhatsappFlows.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class WhatsappFlows { @@ -2238,6 +2271,7 @@ public static WhatsappFlows fromJson( return mapper.readValue(jsonString, WhatsappFlows.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2360,6 +2394,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioListPicker.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioListPicker { @@ -2400,6 +2435,7 @@ public static TwilioListPicker fromJson( return mapper.readValue(jsonString, TwilioListPicker.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2453,6 +2489,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioCatalog.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioCatalog { @@ -2507,6 +2544,7 @@ public static TwilioCatalog fromJson( return mapper.readValue(jsonString, TwilioCatalog.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2601,6 +2639,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioText.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioText { @@ -2625,6 +2664,7 @@ public static TwilioText fromJson( return mapper.readValue(jsonString, TwilioText.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2662,6 +2702,7 @@ public int hashCode() { } @JsonDeserialize(builder = CatalogItem.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CatalogItem { @@ -2716,6 +2757,7 @@ public static CatalogItem fromJson( return mapper.readValue(jsonString, CatalogItem.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2819,6 +2861,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioSchedule.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioSchedule { @@ -2859,6 +2902,7 @@ public static TwilioSchedule fromJson( return mapper.readValue(jsonString, TwilioSchedule.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2912,6 +2956,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioCarousel.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioCarousel { @@ -2945,6 +2990,7 @@ public static TwilioCarousel fromJson( return mapper.readValue(jsonString, TwilioCarousel.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2992,6 +3038,7 @@ public int hashCode() { } @JsonDeserialize(builder = CardAction.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CardAction { @@ -3055,6 +3102,7 @@ public static CardAction fromJson( return mapper.readValue(jsonString, CardAction.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -3157,6 +3205,7 @@ public int hashCode() { } @JsonDeserialize(builder = CarouselCard.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CarouselCard { @@ -3203,6 +3252,7 @@ public static CarouselCard fromJson( return mapper.readValue(jsonString, CarouselCard.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -3267,6 +3317,7 @@ public int hashCode() { } @JsonDeserialize(builder = TwilioLocation.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TwilioLocation { @@ -3318,6 +3369,7 @@ public static TwilioLocation fromJson( return mapper.readValue(jsonString, TwilioLocation.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -3398,6 +3450,7 @@ public int hashCode() { } @JsonDeserialize(builder = ListItem.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListItem { @@ -3432,6 +3485,7 @@ public static ListItem fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, ListItem.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/content/v1/content/ApprovalCreate.java b/src/main/java/com/twilio/rest/content/v1/content/ApprovalCreate.java index fb7fb8116f..39154274ea 100644 --- a/src/main/java/com/twilio/rest/content/v1/content/ApprovalCreate.java +++ b/src/main/java/com/twilio/rest/content/v1/content/ApprovalCreate.java @@ -53,6 +53,7 @@ public static ApprovalCreateCreator creator( } @JsonDeserialize(builder = ContentApprovalRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ContentApprovalRequest { @@ -86,6 +87,7 @@ public static ContentApprovalRequest fromJson( return mapper.readValue(jsonString, ContentApprovalRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/conversations/v2/Action.java b/src/main/java/com/twilio/rest/conversations/v2/Action.java index 131325748c..8b7ca54d16 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/Action.java +++ b/src/main/java/com/twilio/rest/conversations/v2/Action.java @@ -466,6 +466,7 @@ public static Channel forValue(final String value) { } @JsonDeserialize(builder = CreateConversationActionRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConversationActionRequest { @@ -502,6 +503,7 @@ public static CreateConversationActionRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -552,6 +554,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2SendMessagePayload.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2SendMessagePayload { @@ -601,6 +604,7 @@ public static ConversationsV2SendMessagePayload fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -674,6 +678,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2SendMessageContent.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2SendMessageContent { @@ -719,6 +724,7 @@ public static ConversationsV2SendMessageContent fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -796,6 +802,7 @@ public int hashCode() { @JsonDeserialize( builder = ConversationsV2SendMessageParticipant.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2SendMessageParticipant { @@ -835,6 +842,7 @@ public static ConversationsV2SendMessageParticipant fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/conversations/v2/ActionFetcher.java b/src/main/java/com/twilio/rest/conversations/v2/ActionFetcher.java index c38b60867a..76f5156e1a 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ActionFetcher.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ActionFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -66,16 +65,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/Communication.java b/src/main/java/com/twilio/rest/conversations/v2/Communication.java index 21ed22918b..b4cd0d1b07 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/Communication.java +++ b/src/main/java/com/twilio/rest/conversations/v2/Communication.java @@ -585,7 +585,8 @@ public static CommunicationReader reader(final String pathConversationSid) { } public enum Type { - TEXT("TEXT"); + TEXT("TEXT"), + TRANSCRIPTION("TRANSCRIPTION"); private final String value; @@ -653,6 +654,7 @@ public static DeliveryStatus forValue(final String value) { } @JsonDeserialize(builder = ConversationsV2ParticipantAddress.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2ParticipantAddress { @@ -695,6 +697,7 @@ public static ConversationsV2ParticipantAddress fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -756,6 +759,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateCommunicationInConversationRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateCommunicationInConversationRequest { @@ -809,6 +813,7 @@ public static CreateCommunicationInConversationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -884,6 +889,7 @@ public int hashCode() { @JsonDeserialize( builder = ConversationsV2ContentTranscriptionTranscription.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2ContentTranscriptionTranscription { @@ -933,6 +939,7 @@ public static ConversationsV2ContentTranscriptionTranscription fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1018,6 +1025,7 @@ public int hashCode() { @JsonDeserialize( builder = ConversationsV2ContentTranscriptionTranscriptionWords.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2ContentTranscriptionTranscriptionWords { @@ -1063,6 +1071,7 @@ public static ConversationsV2ContentTranscriptionTranscriptionWords fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1145,6 +1154,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateCommunicationInConversationRequestAuthor.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateCommunicationInConversationRequestAuthor { @@ -1189,6 +1199,7 @@ public static CreateCommunicationInConversationRequestAuthor fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1250,6 +1261,7 @@ public int hashCode() { @JsonDeserialize( builder = ListCommunicationByConversation200ResponseCommunicationsRecipients.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListCommunicationByConversation200ResponseCommunicationsRecipients { @@ -1300,6 +1312,7 @@ public static ListCommunicationByConversation200ResponseCommunicationsRecipients ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1381,6 +1394,7 @@ public int hashCode() { @JsonDeserialize( builder = ListCommunicationByConversation200ResponseMeta.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListCommunicationByConversation200ResponseMeta { @@ -1428,6 +1442,7 @@ public static ListCommunicationByConversation200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1503,6 +1518,7 @@ public int hashCode() { } @JsonDeserialize(builder = ContentTranscriptionTranscription.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ContentTranscriptionTranscription { @@ -1542,6 +1558,7 @@ public static ContentTranscriptionTranscription fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1608,10 +1625,16 @@ public int hashCode() { @JsonDeserialize( builder = CreateCommunicationInConversationRequestContent.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateCommunicationInConversationRequestContent { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("type") + @Getter + private final Communication.Type type; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("text") @Getter @@ -1622,17 +1645,12 @@ public static class CreateCommunicationInConversationRequestContent { @Getter private final ContentTranscriptionTranscription transcription; - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("type") - @Getter - private final Communication.Type type; - private CreateCommunicationInConversationRequestContent( Builder builder ) { + this.type = builder.type; this.text = builder.text; this.transcription = builder.transcription; - this.type = builder.type; } public static Builder builder() { @@ -1649,17 +1667,25 @@ public static CreateCommunicationInConversationRequestContent fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { + @JsonProperty("type") + private Communication.Type type; + @JsonProperty("text") private String text; @JsonProperty("transcription") private ContentTranscriptionTranscription transcription; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("type") - private Communication.Type type; + public Builder type(Communication.Type type) { + this.type = type; + return this; + } @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("text") @@ -1677,13 +1703,6 @@ public Builder transcription( return this; } - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("type") - public Builder type(Communication.Type type) { - this.type = type; - return this; - } - public CreateCommunicationInConversationRequestContent build() { return new CreateCommunicationInConversationRequestContent( this @@ -1704,25 +1723,31 @@ public boolean equals(final Object o) { CreateCommunicationInConversationRequestContent other = (CreateCommunicationInConversationRequestContent) o; return ( + Objects.equals(type, other.type) && Objects.equals(text, other.text) && - Objects.equals(transcription, other.transcription) && - Objects.equals(type, other.type) + Objects.equals(transcription, other.transcription) ); } @Override public int hashCode() { - return Objects.hash(text, transcription, type); + return Objects.hash(type, text, transcription); } } @JsonDeserialize( builder = ListCommunicationByConversation200ResponseCommunicationsContent.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListCommunicationByConversation200ResponseCommunicationsContent { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("type") + @Getter + private final Communication.Type type; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("text") @Getter @@ -1733,17 +1758,12 @@ public static class ListCommunicationByConversation200ResponseCommunicationsCont @Getter private final ConversationsV2ContentTranscriptionTranscription transcription; - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("type") - @Getter - private final Communication.Type type; - private ListCommunicationByConversation200ResponseCommunicationsContent( Builder builder ) { + this.type = builder.type; this.text = builder.text; this.transcription = builder.transcription; - this.type = builder.type; } public static Builder builder() { @@ -1760,17 +1780,25 @@ public static ListCommunicationByConversation200ResponseCommunicationsContent fr ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { + @JsonProperty("type") + private Communication.Type type; + @JsonProperty("text") private String text; @JsonProperty("transcription") private ConversationsV2ContentTranscriptionTranscription transcription; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("type") - private Communication.Type type; + public Builder type(Communication.Type type) { + this.type = type; + return this; + } @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("text") @@ -1788,13 +1816,6 @@ public Builder transcription( return this; } - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("type") - public Builder type(Communication.Type type) { - this.type = type; - return this; - } - public ListCommunicationByConversation200ResponseCommunicationsContent build() { return new ListCommunicationByConversation200ResponseCommunicationsContent( this @@ -1815,21 +1836,22 @@ public boolean equals(final Object o) { ListCommunicationByConversation200ResponseCommunicationsContent other = (ListCommunicationByConversation200ResponseCommunicationsContent) o; return ( + Objects.equals(type, other.type) && Objects.equals(text, other.text) && - Objects.equals(transcription, other.transcription) && - Objects.equals(type, other.type) + Objects.equals(transcription, other.transcription) ); } @Override public int hashCode() { - return Objects.hash(text, transcription, type); + return Objects.hash(type, text, transcription); } } @JsonDeserialize( builder = ListCommunicationByConversation200ResponseCommunications.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListCommunicationByConversation200ResponseCommunications { @@ -1943,6 +1965,7 @@ public static ListCommunicationByConversation200ResponseCommunications fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/conversations/v2/CommunicationFetcher.java b/src/main/java/com/twilio/rest/conversations/v2/CommunicationFetcher.java index 3ddff78477..467666d67d 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/CommunicationFetcher.java +++ b/src/main/java/com/twilio/rest/conversations/v2/CommunicationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -67,16 +66,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/Configuration.java b/src/main/java/com/twilio/rest/conversations/v2/Configuration.java index 09ccdd23e5..4a331d518b 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/Configuration.java +++ b/src/main/java/com/twilio/rest/conversations/v2/Configuration.java @@ -664,6 +664,7 @@ public static Method forValue(final String value) { } @JsonDeserialize(builder = ListConfiguration200ResponseMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListConfiguration200ResponseMeta { @@ -712,6 +713,7 @@ public static ListConfiguration200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -784,6 +786,7 @@ public int hashCode() { @JsonDeserialize( builder = UpdateConfigurationRequestChannelSettingsValueCaptureRules.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateConfigurationRequestChannelSettingsValueCaptureRules { @@ -825,6 +828,7 @@ public static UpdateConfigurationRequestChannelSettingsValueCaptureRules fromJso ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -888,6 +892,7 @@ public int hashCode() { @JsonDeserialize( builder = UpdateConfigurationRequestStatusCallbacks.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateConfigurationRequestStatusCallbacks { @@ -921,6 +926,7 @@ public static UpdateConfigurationRequestStatusCallbacks fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -974,6 +980,7 @@ public int hashCode() { @JsonDeserialize( builder = UpdateConfigurationRequestChannelSettingsValue.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateConfigurationRequestChannelSettingsValue { @@ -1011,6 +1018,7 @@ public static UpdateConfigurationRequestChannelSettingsValue fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1074,6 +1082,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConfigurationRequestChannelSettingsValue.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConfigurationRequestChannelSettingsValue { @@ -1111,6 +1120,7 @@ public static CreateConfigurationRequestChannelSettingsValue fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1172,6 +1182,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2ChannelSetting.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2ChannelSetting { @@ -1205,6 +1216,7 @@ public static ConversationsV2ChannelSetting fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1262,6 +1274,7 @@ public int hashCode() { } @JsonDeserialize(builder = UpdateConfigurationRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateConfigurationRequest { @@ -1350,6 +1363,7 @@ public static UpdateConfigurationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1490,6 +1504,7 @@ public int hashCode() { @JsonDeserialize( builder = ConversationsV2StatusCallbackConfig.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2StatusCallbackConfig { @@ -1523,6 +1538,7 @@ public static ConversationsV2StatusCallbackConfig fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1574,6 +1590,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2StatusTimeouts.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2StatusTimeouts { @@ -1607,6 +1624,7 @@ public static ConversationsV2StatusTimeouts fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1660,6 +1678,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2CaptureRule.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2CaptureRule { @@ -1699,6 +1718,7 @@ public static ConversationsV2CaptureRule fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1757,6 +1777,7 @@ public int hashCode() { } @JsonDeserialize(builder = CreateConfigurationRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConfigurationRequest { @@ -1842,6 +1863,7 @@ public static CreateConfigurationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1984,6 +2006,7 @@ public int hashCode() { @JsonDeserialize( builder = ConversationsV2ConversationsV1Bridge.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2ConversationsV1Bridge { @@ -2011,6 +2034,7 @@ public static ConversationsV2ConversationsV1Bridge fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2051,6 +2075,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConfigurationRequestChannelSettingsValueStatusTimeouts.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConfigurationRequestChannelSettingsValueStatusTimeouts { @@ -2086,6 +2111,7 @@ public static CreateConfigurationRequestChannelSettingsValueStatusTimeouts fromJ ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2143,6 +2169,7 @@ public int hashCode() { @JsonDeserialize( builder = UpdateConfigurationRequestChannelSettingsValueStatusTimeouts.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateConfigurationRequestChannelSettingsValueStatusTimeouts { @@ -2178,6 +2205,7 @@ public static UpdateConfigurationRequestChannelSettingsValueStatusTimeouts fromJ ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2235,6 +2263,7 @@ public int hashCode() { @JsonDeserialize( builder = ListConfiguration200ResponseConfigurations.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListConfiguration200ResponseConfigurations { @@ -2354,6 +2383,7 @@ public static ListConfiguration200ResponseConfigurations fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2565,6 +2595,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConfigurationRequestStatusCallbacks.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConfigurationRequestStatusCallbacks { @@ -2598,6 +2629,7 @@ public static CreateConfigurationRequestStatusCallbacks fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2651,6 +2683,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConfigurationRequestChannelSettingsValueCaptureRules.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConfigurationRequestChannelSettingsValueCaptureRules { @@ -2692,6 +2725,7 @@ public static CreateConfigurationRequestChannelSettingsValueCaptureRules fromJso ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/conversations/v2/ConfigurationDeleter.java b/src/main/java/com/twilio/rest/conversations/v2/ConfigurationDeleter.java index dcfdd760cf..845f5f4f82 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ConfigurationDeleter.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ConfigurationDeleter.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -71,16 +70,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/ConfigurationFetcher.java b/src/main/java/com/twilio/rest/conversations/v2/ConfigurationFetcher.java index b5d15ab4a3..1b06be52c3 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ConfigurationFetcher.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ConfigurationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -56,16 +55,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/ConfigurationUpdater.java b/src/main/java/com/twilio/rest/conversations/v2/ConfigurationUpdater.java index a34801a1f2..22723004e5 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ConfigurationUpdater.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ConfigurationUpdater.java @@ -23,7 +23,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -77,16 +76,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/Conversation.java b/src/main/java/com/twilio/rest/conversations/v2/Conversation.java index 3cf5f52d01..e0e5569718 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/Conversation.java +++ b/src/main/java/com/twilio/rest/conversations/v2/Conversation.java @@ -817,6 +817,7 @@ public static Method forValue(final String value) { @JsonDeserialize( builder = ListConversationByAccount200ResponseConversationsConfiguration.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListConversationByAccount200ResponseConversationsConfiguration { @@ -895,6 +896,7 @@ public static ListConversationByAccount200ResponseConversationsConfiguration fro ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1064,6 +1066,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConversationWithConfigRequestParticipants.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConversationWithConfigRequestParticipants { @@ -1113,6 +1116,7 @@ public static CreateConversationWithConfigRequestParticipants fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1196,6 +1200,7 @@ public int hashCode() { } @JsonDeserialize(builder = PatchConversationByIdRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PatchConversationByIdRequest { @@ -1235,6 +1240,7 @@ public static PatchConversationByIdRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1303,6 +1309,7 @@ public int hashCode() { @JsonDeserialize( builder = ListConversationByAccount200ResponseMeta.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListConversationByAccount200ResponseMeta { @@ -1351,6 +1358,7 @@ public static ListConversationByAccount200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1423,6 +1431,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConversationWithConfigRequestConfiguration.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConversationWithConfigRequestConfiguration { @@ -1453,6 +1462,7 @@ public static CreateConversationWithConfigRequestConfiguration fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1503,6 +1513,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2Participant.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2Participant { @@ -1587,6 +1598,7 @@ public static ConversationsV2Participant fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1727,6 +1739,7 @@ public int hashCode() { } @JsonDeserialize(builder = UpdateConversationByIdRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateConversationByIdRequest { @@ -1760,6 +1773,7 @@ public static UpdateConversationByIdRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1815,6 +1829,7 @@ public int hashCode() { @JsonDeserialize( builder = ConversationsV2StatusCallbackConfig.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2StatusCallbackConfig { @@ -1848,6 +1863,7 @@ public static ConversationsV2StatusCallbackConfig fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1901,6 +1917,7 @@ public int hashCode() { @JsonDeserialize( builder = PatchConversationByIdRequestConfiguration.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PatchConversationByIdRequestConfiguration { @@ -1928,6 +1945,7 @@ public static PatchConversationByIdRequestConfiguration fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1972,6 +1990,7 @@ public int hashCode() { @JsonDeserialize( builder = ListConversationByAccount200ResponseConversations.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListConversationByAccount200ResponseConversations { @@ -2057,6 +2076,7 @@ public static ListConversationByAccount200ResponseConversations fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2211,6 +2231,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConversationWithConfigRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConversationWithConfigRequest { @@ -2258,6 +2279,7 @@ public static CreateConversationWithConfigRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2348,6 +2370,7 @@ public int hashCode() { @JsonDeserialize( builder = ConversationsV2ConversationsV1Bridge.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2ConversationsV1Bridge { @@ -2375,6 +2398,7 @@ public static ConversationsV2ConversationsV1Bridge fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2413,6 +2437,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2Address.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2Address { @@ -2452,6 +2477,7 @@ public static ConversationsV2Address fromJson( return mapper.readValue(jsonString, ConversationsV2Address.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2512,6 +2538,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateConversationWithConfigRequestParticipantsAddresses.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConversationWithConfigRequestParticipantsAddresses { @@ -2556,6 +2583,7 @@ public static CreateConversationWithConfigRequestParticipantsAddresses fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/conversations/v2/ConversationDeleter.java b/src/main/java/com/twilio/rest/conversations/v2/ConversationDeleter.java index 2d7d98f260..557908b5f0 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ConversationDeleter.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ConversationDeleter.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -71,16 +70,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/ConversationFetcher.java b/src/main/java/com/twilio/rest/conversations/v2/ConversationFetcher.java index 61af416603..f62c9f7115 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ConversationFetcher.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ConversationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -56,16 +55,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/ConversationPatcher.java b/src/main/java/com/twilio/rest/conversations/v2/ConversationPatcher.java index befcb1c109..fd650c2508 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ConversationPatcher.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ConversationPatcher.java @@ -20,7 +20,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -70,16 +69,6 @@ public Conversation.PatchConversationResponse patch( ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/ConversationUpdater.java b/src/main/java/com/twilio/rest/conversations/v2/ConversationUpdater.java index ec6a06ee85..9df85206ba 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ConversationUpdater.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ConversationUpdater.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -68,16 +67,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/Operation.java b/src/main/java/com/twilio/rest/conversations/v2/Operation.java index 2af376e285..56045ee85e 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/Operation.java +++ b/src/main/java/com/twilio/rest/conversations/v2/Operation.java @@ -385,6 +385,7 @@ public static Status forValue(final String value) { @JsonDeserialize( builder = FetchOperationStatus200ResponseError.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class FetchOperationStatus200ResponseError { @@ -436,6 +437,7 @@ public static FetchOperationStatus200ResponseError fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/conversations/v2/OperationFetcher.java b/src/main/java/com/twilio/rest/conversations/v2/OperationFetcher.java index 0e18a4aed7..810ae66b21 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/OperationFetcher.java +++ b/src/main/java/com/twilio/rest/conversations/v2/OperationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -56,16 +55,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/Participant.java b/src/main/java/com/twilio/rest/conversations/v2/Participant.java index b1b07db817..b2376312d0 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/Participant.java +++ b/src/main/java/com/twilio/rest/conversations/v2/Participant.java @@ -648,6 +648,7 @@ public static Channel forValue(final String value) { @JsonDeserialize( builder = ListParticipantByConversation200ResponseMeta.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListParticipantByConversation200ResponseMeta { @@ -693,6 +694,7 @@ public static ListParticipantByConversation200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -770,6 +772,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateParticipantInConversationRequestAddresses.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateParticipantInConversationRequestAddresses { @@ -814,6 +817,7 @@ public static CreateParticipantInConversationRequestAddresses fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -877,6 +881,7 @@ public int hashCode() { @JsonDeserialize( builder = UpdateParticipantInConversationRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateParticipantInConversationRequest { @@ -924,6 +929,7 @@ public static UpdateParticipantInConversationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1005,6 +1011,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateParticipantInConversationRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateParticipantInConversationRequest { @@ -1056,6 +1063,7 @@ public static CreateParticipantInConversationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1137,6 +1145,7 @@ public int hashCode() { @JsonDeserialize( builder = ListParticipantByConversation200ResponseParticipants.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListParticipantByConversation200ResponseParticipants { @@ -1223,6 +1232,7 @@ public static ListParticipantByConversation200ResponseParticipants fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1366,6 +1376,7 @@ public int hashCode() { } @JsonDeserialize(builder = ConversationsV2Address.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationsV2Address { @@ -1405,6 +1416,7 @@ public static ConversationsV2Address fromJson( return mapper.readValue(jsonString, ConversationsV2Address.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/conversations/v2/ParticipantFetcher.java b/src/main/java/com/twilio/rest/conversations/v2/ParticipantFetcher.java index c2f9c9a32b..90859169e5 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ParticipantFetcher.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ParticipantFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -66,16 +65,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/conversations/v2/ParticipantUpdater.java b/src/main/java/com/twilio/rest/conversations/v2/ParticipantUpdater.java index 391da8929b..a3c013f1ef 100644 --- a/src/main/java/com/twilio/rest/conversations/v2/ParticipantUpdater.java +++ b/src/main/java/com/twilio/rest/conversations/v2/ParticipantUpdater.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -79,16 +78,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/iam/v1/OAuthApp.java b/src/main/java/com/twilio/rest/iam/v1/OAuthApp.java index 55268aa78c..4aaf53731e 100644 --- a/src/main/java/com/twilio/rest/iam/v1/OAuthApp.java +++ b/src/main/java/com/twilio/rest/iam/v1/OAuthApp.java @@ -68,6 +68,7 @@ public static OAuthAppUpdater updater( @JsonDeserialize( builder = IamV1OrganizationVendorOauthAppUpdateRequestPolicy.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IamV1OrganizationVendorOauthAppUpdateRequestPolicy { @@ -103,6 +104,7 @@ public static IamV1OrganizationVendorOauthAppUpdateRequestPolicy fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -160,6 +162,7 @@ public int hashCode() { @JsonDeserialize( builder = IamV1AccountVendorOauthAppCreateRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IamV1AccountVendorOauthAppCreateRequest { @@ -223,6 +226,7 @@ public static IamV1AccountVendorOauthAppCreateRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -343,6 +347,7 @@ public int hashCode() { @JsonDeserialize( builder = IamV1OrganizationVendoroauthappPolicy.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IamV1OrganizationVendoroauthappPolicy { @@ -376,6 +381,7 @@ public static IamV1OrganizationVendoroauthappPolicy fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -431,6 +437,7 @@ public int hashCode() { @JsonDeserialize( builder = IamV1AccountVendorOauthAppUpdateRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IamV1AccountVendorOauthAppUpdateRequest { @@ -482,6 +489,7 @@ public static IamV1AccountVendorOauthAppUpdateRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/insights/v2/Inbound.java b/src/main/java/com/twilio/rest/insights/v2/Inbound.java index 950c23e075..c52b0a1a1f 100644 --- a/src/main/java/com/twilio/rest/insights/v2/Inbound.java +++ b/src/main/java/com/twilio/rest/insights/v2/Inbound.java @@ -79,6 +79,7 @@ public static ReportStatus forValue(final String value) { } @JsonDeserialize(builder = PhoneNumberReportFilter.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PhoneNumberReportFilter { @@ -109,6 +110,7 @@ public static PhoneNumberReportFilter fromJson( return mapper.readValue(jsonString, PhoneNumberReportFilter.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -163,6 +165,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2InboundPhoneNumberReportCallStatePercentage.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2InboundPhoneNumberReportCallStatePercentage { @@ -216,6 +219,7 @@ public static InsightsV2InboundPhoneNumberReportCallStatePercentage fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -306,6 +310,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2CreatePhoneNumbersReportRequestTimeRange.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2CreatePhoneNumbersReportRequestTimeRange { @@ -345,6 +350,7 @@ public static InsightsV2CreatePhoneNumbersReportRequestTimeRange fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -416,6 +422,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReportFilter.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReportFilter { @@ -446,6 +453,7 @@ public static ReportFilter fromJson( return mapper.readValue(jsonString, ReportFilter.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -500,6 +508,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2CreatePhoneNumbersReportRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2CreatePhoneNumbersReportRequest { @@ -539,6 +548,7 @@ public static InsightsV2CreatePhoneNumbersReportRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -605,6 +615,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReportMetadata.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReportMetadata { @@ -645,6 +656,7 @@ public static ReportMetadata fromJson( return mapper.readValue(jsonString, ReportMetadata.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/insights/v2/Outbound.java b/src/main/java/com/twilio/rest/insights/v2/Outbound.java index 0ba1ebc8d2..ca888fa4ae 100644 --- a/src/main/java/com/twilio/rest/insights/v2/Outbound.java +++ b/src/main/java/com/twilio/rest/insights/v2/Outbound.java @@ -80,6 +80,7 @@ public static ReportStatus forValue(final String value) { } @JsonDeserialize(builder = PhoneNumberReportFilter.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PhoneNumberReportFilter { @@ -110,6 +111,7 @@ public static PhoneNumberReportFilter fromJson( return mapper.readValue(jsonString, PhoneNumberReportFilter.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -164,6 +166,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2OutboundPhoneNumberReportAnsweringMachineDetection.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2OutboundPhoneNumberReportAnsweringMachineDetection { @@ -206,6 +209,7 @@ public static InsightsV2OutboundPhoneNumberReportAnsweringMachineDetection fromJ ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -286,6 +290,7 @@ public int hashCode() { } @JsonDeserialize(builder = CountyCarrierValue.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CountyCarrierValue { @@ -316,6 +321,7 @@ public static CountyCarrierValue fromJson( return mapper.readValue(jsonString, CountyCarrierValue.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -368,6 +374,7 @@ public int hashCode() { } @JsonDeserialize(builder = CountyCarrierValueCarriers.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CountyCarrierValueCarriers { @@ -413,6 +420,7 @@ public static CountyCarrierValueCarriers fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -499,6 +507,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2CreatePhoneNumbersReportRequestTimeRange.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2CreatePhoneNumbersReportRequestTimeRange { @@ -538,6 +547,7 @@ public static InsightsV2CreatePhoneNumbersReportRequestTimeRange fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -609,6 +619,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReportFilter.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReportFilter { @@ -639,6 +650,7 @@ public static ReportFilter fromJson( return mapper.readValue(jsonString, ReportFilter.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -693,6 +705,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2CreatePhoneNumbersReportRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2CreatePhoneNumbersReportRequest { @@ -732,6 +745,7 @@ public static InsightsV2CreatePhoneNumbersReportRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -798,6 +812,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReportMetadata.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReportMetadata { @@ -838,6 +853,7 @@ public static ReportMetadata fromJson( return mapper.readValue(jsonString, ReportMetadata.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -919,6 +935,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2OutboundPhoneNumberReportCallStatePercentage.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2OutboundPhoneNumberReportCallStatePercentage { @@ -972,6 +989,7 @@ public static InsightsV2OutboundPhoneNumberReportCallStatePercentage fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/insights/v2/Report.java b/src/main/java/com/twilio/rest/insights/v2/Report.java index f01dc0913d..d31e78ebb1 100644 --- a/src/main/java/com/twilio/rest/insights/v2/Report.java +++ b/src/main/java/com/twilio/rest/insights/v2/Report.java @@ -80,6 +80,7 @@ public static ReportStatus forValue(final String value) { } @JsonDeserialize(builder = CountyCarrierValue.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CountyCarrierValue { @@ -110,6 +111,7 @@ public static CountyCarrierValue fromJson( return mapper.readValue(jsonString, CountyCarrierValue.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -162,6 +164,7 @@ public int hashCode() { } @JsonDeserialize(builder = CountyCarrierValueCarriers.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CountyCarrierValueCarriers { @@ -207,6 +210,7 @@ public static CountyCarrierValueCarriers fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -293,6 +297,7 @@ public int hashCode() { @JsonDeserialize( builder = AccountReportAnsweringMachineDetection.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportAnsweringMachineDetection { @@ -333,6 +338,7 @@ public static AccountReportAnsweringMachineDetection fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -411,6 +417,7 @@ public int hashCode() { } @JsonDeserialize(builder = AccountReportCallType.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportCallType { @@ -459,6 +466,7 @@ public static AccountReportCallType fromJson( return mapper.readValue(jsonString, AccountReportCallType.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -544,6 +552,7 @@ public int hashCode() { } @JsonDeserialize(builder = VoiceIntegrityCallsPerBundle.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VoiceIntegrityCallsPerBundle { @@ -595,6 +604,7 @@ public static VoiceIntegrityCallsPerBundle fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -690,6 +700,7 @@ public int hashCode() { } @JsonDeserialize(builder = AccountReportCallDirection.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportCallDirection { @@ -723,6 +734,7 @@ public static AccountReportCallDirection fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -775,6 +787,7 @@ public int hashCode() { } @JsonDeserialize(builder = StirShaken.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class StirShaken { @@ -811,6 +824,7 @@ public static StirShaken fromJson( return mapper.readValue(jsonString, StirShaken.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -874,6 +888,7 @@ public int hashCode() { } @JsonDeserialize(builder = StirShakenCallCount.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class StirShakenCallCount { @@ -910,6 +925,7 @@ public static StirShakenCallCount fromJson( return mapper.readValue(jsonString, StirShakenCallCount.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -975,6 +991,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2CreateAccountReportRequestTimeRange.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2CreateAccountReportRequestTimeRange { @@ -1012,6 +1029,7 @@ public static InsightsV2CreateAccountReportRequestTimeRange fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1081,6 +1099,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReportFilter.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReportFilter { @@ -1111,6 +1130,7 @@ public static ReportFilter fromJson( return mapper.readValue(jsonString, ReportFilter.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1163,6 +1183,7 @@ public int hashCode() { } @JsonDeserialize(builder = BrandedUseCaseDetail.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class BrandedUseCaseDetail { @@ -1217,6 +1238,7 @@ public static BrandedUseCaseDetail fromJson( return mapper.readValue(jsonString, BrandedUseCaseDetail.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1323,6 +1345,7 @@ public int hashCode() { } @JsonDeserialize(builder = AccountReportNetworkIssuesSdk.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportNetworkIssuesSdk { @@ -1368,6 +1391,7 @@ public static AccountReportNetworkIssuesSdk fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1461,6 +1485,7 @@ public int hashCode() { @JsonDeserialize( builder = AccountReportNetworkIssuesTwilioGateway.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportNetworkIssuesTwilioGateway { @@ -1500,6 +1525,7 @@ public static AccountReportNetworkIssuesTwilioGateway fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1578,6 +1604,7 @@ public int hashCode() { @JsonDeserialize( builder = AccountReportKYTOutboundCarrierCalling.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportKYTOutboundCarrierCalling { @@ -1656,6 +1683,7 @@ public static AccountReportKYTOutboundCarrierCalling fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1824,6 +1852,7 @@ public int hashCode() { } @JsonDeserialize(builder = AccountReport.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReport { @@ -1932,6 +1961,7 @@ public static AccountReport fromJson( return mapper.readValue(jsonString, AccountReport.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2166,6 +2196,7 @@ public int hashCode() { } @JsonDeserialize(builder = StirShakenAnswerRate.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class StirShakenAnswerRate { @@ -2202,6 +2233,7 @@ public static StirShakenAnswerRate fromJson( return mapper.readValue(jsonString, StirShakenAnswerRate.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2267,6 +2299,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsV2CreateAccountReportRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsV2CreateAccountReportRequest { @@ -2300,6 +2333,7 @@ public static InsightsV2CreateAccountReportRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2355,6 +2389,7 @@ public int hashCode() { } @JsonDeserialize(builder = VoiceIntegrity.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VoiceIntegrity { @@ -2391,6 +2426,7 @@ public static VoiceIntegrity fromJson( return mapper.readValue(jsonString, VoiceIntegrity.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2460,6 +2496,7 @@ public int hashCode() { } @JsonDeserialize(builder = StirShakenPercentage.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class StirShakenPercentage { @@ -2496,6 +2533,7 @@ public static StirShakenPercentage fromJson( return mapper.readValue(jsonString, StirShakenPercentage.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2559,6 +2597,7 @@ public int hashCode() { } @JsonDeserialize(builder = AccountReportKYT.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportKYT { @@ -2583,6 +2622,7 @@ public static AccountReportKYT fromJson( return mapper.readValue(jsonString, AccountReportKYT.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2629,6 +2669,7 @@ public int hashCode() { } @JsonDeserialize(builder = BrandedCalling.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class BrandedCalling { @@ -2683,6 +2724,7 @@ public static BrandedCalling fromJson( return mapper.readValue(jsonString, BrandedCalling.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2789,6 +2831,7 @@ public int hashCode() { } @JsonDeserialize(builder = AccountReportCallState.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportCallState { @@ -2837,6 +2880,7 @@ public static AccountReportCallState fromJson( return mapper.readValue(jsonString, AccountReportCallState.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2922,6 +2966,7 @@ public int hashCode() { } @JsonDeserialize(builder = AccountReportNetworkIssues.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class AccountReportNetworkIssues { @@ -2955,6 +3000,7 @@ public static AccountReportNetworkIssues fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -3009,6 +3055,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReportMetadata.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReportMetadata { @@ -3049,6 +3096,7 @@ public static ReportMetadata fromJson( return mapper.readValue(jsonString, ReportMetadata.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/insights/v3/Metadata.java b/src/main/java/com/twilio/rest/insights/v3/Metadata.java index 6f83de4c8a..c2a6cda6c6 100644 --- a/src/main/java/com/twilio/rest/insights/v3/Metadata.java +++ b/src/main/java/com/twilio/rest/insights/v3/Metadata.java @@ -314,6 +314,7 @@ public static MetadataFetcher fetcher() { } @JsonDeserialize(builder = InsightsMetadataResponseCubes.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsMetadataResponseCubes { @@ -363,6 +364,7 @@ public static InsightsMetadataResponseCubes fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -434,6 +436,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsMetadataResponseCubesDimensions.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsMetadataResponseCubesDimensions { @@ -473,6 +476,7 @@ public static InsightsMetadataResponseCubesDimensions fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -534,6 +538,7 @@ public int hashCode() { @JsonDeserialize( builder = InsightsMetadataResponseCubesMeasures.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsMetadataResponseCubesMeasures { @@ -579,6 +584,7 @@ public static InsightsMetadataResponseCubesMeasures fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/insights/v3/MetadataFetcher.java b/src/main/java/com/twilio/rest/insights/v3/MetadataFetcher.java index 9233ea4d54..121175bd7b 100644 --- a/src/main/java/com/twilio/rest/insights/v3/MetadataFetcher.java +++ b/src/main/java/com/twilio/rest/insights/v3/MetadataFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -49,16 +48,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/insights/v3/Query.java b/src/main/java/com/twilio/rest/insights/v3/Query.java index 9dfb0c2076..36289cc930 100644 --- a/src/main/java/com/twilio/rest/insights/v3/Query.java +++ b/src/main/java/com/twilio/rest/insights/v3/Query.java @@ -380,6 +380,7 @@ public static Direction forValue(final String value) { } @JsonDeserialize(builder = InsightsQueryRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class InsightsQueryRequest { @@ -410,6 +411,7 @@ public static InsightsQueryRequest fromJson( return mapper.readValue(jsonString, InsightsQueryRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -460,6 +462,7 @@ public int hashCode() { } @JsonDeserialize(builder = QueryDefinition.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class QueryDefinition { @@ -502,6 +505,7 @@ public static QueryDefinition fromJson( return mapper.readValue(jsonString, QueryDefinition.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -576,6 +580,7 @@ public int hashCode() { } @JsonDeserialize(builder = PaginationMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PaginationMeta { @@ -621,6 +626,7 @@ public static PaginationMeta fromJson( return mapper.readValue(jsonString, PaginationMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -690,6 +696,7 @@ public int hashCode() { } @JsonDeserialize(builder = QueryDefinitionFilters.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class QueryDefinitionFilters { @@ -722,6 +729,7 @@ public static QueryDefinitionFilters fromJson( return mapper.readValue(jsonString, QueryDefinitionFilters.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -776,6 +784,7 @@ public int hashCode() { } @JsonDeserialize(builder = QueryDefinitionFiltersExpressions.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class QueryDefinitionFiltersExpressions { @@ -815,6 +824,7 @@ public static QueryDefinitionFiltersExpressions fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -874,6 +884,7 @@ public int hashCode() { } @JsonDeserialize(builder = QueryDefinitionOrderBy.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class QueryDefinitionOrderBy { @@ -904,6 +915,7 @@ public static QueryDefinitionOrderBy fromJson( return mapper.readValue(jsonString, QueryDefinitionOrderBy.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/insights/v3/QueryFetcher.java b/src/main/java/com/twilio/rest/insights/v3/QueryFetcher.java index d53adf5c64..af282e48b9 100644 --- a/src/main/java/com/twilio/rest/insights/v3/QueryFetcher.java +++ b/src/main/java/com/twilio/rest/insights/v3/QueryFetcher.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -61,16 +60,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/Configuration.java b/src/main/java/com/twilio/rest/intelligence/v3/Configuration.java index e418de20b2..a4c3e45c22 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/Configuration.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/Configuration.java @@ -628,6 +628,7 @@ public static On forValue(final String value) { } @JsonDeserialize(builder = Operator.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Operator { @@ -662,6 +663,7 @@ public static Operator fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Operator.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -723,6 +725,7 @@ public int hashCode() { } @JsonDeserialize(builder = Context.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Context { @@ -751,6 +754,7 @@ public static Context fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Context.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -803,6 +807,7 @@ public int hashCode() { } @JsonDeserialize(builder = Action.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Action { @@ -841,6 +846,7 @@ public static Action fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Action.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -894,6 +900,7 @@ public int hashCode() { } @JsonDeserialize(builder = RuleCreationRequestPayload.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class RuleCreationRequestPayload { @@ -942,6 +949,7 @@ public static RuleCreationRequestPayload fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1011,6 +1019,7 @@ public int hashCode() { } @JsonDeserialize(builder = ContextKnowledge.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ContextKnowledge { @@ -1035,6 +1044,7 @@ public static ContextKnowledge fromJson( return mapper.readValue(jsonString, ContextKnowledge.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1072,6 +1082,7 @@ public int hashCode() { } @JsonDeserialize(builder = UpdateConfigurationRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateConfigurationRequest { @@ -1114,6 +1125,7 @@ public static UpdateConfigurationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1174,6 +1186,7 @@ public int hashCode() { } @JsonDeserialize(builder = Trigger.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Trigger { @@ -1202,6 +1215,7 @@ public static Trigger fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Trigger.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1252,6 +1266,7 @@ public int hashCode() { } @JsonDeserialize(builder = ContextMemory.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ContextMemory { @@ -1276,6 +1291,7 @@ public static ContextMemory fromJson( return mapper.readValue(jsonString, ContextMemory.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1315,6 +1331,7 @@ public int hashCode() { } @JsonDeserialize(builder = ListConfigurations200ResponseMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListConfigurations200ResponseMeta { @@ -1363,6 +1380,7 @@ public static ListConfigurations200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1433,6 +1451,7 @@ public int hashCode() { } @JsonDeserialize(builder = CreateConfigurationRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateConfigurationRequest { @@ -1475,6 +1494,7 @@ public static CreateConfigurationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1535,6 +1555,7 @@ public int hashCode() { } @JsonDeserialize(builder = TriggerParameters.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TriggerParameters { @@ -1559,6 +1580,7 @@ public static TriggerParameters fromJson( return mapper.readValue(jsonString, TriggerParameters.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1598,6 +1620,7 @@ public int hashCode() { } @JsonDeserialize(builder = IntelligenceConfiguration.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IntelligenceConfiguration { @@ -1687,6 +1710,7 @@ public static IntelligenceConfiguration fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1792,6 +1816,7 @@ public int hashCode() { } @JsonDeserialize(builder = Rule.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Rule { @@ -1843,6 +1868,7 @@ public static Rule fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Rule.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1913,6 +1939,7 @@ public int hashCode() { } @JsonDeserialize(builder = RuleUpdateRequestPayload.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class RuleUpdateRequestPayload { @@ -1964,6 +1991,7 @@ public static RuleUpdateRequestPayload fromJson( return mapper.readValue(jsonString, RuleUpdateRequestPayload.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationDeleter.java b/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationDeleter.java index 42b79ed124..6050507c81 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationDeleter.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -58,16 +57,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationFetcher.java b/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationFetcher.java index abd3e11940..f66e427f82 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationFetcher.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -56,16 +55,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationUpdater.java b/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationUpdater.java index a9bea9dd6e..af99533c73 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationUpdater.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/ConfigurationUpdater.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -72,16 +71,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/Conversation.java b/src/main/java/com/twilio/rest/intelligence/v3/Conversation.java index 45607a58e0..56e2dffeca 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/Conversation.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/Conversation.java @@ -646,6 +646,7 @@ public static Channels forValue(final String value) { } @JsonDeserialize(builder = ConversationListItem.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ConversationListItem { @@ -768,6 +769,7 @@ public static ConversationListItem fromJson( return mapper.readValue(jsonString, ConversationListItem.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -915,6 +917,7 @@ public int hashCode() { } @JsonDeserialize(builder = ListOperators200ResponseMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListOperators200ResponseMeta { @@ -963,6 +966,7 @@ public static ListOperators200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1033,6 +1037,7 @@ public int hashCode() { } @JsonDeserialize(builder = Participant.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Participant { @@ -1078,6 +1083,7 @@ public static Participant fromJson( return mapper.readValue(jsonString, Participant.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1147,6 +1153,7 @@ public int hashCode() { } @JsonDeserialize(builder = Content.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Content { @@ -1169,6 +1176,7 @@ public static Content fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Content.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1208,6 +1216,7 @@ public int hashCode() { } @JsonDeserialize(builder = Communication.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Communication { @@ -1257,6 +1266,7 @@ public static Communication fromJson( return mapper.readValue(jsonString, Communication.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/intelligence/v3/ConversationFetcher.java b/src/main/java/com/twilio/rest/intelligence/v3/ConversationFetcher.java index 8a183e2798..86e1f336e3 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/ConversationFetcher.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/ConversationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -56,16 +55,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/Operator.java b/src/main/java/com/twilio/rest/intelligence/v3/Operator.java index 0b6572f538..f8a67bc495 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/Operator.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/Operator.java @@ -743,6 +743,7 @@ public static OperatorAuthorEnum forValue(final String value) { } @JsonDeserialize(builder = OperatorParameter.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorParameter { @@ -785,6 +786,7 @@ public static OperatorParameter fromJson( return mapper.readValue(jsonString, OperatorParameter.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -857,6 +859,7 @@ public int hashCode() { } @JsonDeserialize(builder = LanguageOperator.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LanguageOperator { @@ -941,6 +944,7 @@ public static LanguageOperator fromJson( return mapper.readValue(jsonString, LanguageOperator.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1110,6 +1114,7 @@ public int hashCode() { } @JsonDeserialize(builder = ListOperators200ResponseMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListOperators200ResponseMeta { @@ -1158,6 +1163,7 @@ public static ListOperators200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1228,6 +1234,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorContext.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorContext { @@ -1258,6 +1265,7 @@ public static OperatorContext fromJson( return mapper.readValue(jsonString, OperatorContext.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1310,6 +1318,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorContextKnowledge.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorContextKnowledge { @@ -1334,6 +1343,7 @@ public static OperatorContextKnowledge fromJson( return mapper.readValue(jsonString, OperatorContextKnowledge.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1373,6 +1383,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorTrainingExample.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorTrainingExample { @@ -1403,6 +1414,7 @@ public static OperatorTrainingExample fromJson( return mapper.readValue(jsonString, OperatorTrainingExample.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1450,6 +1462,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorContextMemory.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorContextMemory { @@ -1474,6 +1487,7 @@ public static OperatorContextMemory fromJson( return mapper.readValue(jsonString, OperatorContextMemory.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/intelligence/v3/OperatorDeleter.java b/src/main/java/com/twilio/rest/intelligence/v3/OperatorDeleter.java index b7f3b5e77d..0a7c3bee9c 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/OperatorDeleter.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/OperatorDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -58,16 +57,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/OperatorFetcher.java b/src/main/java/com/twilio/rest/intelligence/v3/OperatorFetcher.java index 913ac300d3..cf28b18ca2 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/OperatorFetcher.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/OperatorFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -55,16 +54,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/OperatorResult.java b/src/main/java/com/twilio/rest/intelligence/v3/OperatorResult.java index 91ff3909af..890d21713c 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/OperatorResult.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/OperatorResult.java @@ -498,6 +498,7 @@ public static OperatorResultReader reader() { } @JsonDeserialize(builder = ExtractionResultResultEntities.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ExtractionResultResultEntities { @@ -531,6 +532,7 @@ public static ExtractionResultResultEntities fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -579,6 +581,7 @@ public int hashCode() { } @JsonDeserialize(builder = ExtractionResultResult.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ExtractionResultResult { @@ -605,6 +608,7 @@ public static ExtractionResultResult fromJson( return mapper.readValue(jsonString, ExtractionResultResult.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -646,6 +650,7 @@ public int hashCode() { } @JsonDeserialize(builder = ListOperators200ResponseMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListOperators200ResponseMeta { @@ -694,6 +699,7 @@ public static ListOperators200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -764,6 +770,7 @@ public int hashCode() { } @JsonDeserialize(builder = SystemMetaData.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SystemMetaData { @@ -822,6 +829,7 @@ public static SystemMetaData fromJson( return mapper.readValue(jsonString, SystemMetaData.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -900,6 +908,7 @@ public int hashCode() { } @JsonDeserialize(builder = ExecutionDetailsParticipants.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ExecutionDetailsParticipants { @@ -939,6 +948,7 @@ public static ExecutionDetailsParticipants fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1001,6 +1011,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorReference.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorReference { @@ -1041,6 +1052,7 @@ public static OperatorReference fromJson( return mapper.readValue(jsonString, OperatorReference.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1094,6 +1106,7 @@ public int hashCode() { } @JsonDeserialize(builder = ResolvedContextKnowledge.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ResolvedContextKnowledge { @@ -1120,6 +1133,7 @@ public static ResolvedContextKnowledge fromJson( return mapper.readValue(jsonString, ResolvedContextKnowledge.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1161,6 +1175,7 @@ public int hashCode() { } @JsonDeserialize(builder = IntelligenceConfigurationReference.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IntelligenceConfigurationReference { @@ -1204,6 +1219,7 @@ public static IntelligenceConfigurationReference fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1258,6 +1274,7 @@ public int hashCode() { } @JsonDeserialize(builder = TextResultResult.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TextResultResult { @@ -1282,6 +1299,7 @@ public static TextResultResult fromJson( return mapper.readValue(jsonString, TextResultResult.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1319,6 +1337,7 @@ public int hashCode() { } @JsonDeserialize(builder = ExecutionDetails.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ExecutionDetails { @@ -1372,6 +1391,7 @@ public static ExecutionDetails fromJson( return mapper.readValue(jsonString, ExecutionDetails.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1452,6 +1472,7 @@ public int hashCode() { } @JsonDeserialize(builder = ResolvedContextKnowledgeSources.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ResolvedContextKnowledgeSources { @@ -1488,6 +1509,7 @@ public static ResolvedContextKnowledgeSources fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1538,6 +1560,7 @@ public int hashCode() { @JsonDeserialize( builder = OperatorResultsResponseBaseMetadata.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorResultsResponseBaseMetadata { @@ -1565,6 +1588,7 @@ public static OperatorResultsResponseBaseMetadata fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1605,6 +1629,7 @@ public int hashCode() { } @JsonDeserialize(builder = ResolvedContext.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ResolvedContext { @@ -1635,6 +1660,7 @@ public static ResolvedContext fromJson( return mapper.readValue(jsonString, ResolvedContext.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1687,6 +1713,7 @@ public int hashCode() { } @JsonDeserialize(builder = ExecutionDetailsTrigger.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ExecutionDetailsTrigger { @@ -1722,6 +1749,7 @@ public static ExecutionDetailsTrigger fromJson( return mapper.readValue(jsonString, ExecutionDetailsTrigger.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1773,6 +1801,7 @@ public int hashCode() { } @JsonDeserialize(builder = ExecutionDetailsCommunications.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ExecutionDetailsCommunications { @@ -1806,6 +1835,7 @@ public static ExecutionDetailsCommunications fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1854,6 +1884,7 @@ public int hashCode() { } @JsonDeserialize(builder = ResolvedContextMemory.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ResolvedContextMemory { @@ -1887,6 +1918,7 @@ public static ResolvedContextMemory fromJson( return mapper.readValue(jsonString, ResolvedContextMemory.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1934,36 +1966,25 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorResultsResponseV1.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorResultsResponseV1 { @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("accountId") - @Getter - private final String accountId; - - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("conversationId") - @Getter - private final String conversationId; - - @JsonDeserialize(using = com.twilio.converter.ISO8601Deserializer.class) - @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("dateCreated") + @JsonProperty("outputFormat") @Getter - private final ZonedDateTime dateCreated; + private final String outputFormat; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("executionDetails") + @JsonProperty("id") @Getter - private final ExecutionDetails executionDetails; + private final String id; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("id") + @JsonProperty("accountId") @Getter - private final String id; + private final String accountId; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("intelligenceConfiguration") @@ -1971,41 +1992,53 @@ public static class OperatorResultsResponseV1 { private final IntelligenceConfigurationReference intelligenceConfiguration; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("metadata") + @JsonProperty("conversationId") @Getter - private final OperatorResultsResponseBaseMetadata metadata; + private final String conversationId; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("operator") @Getter private final OperatorReference operator; + @JsonDeserialize(using = com.twilio.converter.ISO8601Deserializer.class) + @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("outputFormat") + @JsonProperty("dateCreated") @Getter - private final String outputFormat; + private final ZonedDateTime dateCreated; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("referenceIds") @Getter private final List referenceIds; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("executionDetails") + @Getter + private final ExecutionDetails executionDetails; + + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("metadata") + @Getter + private final OperatorResultsResponseBaseMetadata metadata; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("result") @Getter private final TextResultResult result; private OperatorResultsResponseV1(Builder builder) { + this.outputFormat = builder.outputFormat; + this.id = builder.id; this.accountId = builder.accountId; + this.intelligenceConfiguration = builder.intelligenceConfiguration; this.conversationId = builder.conversationId; + this.operator = builder.operator; this.dateCreated = builder.dateCreated; + this.referenceIds = builder.referenceIds; this.executionDetails = builder.executionDetails; - this.id = builder.id; - this.intelligenceConfiguration = builder.intelligenceConfiguration; this.metadata = builder.metadata; - this.operator = builder.operator; - this.outputFormat = builder.outputFormat; - this.referenceIds = builder.referenceIds; this.result = builder.result; } @@ -2023,15 +2056,28 @@ public static OperatorResultsResponseV1 fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { + @JsonProperty("outputFormat") + private String outputFormat; + + @JsonProperty("id") + private String id; + @JsonProperty("accountId") private String accountId; + @JsonProperty("intelligenceConfiguration") + private IntelligenceConfigurationReference intelligenceConfiguration; + @JsonProperty("conversationId") private String conversationId; + @JsonProperty("operator") + private OperatorReference operator; + @JsonDeserialize( using = com.twilio.converter.ISO8601Deserializer.class ) @@ -2039,66 +2085,36 @@ public static class Builder { @JsonProperty("dateCreated") private ZonedDateTime dateCreated; + @JsonProperty("referenceIds") + private List referenceIds; + @JsonProperty("executionDetails") private ExecutionDetails executionDetails; - @JsonProperty("id") - private String id; - - @JsonProperty("intelligenceConfiguration") - private IntelligenceConfigurationReference intelligenceConfiguration; - @JsonProperty("metadata") private OperatorResultsResponseBaseMetadata metadata; - @JsonProperty("operator") - private OperatorReference operator; - - @JsonProperty("outputFormat") - private String outputFormat; - - @JsonProperty("referenceIds") - private List referenceIds; - @JsonProperty("result") private TextResultResult result; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("accountId") - public Builder accountId(String accountId) { - this.accountId = accountId; - return this; - } - - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("conversationId") - public Builder conversationId(String conversationId) { - this.conversationId = conversationId; - return this; - } - - @JsonDeserialize( - using = com.twilio.converter.ISO8601Deserializer.class - ) - @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("dateCreated") - public Builder dateCreated(ZonedDateTime dateCreated) { - this.dateCreated = dateCreated; + @JsonProperty("outputFormat") + public Builder outputFormat(String outputFormat) { + this.outputFormat = outputFormat; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("executionDetails") - public Builder executionDetails(ExecutionDetails executionDetails) { - this.executionDetails = executionDetails; + @JsonProperty("id") + public Builder id(String id) { + this.id = id; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("id") - public Builder id(String id) { - this.id = id; + @JsonProperty("accountId") + public Builder accountId(String accountId) { + this.accountId = accountId; return this; } @@ -2112,11 +2128,9 @@ public Builder intelligenceConfiguration( } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("metadata") - public Builder metadata( - OperatorResultsResponseBaseMetadata metadata - ) { - this.metadata = metadata; + @JsonProperty("conversationId") + public Builder conversationId(String conversationId) { + this.conversationId = conversationId; return this; } @@ -2127,10 +2141,14 @@ public Builder operator(OperatorReference operator) { return this; } + @JsonDeserialize( + using = com.twilio.converter.ISO8601Deserializer.class + ) + @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("outputFormat") - public Builder outputFormat(String outputFormat) { - this.outputFormat = outputFormat; + @JsonProperty("dateCreated") + public Builder dateCreated(ZonedDateTime dateCreated) { + this.dateCreated = dateCreated; return this; } @@ -2141,6 +2159,22 @@ public Builder referenceIds(List referenceIds) { return this; } + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("executionDetails") + public Builder executionDetails(ExecutionDetails executionDetails) { + this.executionDetails = executionDetails; + return this; + } + + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("metadata") + public Builder metadata( + OperatorResultsResponseBaseMetadata metadata + ) { + this.metadata = metadata; + return this; + } + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("result") public Builder result(TextResultResult result) { @@ -2165,19 +2199,19 @@ public boolean equals(final Object o) { OperatorResultsResponseV1 other = (OperatorResultsResponseV1) o; return ( - Objects.equals(accountId, other.accountId) && - Objects.equals(conversationId, other.conversationId) && - Objects.equals(dateCreated, other.dateCreated) && - Objects.equals(executionDetails, other.executionDetails) && + Objects.equals(outputFormat, other.outputFormat) && Objects.equals(id, other.id) && + Objects.equals(accountId, other.accountId) && Objects.equals( intelligenceConfiguration, other.intelligenceConfiguration ) && - Objects.equals(metadata, other.metadata) && + Objects.equals(conversationId, other.conversationId) && Objects.equals(operator, other.operator) && - Objects.equals(outputFormat, other.outputFormat) && + Objects.equals(dateCreated, other.dateCreated) && Objects.equals(referenceIds, other.referenceIds) && + Objects.equals(executionDetails, other.executionDetails) && + Objects.equals(metadata, other.metadata) && Objects.equals(result, other.result) ); } @@ -2185,16 +2219,16 @@ public boolean equals(final Object o) { @Override public int hashCode() { return Objects.hash( + outputFormat, + id, accountId, + intelligenceConfiguration, conversationId, + operator, dateCreated, + referenceIds, executionDetails, - id, - intelligenceConfiguration, metadata, - operator, - outputFormat, - referenceIds, result ); } diff --git a/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultDeleter.java b/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultDeleter.java index d20493cac6..8ee81288fe 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultDeleter.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -62,16 +61,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultFetcher.java b/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultFetcher.java index 04c09ace09..88dd3ef53d 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultFetcher.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/OperatorResultFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -60,16 +59,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/OperatorUpdater.java b/src/main/java/com/twilio/rest/intelligence/v3/OperatorUpdater.java index 31c5bb75fc..51b40144c5 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/OperatorUpdater.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/OperatorUpdater.java @@ -23,7 +23,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -80,16 +79,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/intelligence/v3/Version.java b/src/main/java/com/twilio/rest/intelligence/v3/Version.java index f74502b387..6ab2662534 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/Version.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/Version.java @@ -547,6 +547,7 @@ public static OperatorAuthorEnum forValue(final String value) { } @JsonDeserialize(builder = OperatorParameter.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorParameter { @@ -589,6 +590,7 @@ public static OperatorParameter fromJson( return mapper.readValue(jsonString, OperatorParameter.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -661,6 +663,7 @@ public int hashCode() { } @JsonDeserialize(builder = ListOperators200ResponseMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListOperators200ResponseMeta { @@ -709,6 +712,7 @@ public static ListOperators200ResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -781,6 +785,7 @@ public int hashCode() { @JsonDeserialize( builder = ListOperatorVersions200ResponseItems.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ListOperatorVersions200ResponseItems { @@ -850,6 +855,7 @@ public static ListOperatorVersions200ResponseItems fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -974,6 +980,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorContext.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorContext { @@ -1004,6 +1011,7 @@ public static OperatorContext fromJson( return mapper.readValue(jsonString, OperatorContext.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1056,6 +1064,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorContextKnowledge.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorContextKnowledge { @@ -1080,6 +1089,7 @@ public static OperatorContextKnowledge fromJson( return mapper.readValue(jsonString, OperatorContextKnowledge.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1119,6 +1129,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorTrainingExample.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorTrainingExample { @@ -1149,6 +1160,7 @@ public static OperatorTrainingExample fromJson( return mapper.readValue(jsonString, OperatorTrainingExample.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1196,6 +1208,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperatorContextMemory.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperatorContextMemory { @@ -1220,6 +1233,7 @@ public static OperatorContextMemory fromJson( return mapper.readValue(jsonString, OperatorContextMemory.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/intelligence/v3/VersionFetcher.java b/src/main/java/com/twilio/rest/intelligence/v3/VersionFetcher.java index aebcde2457..4cb97aa0c9 100644 --- a/src/main/java/com/twilio/rest/intelligence/v3/VersionFetcher.java +++ b/src/main/java/com/twilio/rest/intelligence/v3/VersionFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -58,16 +57,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v1/Knowledge.java b/src/main/java/com/twilio/rest/knowledge/v1/Knowledge.java index 0a8e2902dd..0f11209abf 100644 --- a/src/main/java/com/twilio/rest/knowledge/v1/Knowledge.java +++ b/src/main/java/com/twilio/rest/knowledge/v1/Knowledge.java @@ -69,6 +69,7 @@ public static KnowledgeUpdater updater(final String pathId) { @JsonDeserialize( builder = KnowledgeV1ServiceUpdateKnowledgeRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeV1ServiceUpdateKnowledgeRequest { @@ -126,6 +127,7 @@ public static KnowledgeV1ServiceUpdateKnowledgeRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -239,6 +241,7 @@ public int hashCode() { @JsonDeserialize( builder = KnowledgeV1ServiceCreateKnowledgeRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeV1ServiceCreateKnowledgeRequest { @@ -296,6 +299,7 @@ public static KnowledgeV1ServiceCreateKnowledgeRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -404,6 +408,7 @@ public int hashCode() { @JsonDeserialize( builder = KnowledgeV1ServiceCreatePolicyRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeV1ServiceCreatePolicyRequest { @@ -455,6 +460,7 @@ public static KnowledgeV1ServiceCreatePolicyRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/knowledge/v2/Chunk.java b/src/main/java/com/twilio/rest/knowledge/v2/Chunk.java index 70485698fe..cd07b0bbfd 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/Chunk.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/Chunk.java @@ -301,6 +301,7 @@ public static ChunkReader reader( } @JsonDeserialize(builder = KnowledgeMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeMeta { @@ -343,6 +344,7 @@ public static KnowledgeMeta fromJson( return mapper.readValue(jsonString, KnowledgeMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -417,6 +419,7 @@ public int hashCode() { } @JsonDeserialize(builder = KnowledgeChunk.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeChunk { @@ -449,6 +452,7 @@ public static KnowledgeChunk fromJson( return mapper.readValue(jsonString, KnowledgeChunk.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/knowledge/v2/Knowledge.java b/src/main/java/com/twilio/rest/knowledge/v2/Knowledge.java index 36b7dc2e77..335033a1b5 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/Knowledge.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/Knowledge.java @@ -568,7 +568,9 @@ public static Status forValue(final String value) { } public enum Type { - TEXT("Text"); + TEXT("Text"), + WEB("Web"), + FILE("File"); private final String value; @@ -587,34 +589,6 @@ public static Type forValue(final String value) { } } - public enum SupportedFileMimeType { - TEXT_CSV("text/csv"), - TEXT_MARKDOWN("text/markdown"), - TEXT_MDX("text/mdx"), - APPLICATION_PDF("application/pdf"), - TEXT_TAB_SEPARATED_VALUES("text/tab-separated-values"), - TEXT_PLAIN("text/plain"); - - private final String value; - - private SupportedFileMimeType(final String value) { - this.value = value; - } - - @JsonValue - public String toString() { - return value; - } - - @JsonCreator - public static SupportedFileMimeType forValue(final String value) { - return Promoter.enumFromString( - value, - SupportedFileMimeType.values() - ); - } - } - public enum CrawlPeriod { WEEKLY("WEEKLY"), BIWEEKLY("BIWEEKLY"), @@ -639,6 +613,7 @@ public static CrawlPeriod forValue(final String value) { } @JsonDeserialize(builder = KnowledgeCore.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeCore { @@ -675,6 +650,7 @@ public static KnowledgeCore fromJson( return mapper.readValue(jsonString, KnowledgeCore.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -736,6 +712,7 @@ public int hashCode() { } @JsonDeserialize(builder = KnowledgeMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeMeta { @@ -778,6 +755,7 @@ public static KnowledgeMeta fromJson( return mapper.readValue(jsonString, KnowledgeMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -852,15 +830,26 @@ public int hashCode() { } @JsonDeserialize(builder = KnowledgeSourceTypes.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeSourceTypes { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("type") + @Getter + private final Knowledge.Type type; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("content") @Getter private final String content; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("url") + @Getter + private final URI url; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("crawlDepth") @Getter @@ -881,20 +870,15 @@ public static class KnowledgeSourceTypes { @Getter private final Integer fileSize; - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("importUrl") - @Getter - private final URI importUrl; - @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("mimeType") @Getter - private final Knowledge.SupportedFileMimeType mimeType; + private final SupportedFileMimeType mimeType; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("type") + @JsonProperty("importUrl") @Getter - private final Knowledge.Type type; + private final URI importUrl; @JsonDeserialize(using = com.twilio.converter.ISO8601Deserializer.class) @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @@ -903,22 +887,17 @@ public static class KnowledgeSourceTypes { @Getter private final ZonedDateTime uploadExpiration; - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("url") - @Getter - private final URI url; - private KnowledgeSourceTypes(Builder builder) { + this.type = builder.type; this.content = builder.content; + this.url = builder.url; this.crawlDepth = builder.crawlDepth; this.crawlPeriod = builder.crawlPeriod; this.fileName = builder.fileName; this.fileSize = builder.fileSize; - this.importUrl = builder.importUrl; this.mimeType = builder.mimeType; - this.type = builder.type; + this.importUrl = builder.importUrl; this.uploadExpiration = builder.uploadExpiration; - this.url = builder.url; } public static Builder builder() { @@ -932,12 +911,19 @@ public static KnowledgeSourceTypes fromJson( return mapper.readValue(jsonString, KnowledgeSourceTypes.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { + @JsonProperty("type") + private Knowledge.Type type; + @JsonProperty("content") private String content; + @JsonProperty("url") + private URI url; + @JsonProperty("crawlDepth") private Integer crawlDepth; @@ -950,14 +936,11 @@ public static class Builder { @JsonProperty("fileSize") private Integer fileSize; - @JsonProperty("importUrl") - private URI importUrl; - @JsonProperty("mimeType") - private Knowledge.SupportedFileMimeType mimeType; + private SupportedFileMimeType mimeType; - @JsonProperty("type") - private Knowledge.Type type; + @JsonProperty("importUrl") + private URI importUrl; @JsonDeserialize( using = com.twilio.converter.ISO8601Deserializer.class @@ -966,8 +949,12 @@ public static class Builder { @JsonProperty("uploadExpiration") private ZonedDateTime uploadExpiration; - @JsonProperty("url") - private URI url; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("type") + public Builder type(Knowledge.Type type) { + this.type = type; + return this; + } @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("content") @@ -976,6 +963,13 @@ public Builder content(String content) { return this; } + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("url") + public Builder url(URI url) { + this.url = url; + return this; + } + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("crawlDepth") public Builder crawlDepth(Integer crawlDepth) { @@ -1004,24 +998,17 @@ public Builder fileSize(Integer fileSize) { return this; } - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("importUrl") - public Builder importUrl(URI importUrl) { - this.importUrl = importUrl; - return this; - } - @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("mimeType") - public Builder mimeType(Knowledge.SupportedFileMimeType mimeType) { + public Builder mimeType(SupportedFileMimeType mimeType) { this.mimeType = mimeType; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("type") - public Builder type(Knowledge.Type type) { - this.type = type; + @JsonProperty("importUrl") + public Builder importUrl(URI importUrl) { + this.importUrl = importUrl; return this; } @@ -1036,13 +1023,6 @@ public Builder uploadExpiration(ZonedDateTime uploadExpiration) { return this; } - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("url") - public Builder url(URI url) { - this.url = url; - return this; - } - public KnowledgeSourceTypes build() { return new KnowledgeSourceTypes(this); } @@ -1060,37 +1040,85 @@ public boolean equals(final Object o) { KnowledgeSourceTypes other = (KnowledgeSourceTypes) o; return ( + Objects.equals(type, other.type) && Objects.equals(content, other.content) && + Objects.equals(url, other.url) && Objects.equals(crawlDepth, other.crawlDepth) && Objects.equals(crawlPeriod, other.crawlPeriod) && Objects.equals(fileName, other.fileName) && Objects.equals(fileSize, other.fileSize) && - Objects.equals(importUrl, other.importUrl) && Objects.equals(mimeType, other.mimeType) && - Objects.equals(type, other.type) && - Objects.equals(uploadExpiration, other.uploadExpiration) && - Objects.equals(url, other.url) + Objects.equals(importUrl, other.importUrl) && + Objects.equals(uploadExpiration, other.uploadExpiration) ); } @Override public int hashCode() { return Objects.hash( + type, content, + url, crawlDepth, crawlPeriod, fileName, fileSize, - importUrl, mimeType, - type, - uploadExpiration, - url + importUrl, + uploadExpiration ); } } + @JsonDeserialize(builder = SupportedFileMimeType.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @ToString + public static class SupportedFileMimeType { + + private SupportedFileMimeType(Builder builder) {} + + public static Builder builder() { + return new Builder(); + } + + public static SupportedFileMimeType fromJson( + String jsonString, + ObjectMapper mapper + ) throws IOException { + return mapper.readValue(jsonString, SupportedFileMimeType.class); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + @JsonPOJOBuilder(withPrefix = "") + public static class Builder { + + public SupportedFileMimeType build() { + return new SupportedFileMimeType(this); + } + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + } + @JsonDeserialize(builder = _Knowledge.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class _Knowledge { @@ -1161,6 +1189,7 @@ public static _Knowledge fromJson( return mapper.readValue(jsonString, _Knowledge.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasis.java b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasis.java index eb6069831a..5a61dc4e46 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasis.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasis.java @@ -515,6 +515,7 @@ public static OrderBy forValue(final String value) { } @JsonDeserialize(builder = Meta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Meta { @@ -555,6 +556,7 @@ public static Meta fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Meta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -629,6 +631,7 @@ public int hashCode() { } @JsonDeserialize(builder = UpdateKnowledgeBaseRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateKnowledgeBaseRequest { @@ -662,6 +665,7 @@ public static UpdateKnowledgeBaseRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -714,6 +718,7 @@ public int hashCode() { } @JsonDeserialize(builder = KnowledgeBase.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeBase { @@ -792,6 +797,7 @@ public static KnowledgeBase fromJson( return mapper.readValue(jsonString, KnowledgeBase.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -890,6 +896,7 @@ public int hashCode() { } @JsonDeserialize(builder = KnowledgeBaseCore.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeBaseCore { @@ -920,6 +927,7 @@ public static KnowledgeBaseCore fromJson( return mapper.readValue(jsonString, KnowledgeBaseCore.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisDeleter.java b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisDeleter.java index 8f8b1e1b2f..fa3cf8b6ad 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisDeleter.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -62,16 +61,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisFetcher.java b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisFetcher.java index 51c596fe9b..ecc7ca9273 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisFetcher.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -56,16 +55,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisUpdater.java b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisUpdater.java index b72e27e241..f4f2faadb3 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisUpdater.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeBasisUpdater.java @@ -23,7 +23,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -81,16 +80,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeDeleter.java b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeDeleter.java index 4db010cbaa..ce100007c2 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeDeleter.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -68,16 +67,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeFetcher.java b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeFetcher.java index 9c6af60f61..088e3e2d65 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeFetcher.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -66,16 +65,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeUpdater.java b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeUpdater.java index a1fa2dedef..79573e8fab 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeUpdater.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/KnowledgeUpdater.java @@ -23,7 +23,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -87,16 +86,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v2/Operation.java b/src/main/java/com/twilio/rest/knowledge/v2/Operation.java index 5e256f21f1..335713b43f 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/Operation.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/Operation.java @@ -407,6 +407,7 @@ public static Type forValue(final String value) { } @JsonDeserialize(builder = OperationResultResourceId.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperationResultResourceId { @@ -443,6 +444,7 @@ public static OperationResultResourceId fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -489,6 +491,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperationStatusError.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperationStatusError { @@ -531,6 +534,7 @@ public static OperationStatusError fromJson( return mapper.readValue(jsonString, OperationStatusError.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/knowledge/v2/OperationFetcher.java b/src/main/java/com/twilio/rest/knowledge/v2/OperationFetcher.java index 92b62b911e..29412a7ac5 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/OperationFetcher.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/OperationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -60,16 +59,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/knowledge/v2/Search.java b/src/main/java/com/twilio/rest/knowledge/v2/Search.java index b603769f15..6a7488e0ff 100644 --- a/src/main/java/com/twilio/rest/knowledge/v2/Search.java +++ b/src/main/java/com/twilio/rest/knowledge/v2/Search.java @@ -291,6 +291,7 @@ public static SearchCreator creator(final String pathKbId) { } @JsonDeserialize(builder = KnowledgeSearch.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeSearch { @@ -327,6 +328,7 @@ public static KnowledgeSearch fromJson( return mapper.readValue(jsonString, KnowledgeSearch.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -385,6 +387,7 @@ public int hashCode() { } @JsonDeserialize(builder = KnowledgeChunkResult.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class KnowledgeChunkResult { @@ -429,6 +432,7 @@ public static KnowledgeChunkResult fromJson( return mapper.readValue(jsonString, KnowledgeChunkResult.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/lookups/v2/Bucket.java b/src/main/java/com/twilio/rest/lookups/v2/Bucket.java index eefffa38eb..ca59e28a64 100644 --- a/src/main/java/com/twilio/rest/lookups/v2/Bucket.java +++ b/src/main/java/com/twilio/rest/lookups/v2/Bucket.java @@ -64,6 +64,7 @@ public static BucketUpdater updater( } @JsonDeserialize(builder = RateLimitRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class RateLimitRequest { @@ -94,6 +95,7 @@ public static RateLimitRequest fromJson( return mapper.readValue(jsonString, RateLimitRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/lookups/v2/LookupOverride.java b/src/main/java/com/twilio/rest/lookups/v2/LookupOverride.java index 639ce41a06..28fc201f6f 100644 --- a/src/main/java/com/twilio/rest/lookups/v2/LookupOverride.java +++ b/src/main/java/com/twilio/rest/lookups/v2/LookupOverride.java @@ -168,6 +168,7 @@ public static OriginalLineType forValue(final String value) { } @JsonDeserialize(builder = OverridesRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OverridesRequest { @@ -198,6 +199,7 @@ public static OverridesRequest fromJson( return mapper.readValue(jsonString, OverridesRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/lookups/v2/PhoneNumber.java b/src/main/java/com/twilio/rest/lookups/v2/PhoneNumber.java index 8045bf30b0..4261f929ba 100644 --- a/src/main/java/com/twilio/rest/lookups/v2/PhoneNumber.java +++ b/src/main/java/com/twilio/rest/lookups/v2/PhoneNumber.java @@ -106,6 +106,7 @@ public static ValidationError forValue(final String value) { } @JsonDeserialize(builder = CallForwardingInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CallForwardingInfo { @@ -136,6 +137,7 @@ public static CallForwardingInfo fromJson( return mapper.readValue(jsonString, CallForwardingInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -193,6 +195,7 @@ public int hashCode() { } @JsonDeserialize(builder = SmsPumpingRiskInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SmsPumpingRiskInfo { @@ -249,6 +252,7 @@ public static SmsPumpingRiskInfo fromJson( return mapper.readValue(jsonString, SmsPumpingRiskInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -371,6 +375,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReassignedNumberInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReassignedNumberInfo { @@ -407,6 +412,7 @@ public static ReassignedNumberInfo fromJson( return mapper.readValue(jsonString, ReassignedNumberInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -474,6 +480,7 @@ public int hashCode() { } @JsonDeserialize(builder = IdentityMatchInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IdentityMatchInfo { @@ -564,6 +571,7 @@ public static IdentityMatchInfo fromJson( return mapper.readValue(jsonString, IdentityMatchInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -742,6 +750,7 @@ public int hashCode() { } @JsonDeserialize(builder = LastSimSwapInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LastSimSwapInfo { @@ -780,6 +789,7 @@ public static LastSimSwapInfo fromJson( return mapper.readValue(jsonString, LastSimSwapInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -855,6 +865,7 @@ public int hashCode() { } @JsonDeserialize(builder = LineTypeIntelligenceInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LineTypeIntelligenceInfo { @@ -903,6 +914,7 @@ public static LineTypeIntelligenceInfo fromJson( return mapper.readValue(jsonString, LineTypeIntelligenceInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -994,6 +1006,7 @@ public int hashCode() { } @JsonDeserialize(builder = SimSwapInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SimSwapInfo { @@ -1042,6 +1055,7 @@ public static SimSwapInfo fromJson( return mapper.readValue(jsonString, SimSwapInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1133,6 +1147,7 @@ public int hashCode() { } @JsonDeserialize(builder = LineStatusInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LineStatusInfo { @@ -1163,6 +1178,7 @@ public static LineStatusInfo fromJson( return mapper.readValue(jsonString, LineStatusInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1215,6 +1231,7 @@ public int hashCode() { } @JsonDeserialize(builder = CallerNameInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CallerNameInfo { @@ -1251,6 +1268,7 @@ public static CallerNameInfo fromJson( return mapper.readValue(jsonString, CallerNameInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/lookups/v2/Query.java b/src/main/java/com/twilio/rest/lookups/v2/Query.java index 4e6411e06e..b38cf6a685 100644 --- a/src/main/java/com/twilio/rest/lookups/v2/Query.java +++ b/src/main/java/com/twilio/rest/lookups/v2/Query.java @@ -79,6 +79,7 @@ public static Fields forValue(final String value) { } @JsonDeserialize(builder = LookupBatchRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LookupBatchRequest { @@ -139,6 +140,7 @@ public static LookupBatchRequest fromJson( return mapper.readValue(jsonString, LookupBatchRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -258,6 +260,7 @@ public int hashCode() { } @JsonDeserialize(builder = LookupBatchResponse.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LookupBatchResponse { @@ -384,6 +387,7 @@ public static LookupBatchResponse fromJson( return mapper.readValue(jsonString, LookupBatchResponse.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -643,6 +647,7 @@ public int hashCode() { } @JsonDeserialize(builder = LastSimSwapInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LastSimSwapInfo { @@ -681,6 +686,7 @@ public static LastSimSwapInfo fromJson( return mapper.readValue(jsonString, LastSimSwapInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -756,6 +762,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReassignedNumberParameters.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReassignedNumberParameters { @@ -783,6 +790,7 @@ public static ReassignedNumberParameters fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -822,6 +830,7 @@ public int hashCode() { } @JsonDeserialize(builder = RiskParameters.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class RiskParameters { @@ -846,6 +855,7 @@ public static RiskParameters fromJson( return mapper.readValue(jsonString, RiskParameters.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -885,6 +895,7 @@ public int hashCode() { } @JsonDeserialize(builder = LineStatusInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LineStatusInfo { @@ -915,6 +926,7 @@ public static LineStatusInfo fromJson( return mapper.readValue(jsonString, LineStatusInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -967,6 +979,7 @@ public int hashCode() { } @JsonDeserialize(builder = LookupRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LookupRequest { @@ -991,6 +1004,7 @@ public static LookupRequest fromJson( return mapper.readValue(jsonString, LookupRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1030,6 +1044,7 @@ public int hashCode() { } @JsonDeserialize(builder = CallForwardingInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CallForwardingInfo { @@ -1060,6 +1075,7 @@ public static CallForwardingInfo fromJson( return mapper.readValue(jsonString, CallForwardingInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1117,6 +1133,7 @@ public int hashCode() { } @JsonDeserialize(builder = SmsPumpingRiskInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SmsPumpingRiskInfo { @@ -1173,6 +1190,7 @@ public static SmsPumpingRiskInfo fromJson( return mapper.readValue(jsonString, SmsPumpingRiskInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1295,6 +1313,7 @@ public int hashCode() { } @JsonDeserialize(builder = ReassignedNumberInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ReassignedNumberInfo { @@ -1331,6 +1350,7 @@ public static ReassignedNumberInfo fromJson( return mapper.readValue(jsonString, ReassignedNumberInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1398,6 +1418,7 @@ public int hashCode() { } @JsonDeserialize(builder = IdentityMatchParameters.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IdentityMatchParameters { @@ -1476,6 +1497,7 @@ public static IdentityMatchParameters fromJson( return mapper.readValue(jsonString, IdentityMatchParameters.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1627,6 +1649,7 @@ public int hashCode() { } @JsonDeserialize(builder = IdentityMatchInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IdentityMatchInfo { @@ -1717,6 +1740,7 @@ public static IdentityMatchInfo fromJson( return mapper.readValue(jsonString, IdentityMatchInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1895,6 +1919,7 @@ public int hashCode() { } @JsonDeserialize(builder = LineTypeIntelligenceInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class LineTypeIntelligenceInfo { @@ -1943,6 +1968,7 @@ public static LineTypeIntelligenceInfo fromJson( return mapper.readValue(jsonString, LineTypeIntelligenceInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2034,6 +2060,7 @@ public int hashCode() { } @JsonDeserialize(builder = SimSwapInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SimSwapInfo { @@ -2082,6 +2109,7 @@ public static SimSwapInfo fromJson( return mapper.readValue(jsonString, SimSwapInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2173,6 +2201,7 @@ public int hashCode() { } @JsonDeserialize(builder = CallerNameInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CallerNameInfo { @@ -2209,6 +2238,7 @@ public static CallerNameInfo fromJson( return mapper.readValue(jsonString, CallerNameInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/lookups/v2/RateLimit.java b/src/main/java/com/twilio/rest/lookups/v2/RateLimit.java index 0bb4d4ce4c..58a3230af5 100644 --- a/src/main/java/com/twilio/rest/lookups/v2/RateLimit.java +++ b/src/main/java/com/twilio/rest/lookups/v2/RateLimit.java @@ -48,6 +48,7 @@ public static RateLimitFetcher fetcher() { } @JsonDeserialize(builder = RateLimitResponse.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class RateLimitResponse { @@ -96,6 +97,7 @@ public static RateLimitResponse fromJson( return mapper.readValue(jsonString, RateLimitResponse.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/marketplace/v1/ReferralConversion.java b/src/main/java/com/twilio/rest/marketplace/v1/ReferralConversion.java index 0951f3f4e0..a8eb9257ec 100644 --- a/src/main/java/com/twilio/rest/marketplace/v1/ReferralConversion.java +++ b/src/main/java/com/twilio/rest/marketplace/v1/ReferralConversion.java @@ -49,6 +49,7 @@ public static ReferralConversionCreator creator( } @JsonDeserialize(builder = CreateReferralConversionRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateReferralConversionRequest { @@ -76,6 +77,7 @@ public static CreateReferralConversionRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/marketplace/v1/installedaddon/InstalledAddOnUsage.java b/src/main/java/com/twilio/rest/marketplace/v1/installedaddon/InstalledAddOnUsage.java index 2ec3ebe799..562f1de4a4 100644 --- a/src/main/java/com/twilio/rest/marketplace/v1/installedaddon/InstalledAddOnUsage.java +++ b/src/main/java/com/twilio/rest/marketplace/v1/installedaddon/InstalledAddOnUsage.java @@ -57,6 +57,7 @@ public static InstalledAddOnUsageCreator creator( @JsonDeserialize( builder = MarketplaceV1InstalledAddOnInstalledAddOnUsage.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MarketplaceV1InstalledAddOnInstalledAddOnUsage { @@ -98,6 +99,7 @@ public static MarketplaceV1InstalledAddOnInstalledAddOnUsage fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -157,6 +159,7 @@ public int hashCode() { @JsonDeserialize( builder = MarketplaceV1InstalledAddOnInstalledAddOnUsageBillableItems.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MarketplaceV1InstalledAddOnInstalledAddOnUsageBillableItems { @@ -201,6 +204,7 @@ public static MarketplaceV1InstalledAddOnInstalledAddOnUsageBillableItems fromJs ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/Bulk.java b/src/main/java/com/twilio/rest/memory/v1/Bulk.java index 87b3c38dd3..e0743bbe86 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Bulk.java +++ b/src/main/java/com/twilio/rest/memory/v1/Bulk.java @@ -293,6 +293,7 @@ public static BulkUpdater updater( } @JsonDeserialize(builder = UpdateProfilesBulkRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class UpdateProfilesBulkRequest { @@ -320,6 +321,7 @@ public static UpdateProfilesBulkRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -359,6 +361,7 @@ public int hashCode() { } @JsonDeserialize(builder = ProfileData.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ProfileData { @@ -383,6 +386,7 @@ public static ProfileData fromJson( return mapper.readValue(jsonString, ProfileData.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/BulkUpdater.java b/src/main/java/com/twilio/rest/memory/v1/BulkUpdater.java index 38857f873a..a8ccbc31d4 100644 --- a/src/main/java/com/twilio/rest/memory/v1/BulkUpdater.java +++ b/src/main/java/com/twilio/rest/memory/v1/BulkUpdater.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -71,16 +70,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/ConversationSummary.java b/src/main/java/com/twilio/rest/memory/v1/ConversationSummary.java index bf7129d453..f3d706c327 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ConversationSummary.java +++ b/src/main/java/com/twilio/rest/memory/v1/ConversationSummary.java @@ -513,6 +513,7 @@ public static ContentEncoding forValue(final String value) { } @JsonDeserialize(builder = CreateSummariesRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateSummariesRequest { @@ -537,6 +538,7 @@ public static CreateSummariesRequest fromJson( return mapper.readValue(jsonString, CreateSummariesRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -576,6 +578,7 @@ public int hashCode() { } @JsonDeserialize(builder = ObservationsMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ObservationsMeta { @@ -618,6 +621,7 @@ public static ObservationsMeta fromJson( return mapper.readValue(jsonString, ObservationsMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -692,6 +696,7 @@ public int hashCode() { } @JsonDeserialize(builder = SummaryCorePatch.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SummaryCorePatch { @@ -736,6 +741,7 @@ public static SummaryCorePatch fromJson( return mapper.readValue(jsonString, SummaryCorePatch.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -818,6 +824,7 @@ public int hashCode() { } @JsonDeserialize(builder = SummaryCore.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SummaryCore { @@ -866,6 +873,7 @@ public static SummaryCore fromJson( return mapper.readValue(jsonString, SummaryCore.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -934,6 +942,7 @@ public int hashCode() { } @JsonDeserialize(builder = SummaryInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class SummaryInfo { @@ -1014,6 +1023,7 @@ public static SummaryInfo fromJson( return mapper.readValue(jsonString, SummaryInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryDeleter.java b/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryDeleter.java index df8bd22015..19dbee87fa 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryDeleter.java +++ b/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -81,16 +80,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryFetcher.java b/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryFetcher.java index 350ab42fb7..69ac788415 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -75,16 +74,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryPatcher.java b/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryPatcher.java index f9be3acb63..cff8ae1b16 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryPatcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/ConversationSummaryPatcher.java @@ -20,7 +20,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -91,16 +90,6 @@ public ConversationSummary.PatchConversationSummaryResponse patch( ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/DataMapping.java b/src/main/java/com/twilio/rest/memory/v1/DataMapping.java index 32da91ffbb..77db7dffac 100644 --- a/src/main/java/com/twilio/rest/memory/v1/DataMapping.java +++ b/src/main/java/com/twilio/rest/memory/v1/DataMapping.java @@ -576,6 +576,7 @@ public static DataMappingType forValue(final String value) { } @JsonDeserialize(builder = Meta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Meta { @@ -616,6 +617,7 @@ public static Meta fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Meta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -690,6 +692,7 @@ public int hashCode() { } @JsonDeserialize(builder = DataMappingCore.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class DataMappingCore { @@ -732,6 +735,7 @@ public static DataMappingCore fromJson( return mapper.readValue(jsonString, DataMappingCore.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -806,6 +810,7 @@ public int hashCode() { } @JsonDeserialize(builder = DataMappingToTraits.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class DataMappingToTraits { @@ -839,6 +844,7 @@ public static DataMappingToTraits fromJson( return mapper.readValue(jsonString, DataMappingToTraits.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -886,6 +892,7 @@ public int hashCode() { } @JsonDeserialize(builder = MappingTraitItem.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MappingTraitItem { @@ -932,6 +939,7 @@ public static MappingTraitItem fromJson( return mapper.readValue(jsonString, MappingTraitItem.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -996,6 +1004,7 @@ public int hashCode() { } @JsonDeserialize(builder = CreateDataMappingInput.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateDataMappingInput { @@ -1048,6 +1057,7 @@ public static CreateDataMappingInput fromJson( return mapper.readValue(jsonString, CreateDataMappingInput.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1131,6 +1141,7 @@ public int hashCode() { } @JsonDeserialize(builder = DataMappingFromDataSet.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class DataMappingFromDataSet { @@ -1164,6 +1175,7 @@ public static DataMappingFromDataSet fromJson( return mapper.readValue(jsonString, DataMappingFromDataSet.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1211,6 +1223,7 @@ public int hashCode() { } @JsonDeserialize(builder = _DataMapping.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class _DataMapping { @@ -1303,6 +1316,7 @@ public static _DataMapping fromJson( return mapper.readValue(jsonString, _DataMapping.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/DataMappingDeleter.java b/src/main/java/com/twilio/rest/memory/v1/DataMappingDeleter.java index 4e68de0044..2c06d4e8ec 100644 --- a/src/main/java/com/twilio/rest/memory/v1/DataMappingDeleter.java +++ b/src/main/java/com/twilio/rest/memory/v1/DataMappingDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -73,16 +72,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/DataMappingFetcher.java b/src/main/java/com/twilio/rest/memory/v1/DataMappingFetcher.java index 5b58727481..c57cde41fa 100644 --- a/src/main/java/com/twilio/rest/memory/v1/DataMappingFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/DataMappingFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -67,16 +66,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/DataMappingPatcher.java b/src/main/java/com/twilio/rest/memory/v1/DataMappingPatcher.java index d508c500bf..ced07ea256 100644 --- a/src/main/java/com/twilio/rest/memory/v1/DataMappingPatcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/DataMappingPatcher.java @@ -22,7 +22,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -90,16 +89,6 @@ public DataMapping.PatchDataMappingResponse patch( ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/Event.java b/src/main/java/com/twilio/rest/memory/v1/Event.java index 96ef0079c0..cc102a16e5 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Event.java +++ b/src/main/java/com/twilio/rest/memory/v1/Event.java @@ -340,6 +340,7 @@ public static Direction forValue(final String value) { @JsonDeserialize( builder = CommunicationLifecycleEventRecipient.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CommunicationLifecycleEventRecipient { @@ -376,6 +377,7 @@ public static CommunicationLifecycleEventRecipient fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -424,6 +426,7 @@ public int hashCode() { } @JsonDeserialize(builder = ProfileEventRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ProfileEventRequest { @@ -457,6 +460,7 @@ public static ProfileEventRequest fromJson( return mapper.readValue(jsonString, ProfileEventRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -506,6 +510,7 @@ public int hashCode() { } @JsonDeserialize(builder = CommunicationLifecycleEventSender.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CommunicationLifecycleEventSender { @@ -542,6 +547,7 @@ public static CommunicationLifecycleEventSender fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -590,49 +596,52 @@ public int hashCode() { } @JsonDeserialize(builder = ProfileEventRequestEvents.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ProfileEventRequestEvents { + @JsonDeserialize(using = com.twilio.converter.ISO8601Deserializer.class) + @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("communicationId") + @JsonProperty("timestamp") @Getter - private final String communicationId; + private final ZonedDateTime timestamp; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("communicationStatus") + @JsonProperty("lifecycle") @Getter - private final String communicationStatus; + private final String lifecycle; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("communicationType") + @JsonProperty("conversationId") @Getter - private final String communicationType; + private final String conversationId; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("conversationId") + @JsonProperty("communicationId") @Getter - private final String conversationId; + private final String communicationId; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("direction") + @JsonProperty("communicationType") @Getter - private final Event.Direction direction; + private final String communicationType; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("errorCode") + @JsonProperty("communicationStatus") @Getter - private final String errorCode; + private final String communicationStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("errorMessage") + @JsonProperty("direction") @Getter - private final String errorMessage; + private final Event.Direction direction; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("lifecycle") + @JsonProperty("sender") @Getter - private final String lifecycle; + private final CommunicationLifecycleEventSender sender; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("recipient") @@ -640,29 +649,27 @@ public static class ProfileEventRequestEvents { private final CommunicationLifecycleEventRecipient recipient; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("sender") + @JsonProperty("errorCode") @Getter - private final CommunicationLifecycleEventSender sender; + private final String errorCode; - @JsonDeserialize(using = com.twilio.converter.ISO8601Deserializer.class) - @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("timestamp") + @JsonProperty("errorMessage") @Getter - private final ZonedDateTime timestamp; + private final String errorMessage; private ProfileEventRequestEvents(Builder builder) { + this.timestamp = builder.timestamp; + this.lifecycle = builder.lifecycle; + this.conversationId = builder.conversationId; this.communicationId = builder.communicationId; - this.communicationStatus = builder.communicationStatus; this.communicationType = builder.communicationType; - this.conversationId = builder.conversationId; + this.communicationStatus = builder.communicationStatus; this.direction = builder.direction; + this.sender = builder.sender; + this.recipient = builder.recipient; this.errorCode = builder.errorCode; this.errorMessage = builder.errorMessage; - this.lifecycle = builder.lifecycle; - this.recipient = builder.recipient; - this.sender = builder.sender; - this.timestamp = builder.timestamp; } public static Builder builder() { @@ -679,99 +686,104 @@ public static ProfileEventRequestEvents fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { + @JsonDeserialize( + using = com.twilio.converter.ISO8601Deserializer.class + ) + @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) + @JsonProperty("timestamp") + private ZonedDateTime timestamp; + + @JsonProperty("lifecycle") + private String lifecycle; + + @JsonProperty("conversationId") + private String conversationId; + @JsonProperty("communicationId") private String communicationId; - @JsonProperty("communicationStatus") - private String communicationStatus; - @JsonProperty("communicationType") private String communicationType; - @JsonProperty("conversationId") - private String conversationId; + @JsonProperty("communicationStatus") + private String communicationStatus; @JsonProperty("direction") private Event.Direction direction; + @JsonProperty("sender") + private CommunicationLifecycleEventSender sender; + + @JsonProperty("recipient") + private CommunicationLifecycleEventRecipient recipient; + @JsonProperty("errorCode") private String errorCode; @JsonProperty("errorMessage") private String errorMessage; - @JsonProperty("lifecycle") - private String lifecycle; - - @JsonProperty("recipient") - private CommunicationLifecycleEventRecipient recipient; - - @JsonProperty("sender") - private CommunicationLifecycleEventSender sender; - @JsonDeserialize( using = com.twilio.converter.ISO8601Deserializer.class ) @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) - @JsonProperty("timestamp") - private ZonedDateTime timestamp; - @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("communicationId") - public Builder communicationId(String communicationId) { - this.communicationId = communicationId; + @JsonProperty("timestamp") + public Builder timestamp(ZonedDateTime timestamp) { + this.timestamp = timestamp; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("communicationStatus") - public Builder communicationStatus(String communicationStatus) { - this.communicationStatus = communicationStatus; + @JsonProperty("lifecycle") + public Builder lifecycle(String lifecycle) { + this.lifecycle = lifecycle; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("communicationType") - public Builder communicationType(String communicationType) { - this.communicationType = communicationType; + @JsonProperty("conversationId") + public Builder conversationId(String conversationId) { + this.conversationId = conversationId; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("conversationId") - public Builder conversationId(String conversationId) { - this.conversationId = conversationId; + @JsonProperty("communicationId") + public Builder communicationId(String communicationId) { + this.communicationId = communicationId; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("direction") - public Builder direction(Event.Direction direction) { - this.direction = direction; + @JsonProperty("communicationType") + public Builder communicationType(String communicationType) { + this.communicationType = communicationType; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("errorCode") - public Builder errorCode(String errorCode) { - this.errorCode = errorCode; + @JsonProperty("communicationStatus") + public Builder communicationStatus(String communicationStatus) { + this.communicationStatus = communicationStatus; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("errorMessage") - public Builder errorMessage(String errorMessage) { - this.errorMessage = errorMessage; + @JsonProperty("direction") + public Builder direction(Event.Direction direction) { + this.direction = direction; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("lifecycle") - public Builder lifecycle(String lifecycle) { - this.lifecycle = lifecycle; + @JsonProperty("sender") + public Builder sender(CommunicationLifecycleEventSender sender) { + this.sender = sender; return this; } @@ -785,20 +797,16 @@ public Builder recipient( } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("sender") - public Builder sender(CommunicationLifecycleEventSender sender) { - this.sender = sender; + @JsonProperty("errorCode") + public Builder errorCode(String errorCode) { + this.errorCode = errorCode; return this; } - @JsonDeserialize( - using = com.twilio.converter.ISO8601Deserializer.class - ) - @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("timestamp") - public Builder timestamp(ZonedDateTime timestamp) { - this.timestamp = timestamp; + @JsonProperty("errorMessage") + public Builder errorMessage(String errorMessage) { + this.errorMessage = errorMessage; return this; } @@ -819,37 +827,37 @@ public boolean equals(final Object o) { ProfileEventRequestEvents other = (ProfileEventRequestEvents) o; return ( + Objects.equals(timestamp, other.timestamp) && + Objects.equals(lifecycle, other.lifecycle) && + Objects.equals(conversationId, other.conversationId) && Objects.equals(communicationId, other.communicationId) && + Objects.equals(communicationType, other.communicationType) && Objects.equals( communicationStatus, other.communicationStatus ) && - Objects.equals(communicationType, other.communicationType) && - Objects.equals(conversationId, other.conversationId) && Objects.equals(direction, other.direction) && - Objects.equals(errorCode, other.errorCode) && - Objects.equals(errorMessage, other.errorMessage) && - Objects.equals(lifecycle, other.lifecycle) && - Objects.equals(recipient, other.recipient) && Objects.equals(sender, other.sender) && - Objects.equals(timestamp, other.timestamp) + Objects.equals(recipient, other.recipient) && + Objects.equals(errorCode, other.errorCode) && + Objects.equals(errorMessage, other.errorMessage) ); } @Override public int hashCode() { return Objects.hash( + timestamp, + lifecycle, + conversationId, communicationId, - communicationStatus, communicationType, - conversationId, + communicationStatus, direction, - errorCode, - errorMessage, - lifecycle, - recipient, sender, - timestamp + recipient, + errorCode, + errorMessage ); } } diff --git a/src/main/java/com/twilio/rest/memory/v1/Identifier.java b/src/main/java/com/twilio/rest/memory/v1/Identifier.java index ccf53c778a..32d43d9850 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Identifier.java +++ b/src/main/java/com/twilio/rest/memory/v1/Identifier.java @@ -392,6 +392,7 @@ public static IdentifierPatcher patcher( } @JsonDeserialize(builder = _Identifier.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class _Identifier { @@ -422,6 +423,7 @@ public static _Identifier fromJson( return mapper.readValue(jsonString, _Identifier.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -469,6 +471,7 @@ public int hashCode() { } @JsonDeserialize(builder = IdentifierSet.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IdentifierSet { @@ -502,6 +505,7 @@ public static IdentifierSet fromJson( return mapper.readValue(jsonString, IdentifierSet.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -549,6 +553,7 @@ public int hashCode() { } @JsonDeserialize(builder = IdentifierUpdate.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IdentifierUpdate { @@ -589,6 +594,7 @@ public static IdentifierUpdate fromJson( return mapper.readValue(jsonString, IdentifierUpdate.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/IdentifierDeleter.java b/src/main/java/com/twilio/rest/memory/v1/IdentifierDeleter.java index 72f60b0bae..92ba6d6bf8 100644 --- a/src/main/java/com/twilio/rest/memory/v1/IdentifierDeleter.java +++ b/src/main/java/com/twilio/rest/memory/v1/IdentifierDeleter.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -83,16 +82,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/IdentifierFetcher.java b/src/main/java/com/twilio/rest/memory/v1/IdentifierFetcher.java index b9ee9bb37e..4bba13d2d8 100644 --- a/src/main/java/com/twilio/rest/memory/v1/IdentifierFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/IdentifierFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -71,16 +70,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/IdentifierPatcher.java b/src/main/java/com/twilio/rest/memory/v1/IdentifierPatcher.java index 1a8b857033..f8556e569a 100644 --- a/src/main/java/com/twilio/rest/memory/v1/IdentifierPatcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/IdentifierPatcher.java @@ -20,7 +20,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -87,16 +86,6 @@ public Identifier.PatchIdentifierResponse patch( ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSetting.java b/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSetting.java index 665e6ce8e2..d075cc9690 100644 --- a/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSetting.java +++ b/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSetting.java @@ -428,6 +428,7 @@ public static MatchingAlgo forValue(final String value) { } @JsonDeserialize(builder = IdentifierConfig.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IdentifierConfig { @@ -488,6 +489,7 @@ public static IdentifierConfig fromJson( return mapper.readValue(jsonString, IdentifierConfig.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -607,6 +609,7 @@ public int hashCode() { } @JsonDeserialize(builder = IdentityResolutionSettingsCore.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class IdentityResolutionSettingsCore { @@ -640,6 +643,7 @@ public static IdentityResolutionSettingsCore fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingFetcher.java b/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingFetcher.java index f7cf5cd0a9..64308d3255 100644 --- a/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -59,16 +58,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingUpdater.java b/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingUpdater.java index d54e7ff1ba..00f49031dc 100644 --- a/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingUpdater.java +++ b/src/main/java/com/twilio/rest/memory/v1/IdentityResolutionSettingUpdater.java @@ -23,7 +23,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -84,16 +83,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/Import.java b/src/main/java/com/twilio/rest/memory/v1/Import.java index d11d290672..be22903619 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Import.java +++ b/src/main/java/com/twilio/rest/memory/v1/Import.java @@ -403,6 +403,7 @@ public static Status forValue(final String value) { @JsonDeserialize( builder = FetchProfileImportV2200ResponseSummary.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class FetchProfileImportV2200ResponseSummary { @@ -436,6 +437,7 @@ public static FetchProfileImportV2200ResponseSummary fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -489,6 +491,7 @@ public int hashCode() { } @JsonDeserialize(builder = CreateProfilesImportV2Request.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateProfilesImportV2Request { @@ -532,6 +535,7 @@ public static CreateProfilesImportV2Request fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -588,6 +592,7 @@ public int hashCode() { } @JsonDeserialize(builder = ColumnMappingItem.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ColumnMappingItem { @@ -628,6 +633,7 @@ public static ColumnMappingItem fromJson( return mapper.readValue(jsonString, ColumnMappingItem.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/ImportFetcher.java b/src/main/java/com/twilio/rest/memory/v1/ImportFetcher.java index fc9fe5b1e4..f13330c88b 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ImportFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/ImportFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -59,16 +58,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/Lookup.java b/src/main/java/com/twilio/rest/memory/v1/Lookup.java index fdb61fa975..201dd73a2d 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Lookup.java +++ b/src/main/java/com/twilio/rest/memory/v1/Lookup.java @@ -300,6 +300,7 @@ public static LookupCreator creator( } @JsonDeserialize(builder = Identifier.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Identifier { @@ -330,6 +331,7 @@ public static Identifier fromJson( return mapper.readValue(jsonString, Identifier.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/Observation.java b/src/main/java/com/twilio/rest/memory/v1/Observation.java index 23c85ab56d..5c7739746f 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Observation.java +++ b/src/main/java/com/twilio/rest/memory/v1/Observation.java @@ -528,6 +528,7 @@ public static ContentEncoding forValue(final String value) { } @JsonDeserialize(builder = ObservationsMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ObservationsMeta { @@ -570,6 +571,7 @@ public static ObservationsMeta fromJson( return mapper.readValue(jsonString, ObservationsMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -644,6 +646,7 @@ public int hashCode() { } @JsonDeserialize(builder = ObservationCore.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ObservationCore { @@ -692,6 +695,7 @@ public static ObservationCore fromJson( return mapper.readValue(jsonString, ObservationCore.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -760,6 +764,7 @@ public int hashCode() { } @JsonDeserialize(builder = CreateObservationsRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateObservationsRequest { @@ -789,6 +794,7 @@ public static CreateObservationsRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -830,6 +836,7 @@ public int hashCode() { } @JsonDeserialize(builder = ObservationInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ObservationInfo { @@ -910,6 +917,7 @@ public static ObservationInfo fromJson( return mapper.readValue(jsonString, ObservationInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/ObservationDeleter.java b/src/main/java/com/twilio/rest/memory/v1/ObservationDeleter.java index d65aa61e7d..f6fe5af060 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ObservationDeleter.java +++ b/src/main/java/com/twilio/rest/memory/v1/ObservationDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -81,16 +80,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/ObservationFetcher.java b/src/main/java/com/twilio/rest/memory/v1/ObservationFetcher.java index 9656a63acb..b43fc19070 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ObservationFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/ObservationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -75,16 +74,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/ObservationPatcher.java b/src/main/java/com/twilio/rest/memory/v1/ObservationPatcher.java index da2044d8fa..3b247f5132 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ObservationPatcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/ObservationPatcher.java @@ -20,7 +20,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -91,16 +90,6 @@ public Observation.PatchObservationResponse patch( ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/Operation.java b/src/main/java/com/twilio/rest/memory/v1/Operation.java index 26c384e9f5..254be64a60 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Operation.java +++ b/src/main/java/com/twilio/rest/memory/v1/Operation.java @@ -407,6 +407,7 @@ public static Type forValue(final String value) { } @JsonDeserialize(builder = OperationResultResourceId.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperationResultResourceId { @@ -443,6 +444,7 @@ public static OperationResultResourceId fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -489,6 +491,7 @@ public int hashCode() { } @JsonDeserialize(builder = OperationStatusError.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class OperationStatusError { @@ -531,6 +534,7 @@ public static OperationStatusError fromJson( return mapper.readValue(jsonString, OperationStatusError.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/OperationFetcher.java b/src/main/java/com/twilio/rest/memory/v1/OperationFetcher.java index 5fc772e59d..5bb8dba287 100644 --- a/src/main/java/com/twilio/rest/memory/v1/OperationFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/OperationFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -60,16 +59,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/Profile.java b/src/main/java/com/twilio/rest/memory/v1/Profile.java index 1b961e6d3d..d1227fa347 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Profile.java +++ b/src/main/java/com/twilio/rest/memory/v1/Profile.java @@ -405,6 +405,7 @@ public static OrderBy forValue(final String value) { } @JsonDeserialize(builder = ProfilesMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ProfilesMeta { @@ -447,6 +448,7 @@ public static ProfilesMeta fromJson( return mapper.readValue(jsonString, ProfilesMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -521,6 +523,7 @@ public int hashCode() { } @JsonDeserialize(builder = ProfileData.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ProfileData { @@ -545,6 +548,7 @@ public static ProfileData fromJson( return mapper.readValue(jsonString, ProfileData.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -584,6 +588,7 @@ public int hashCode() { } @JsonDeserialize(builder = ProfilePatch.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ProfilePatch { @@ -608,6 +613,7 @@ public static ProfilePatch fromJson( return mapper.readValue(jsonString, ProfilePatch.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/ProfileDeleter.java b/src/main/java/com/twilio/rest/memory/v1/ProfileDeleter.java index c3b68135a4..37dcd8f095 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ProfileDeleter.java +++ b/src/main/java/com/twilio/rest/memory/v1/ProfileDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -69,16 +68,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/ProfileFetcher.java b/src/main/java/com/twilio/rest/memory/v1/ProfileFetcher.java index aa484a5e10..5a5bc01729 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ProfileFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/ProfileFetcher.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -74,16 +73,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/ProfilePatcher.java b/src/main/java/com/twilio/rest/memory/v1/ProfilePatcher.java index 8b37b2def4..a4692dfc4f 100644 --- a/src/main/java/com/twilio/rest/memory/v1/ProfilePatcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/ProfilePatcher.java @@ -20,7 +20,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -79,16 +78,6 @@ public Profile.PatchProfileResponse patch(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/Recall.java b/src/main/java/com/twilio/rest/memory/v1/Recall.java index dc030cf9de..8d6caac34d 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Recall.java +++ b/src/main/java/com/twilio/rest/memory/v1/Recall.java @@ -423,6 +423,7 @@ public static ContentEncoding forValue(final String value) { } @JsonDeserialize(builder = MemoryRetrievalResponseMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MemoryRetrievalResponseMeta { @@ -450,6 +451,7 @@ public static MemoryRetrievalResponseMeta fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -487,6 +489,7 @@ public int hashCode() { } @JsonDeserialize(builder = Participant.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Participant { @@ -546,6 +549,7 @@ public static Participant fromJson( return mapper.readValue(jsonString, Participant.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -627,6 +631,7 @@ public int hashCode() { } @JsonDeserialize(builder = CommunicationContent.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CommunicationContent { @@ -651,6 +656,7 @@ public static CommunicationContent fromJson( return mapper.readValue(jsonString, CommunicationContent.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -690,6 +696,7 @@ public int hashCode() { } @JsonDeserialize(builder = CommunicationRecipients.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CommunicationRecipients { @@ -755,6 +762,7 @@ public static CommunicationRecipients fromJson( return mapper.readValue(jsonString, CommunicationRecipients.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -857,6 +865,7 @@ public int hashCode() { } @JsonDeserialize(builder = MemoryRetrievalRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MemoryRetrievalRequest { @@ -927,6 +936,7 @@ public static MemoryRetrievalRequest fromJson( return mapper.readValue(jsonString, MemoryRetrievalRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1073,6 +1083,7 @@ public int hashCode() { } @JsonDeserialize(builder = RecallObservationInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class RecallObservationInfo { @@ -1159,6 +1170,7 @@ public static RecallObservationInfo fromJson( return mapper.readValue(jsonString, RecallObservationInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1273,6 +1285,7 @@ public int hashCode() { } @JsonDeserialize(builder = RecallSummaryInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class RecallSummaryInfo { @@ -1359,6 +1372,7 @@ public static RecallSummaryInfo fromJson( return mapper.readValue(jsonString, RecallSummaryInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1473,6 +1487,7 @@ public int hashCode() { } @JsonDeserialize(builder = Communication.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Communication { @@ -1542,6 +1557,7 @@ public static Communication fromJson( return mapper.readValue(jsonString, Communication.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/Revision.java b/src/main/java/com/twilio/rest/memory/v1/Revision.java index 431b059c99..f738e397f3 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Revision.java +++ b/src/main/java/com/twilio/rest/memory/v1/Revision.java @@ -360,6 +360,7 @@ public static RevisionReader reader( } @JsonDeserialize(builder = ObservationsMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ObservationsMeta { @@ -402,6 +403,7 @@ public static ObservationsMeta fromJson( return mapper.readValue(jsonString, ObservationsMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -476,6 +478,7 @@ public int hashCode() { } @JsonDeserialize(builder = ObservationInfo.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ObservationInfo { @@ -556,6 +559,7 @@ public static ObservationInfo fromJson( return mapper.readValue(jsonString, ObservationInfo.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/Store.java b/src/main/java/com/twilio/rest/memory/v1/Store.java index 6770d7cc70..2f292dcead 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Store.java +++ b/src/main/java/com/twilio/rest/memory/v1/Store.java @@ -449,6 +449,7 @@ public static OrderBy forValue(final String value) { } @JsonDeserialize(builder = Meta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Meta { @@ -489,6 +490,7 @@ public static Meta fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Meta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -563,6 +565,7 @@ public int hashCode() { } @JsonDeserialize(builder = PatchStoreRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PatchStoreRequest { @@ -593,6 +596,7 @@ public static PatchStoreRequest fromJson( return mapper.readValue(jsonString, PatchStoreRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -645,6 +649,7 @@ public int hashCode() { } @JsonDeserialize(builder = ServiceRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ServiceRequest { @@ -675,6 +680,7 @@ public static ServiceRequest fromJson( return mapper.readValue(jsonString, ServiceRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/StoreDeleter.java b/src/main/java/com/twilio/rest/memory/v1/StoreDeleter.java index d7b5921624..f79a825451 100644 --- a/src/main/java/com/twilio/rest/memory/v1/StoreDeleter.java +++ b/src/main/java/com/twilio/rest/memory/v1/StoreDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -59,16 +58,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/StoreFetcher.java b/src/main/java/com/twilio/rest/memory/v1/StoreFetcher.java index 4b3c7f070b..4acbf36626 100644 --- a/src/main/java/com/twilio/rest/memory/v1/StoreFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/StoreFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -55,16 +54,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/StorePatcher.java b/src/main/java/com/twilio/rest/memory/v1/StorePatcher.java index c8f0d54dd6..0e9c10c237 100644 --- a/src/main/java/com/twilio/rest/memory/v1/StorePatcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/StorePatcher.java @@ -22,7 +22,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -76,16 +75,6 @@ public Store.PatchStoreResponse patch(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/Trait.java b/src/main/java/com/twilio/rest/memory/v1/Trait.java index 8fe8e53859..6c6f968633 100644 --- a/src/main/java/com/twilio/rest/memory/v1/Trait.java +++ b/src/main/java/com/twilio/rest/memory/v1/Trait.java @@ -336,6 +336,7 @@ public static OrderBy forValue(final String value) { } @JsonDeserialize(builder = ProfilesMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ProfilesMeta { @@ -378,6 +379,7 @@ public static ProfilesMeta fromJson( return mapper.readValue(jsonString, ProfilesMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -452,6 +454,7 @@ public int hashCode() { } @JsonDeserialize(builder = FullTrait.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class FullTrait { @@ -499,6 +502,7 @@ public static FullTrait fromJson( return mapper.readValue(jsonString, FullTrait.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/memory/v1/TraitGroup.java b/src/main/java/com/twilio/rest/memory/v1/TraitGroup.java index ad130d037c..1adffedbdb 100644 --- a/src/main/java/com/twilio/rest/memory/v1/TraitGroup.java +++ b/src/main/java/com/twilio/rest/memory/v1/TraitGroup.java @@ -463,7 +463,10 @@ public static DataType forValue(final String value) { } public enum RuleType { - STRING("STRING"); + STRING("STRING"), + NUMBER("NUMBER"), + BOOLEAN("BOOLEAN"), + ARRAY("ARRAY"); private final String value; @@ -483,6 +486,7 @@ public static RuleType forValue(final String value) { } @JsonDeserialize(builder = TraitDefinition.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TraitDefinition { @@ -519,6 +523,7 @@ public static TraitDefinition fromJson( return mapper.readValue(jsonString, TraitDefinition.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -582,6 +587,7 @@ public int hashCode() { } @JsonDeserialize(builder = TraitGroupCoreTraitsValue.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TraitGroupCoreTraitsValue { @@ -627,6 +633,7 @@ public static TraitGroupCoreTraitsValue fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -706,6 +713,7 @@ public int hashCode() { } @JsonDeserialize(builder = _TraitGroup.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class _TraitGroup { @@ -751,6 +759,7 @@ public static _TraitGroup fromJson( return mapper.readValue(jsonString, _TraitGroup.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -822,6 +831,7 @@ public int hashCode() { } @JsonDeserialize(builder = Meta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class Meta { @@ -862,6 +872,7 @@ public static Meta fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, Meta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -936,6 +947,7 @@ public int hashCode() { } @JsonDeserialize(builder = PatchTraitGroupRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PatchTraitGroupRequest { @@ -966,6 +978,7 @@ public static PatchTraitGroupRequest fromJson( return mapper.readValue(jsonString, PatchTraitGroupRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1018,6 +1031,7 @@ public int hashCode() { } @JsonDeserialize(builder = TraitGroupRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TraitGroupRequest { @@ -1054,6 +1068,7 @@ public static TraitGroupRequest fromJson( return mapper.readValue(jsonString, TraitGroupRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1119,19 +1134,20 @@ public int hashCode() { } @JsonDeserialize(builder = ValidationRule.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ValidationRule { @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("max") + @JsonProperty("pattern") @Getter - private final BigDecimal max; + private final String pattern; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("maxItems") + @JsonProperty("minLength") @Getter - private final Integer maxItems; + private final Integer minLength; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("maxLength") @@ -1139,39 +1155,39 @@ public static class ValidationRule { private final Integer maxLength; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("min") + @JsonProperty("ruleType") @Getter - private final BigDecimal min; + private final TraitGroup.RuleType ruleType; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("minItems") + @JsonProperty("min") @Getter - private final Integer minItems; + private final BigDecimal min; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("minLength") + @JsonProperty("max") @Getter - private final Integer minLength; + private final BigDecimal max; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("pattern") + @JsonProperty("minItems") @Getter - private final String pattern; + private final Integer minItems; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("ruleType") + @JsonProperty("maxItems") @Getter - private final TraitGroup.RuleType ruleType; + private final Integer maxItems; private ValidationRule(Builder builder) { - this.max = builder.max; - this.maxItems = builder.maxItems; + this.pattern = builder.pattern; + this.minLength = builder.minLength; this.maxLength = builder.maxLength; + this.ruleType = builder.ruleType; this.min = builder.min; + this.max = builder.max; this.minItems = builder.minItems; - this.minLength = builder.minLength; - this.pattern = builder.pattern; - this.ruleType = builder.ruleType; + this.maxItems = builder.maxItems; } public static Builder builder() { @@ -1185,44 +1201,45 @@ public static ValidationRule fromJson( return mapper.readValue(jsonString, ValidationRule.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { - @JsonProperty("max") - private BigDecimal max; + @JsonProperty("pattern") + private String pattern; - @JsonProperty("maxItems") - private Integer maxItems; + @JsonProperty("minLength") + private Integer minLength; @JsonProperty("maxLength") private Integer maxLength; + @JsonProperty("ruleType") + private TraitGroup.RuleType ruleType; + @JsonProperty("min") private BigDecimal min; + @JsonProperty("max") + private BigDecimal max; + @JsonProperty("minItems") private Integer minItems; - @JsonProperty("minLength") - private Integer minLength; - - @JsonProperty("pattern") - private String pattern; - - @JsonProperty("ruleType") - private TraitGroup.RuleType ruleType; + @JsonProperty("maxItems") + private Integer maxItems; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("max") - public Builder max(BigDecimal max) { - this.max = max; + @JsonProperty("pattern") + public Builder pattern(String pattern) { + this.pattern = pattern; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("maxItems") - public Builder maxItems(Integer maxItems) { - this.maxItems = maxItems; + @JsonProperty("minLength") + public Builder minLength(Integer minLength) { + this.minLength = minLength; return this; } @@ -1234,37 +1251,37 @@ public Builder maxLength(Integer maxLength) { } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("min") - public Builder min(BigDecimal min) { - this.min = min; + @JsonProperty("ruleType") + public Builder ruleType(TraitGroup.RuleType ruleType) { + this.ruleType = ruleType; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("minItems") - public Builder minItems(Integer minItems) { - this.minItems = minItems; + @JsonProperty("min") + public Builder min(BigDecimal min) { + this.min = min; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("minLength") - public Builder minLength(Integer minLength) { - this.minLength = minLength; + @JsonProperty("max") + public Builder max(BigDecimal max) { + this.max = max; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("pattern") - public Builder pattern(String pattern) { - this.pattern = pattern; + @JsonProperty("minItems") + public Builder minItems(Integer minItems) { + this.minItems = minItems; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("ruleType") - public Builder ruleType(TraitGroup.RuleType ruleType) { - this.ruleType = ruleType; + @JsonProperty("maxItems") + public Builder maxItems(Integer maxItems) { + this.maxItems = maxItems; return this; } @@ -1285,28 +1302,28 @@ public boolean equals(final Object o) { ValidationRule other = (ValidationRule) o; return ( - Objects.equals(max, other.max) && - Objects.equals(maxItems, other.maxItems) && + Objects.equals(pattern, other.pattern) && + Objects.equals(minLength, other.minLength) && Objects.equals(maxLength, other.maxLength) && + Objects.equals(ruleType, other.ruleType) && Objects.equals(min, other.min) && + Objects.equals(max, other.max) && Objects.equals(minItems, other.minItems) && - Objects.equals(minLength, other.minLength) && - Objects.equals(pattern, other.pattern) && - Objects.equals(ruleType, other.ruleType) + Objects.equals(maxItems, other.maxItems) ); } @Override public int hashCode() { return Objects.hash( - max, - maxItems, + pattern, + minLength, maxLength, + ruleType, min, + max, minItems, - minLength, - pattern, - ruleType + maxItems ); } } diff --git a/src/main/java/com/twilio/rest/memory/v1/TraitGroupDeleter.java b/src/main/java/com/twilio/rest/memory/v1/TraitGroupDeleter.java index e92479c8f6..1a62fdc11a 100644 --- a/src/main/java/com/twilio/rest/memory/v1/TraitGroupDeleter.java +++ b/src/main/java/com/twilio/rest/memory/v1/TraitGroupDeleter.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -70,16 +69,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/TraitGroupFetcher.java b/src/main/java/com/twilio/rest/memory/v1/TraitGroupFetcher.java index d872af1a77..c636418b67 100644 --- a/src/main/java/com/twilio/rest/memory/v1/TraitGroupFetcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/TraitGroupFetcher.java @@ -21,7 +21,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -94,16 +93,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/memory/v1/TraitGroupPatcher.java b/src/main/java/com/twilio/rest/memory/v1/TraitGroupPatcher.java index b6de736060..6f83758ac5 100644 --- a/src/main/java/com/twilio/rest/memory/v1/TraitGroupPatcher.java +++ b/src/main/java/com/twilio/rest/memory/v1/TraitGroupPatcher.java @@ -22,7 +22,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -90,16 +89,6 @@ public TraitGroup.PatchTraitGroupResponse patch( ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/main/java/com/twilio/rest/messaging/v2/ChannelsSender.java b/src/main/java/com/twilio/rest/messaging/v2/ChannelsSender.java index f64e8cac25..ed89358302 100644 --- a/src/main/java/com/twilio/rest/messaging/v2/ChannelsSender.java +++ b/src/main/java/com/twilio/rest/messaging/v2/ChannelsSender.java @@ -262,6 +262,7 @@ public static FallbackMethod forValue(final String value) { @JsonDeserialize( builder = MessagingV2ChannelsSenderProfileGenericResponseWebsites.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderProfileGenericResponseWebsites { @@ -297,6 +298,7 @@ public static MessagingV2ChannelsSenderProfileGenericResponseWebsites fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -352,6 +354,7 @@ public int hashCode() { } @JsonDeserialize(builder = MessagingV2ChannelsSenderProfile.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderProfile { @@ -457,6 +460,7 @@ public static MessagingV2ChannelsSenderProfile fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -657,6 +661,7 @@ public int hashCode() { } @JsonDeserialize(builder = MessagingV2RcsComplianceResponse.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2RcsComplianceResponse { @@ -690,6 +695,7 @@ public static MessagingV2RcsComplianceResponse fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -745,6 +751,7 @@ public int hashCode() { } @JsonDeserialize(builder = MessagingV2RcsCarrier.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2RcsCarrier { @@ -775,6 +782,7 @@ public static MessagingV2RcsCarrier fromJson( return mapper.readValue(jsonString, MessagingV2RcsCarrier.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -831,6 +839,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderRequestsCreate.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderRequestsCreate { @@ -876,6 +885,7 @@ public static MessagingV2ChannelsSenderRequestsCreate fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -953,6 +963,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderProfileGenericResponseEmails.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderProfileGenericResponseEmails { @@ -988,6 +999,7 @@ public static MessagingV2ChannelsSenderProfileGenericResponseEmails fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1045,6 +1057,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderProperties.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderProperties { @@ -1078,6 +1091,7 @@ public static MessagingV2ChannelsSenderProperties fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1133,6 +1147,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderOfflineReasonsItems.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderOfflineReasonsItems { @@ -1172,6 +1187,7 @@ public static MessagingV2ChannelsSenderOfflineReasonsItems fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1238,6 +1254,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderRequestsUpdate.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderRequestsUpdate { @@ -1277,6 +1294,7 @@ public static MessagingV2ChannelsSenderRequestsUpdate fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1345,6 +1363,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderProfileGenericResponsePhoneNumbers.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderProfileGenericResponsePhoneNumbers { @@ -1380,6 +1399,7 @@ public static MessagingV2ChannelsSenderProfileGenericResponsePhoneNumbers fromJs ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1437,6 +1457,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2RcsComplianceCountryResponse.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2RcsComplianceCountryResponse { @@ -1482,6 +1503,7 @@ public static MessagingV2RcsComplianceCountryResponse fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1557,6 +1579,7 @@ public int hashCode() { } @JsonDeserialize(builder = MessagingV2ChannelsSenderWebhook.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderWebhook { @@ -1614,6 +1637,7 @@ public static MessagingV2ChannelsSenderWebhook fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1724,6 +1748,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderProfileGenericResponse.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderProfileGenericResponse { @@ -1837,6 +1862,7 @@ public static MessagingV2ChannelsSenderProfileGenericResponse fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -2059,6 +2085,7 @@ public int hashCode() { @JsonDeserialize( builder = MessagingV2ChannelsSenderConfiguration.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class MessagingV2ChannelsSenderConfiguration { @@ -2110,6 +2137,7 @@ public static MessagingV2ChannelsSenderConfiguration fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/messaging/v3/TypingIndicator.java b/src/main/java/com/twilio/rest/messaging/v3/TypingIndicator.java index f0e83c4775..0945d5ec2f 100644 --- a/src/main/java/com/twilio/rest/messaging/v3/TypingIndicator.java +++ b/src/main/java/com/twilio/rest/messaging/v3/TypingIndicator.java @@ -51,7 +51,8 @@ public static TypingIndicatorCreator creator( } public enum Channel { - WHATSAPP("WHATSAPP"); + WHATSAPP("WHATSAPP"), + APPLE("APPLE"); private final String value; @@ -92,6 +93,7 @@ public static Event forValue(final String value) { } @JsonDeserialize(builder = TypingIndicatorRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class TypingIndicatorRequest { @@ -102,9 +104,9 @@ public static class TypingIndicatorRequest { private final TypingIndicator.Channel channel; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("event") + @JsonProperty("messageId") @Getter - private final TypingIndicator.Event event; + private final String messageId; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("from") @@ -112,21 +114,21 @@ public static class TypingIndicatorRequest { private final String from; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("messageId") + @JsonProperty("to") @Getter - private final String messageId; + private final String to; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("to") + @JsonProperty("event") @Getter - private final String to; + private final TypingIndicator.Event event; private TypingIndicatorRequest(Builder builder) { this.channel = builder.channel; - this.event = builder.event; - this.from = builder.from; this.messageId = builder.messageId; + this.from = builder.from; this.to = builder.to; + this.event = builder.event; } public static Builder builder() { @@ -140,24 +142,25 @@ public static TypingIndicatorRequest fromJson( return mapper.readValue(jsonString, TypingIndicatorRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @JsonProperty("channel") private TypingIndicator.Channel channel; - @JsonProperty("event") - private TypingIndicator.Event event; + @JsonProperty("messageId") + private String messageId; @JsonProperty("from") private String from; - @JsonProperty("messageId") - private String messageId; - @JsonProperty("to") private String to; + @JsonProperty("event") + private TypingIndicator.Event event; + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("channel") public Builder channel(TypingIndicator.Channel channel) { @@ -166,9 +169,9 @@ public Builder channel(TypingIndicator.Channel channel) { } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("event") - public Builder event(TypingIndicator.Event event) { - this.event = event; + @JsonProperty("messageId") + public Builder messageId(String messageId) { + this.messageId = messageId; return this; } @@ -180,16 +183,16 @@ public Builder from(String from) { } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("messageId") - public Builder messageId(String messageId) { - this.messageId = messageId; + @JsonProperty("to") + public Builder to(String to) { + this.to = to; return this; } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("to") - public Builder to(String to) { - this.to = to; + @JsonProperty("event") + public Builder event(TypingIndicator.Event event) { + this.event = event; return this; } @@ -211,16 +214,16 @@ public boolean equals(final Object o) { TypingIndicatorRequest other = (TypingIndicatorRequest) o; return ( Objects.equals(channel, other.channel) && - Objects.equals(event, other.event) && - Objects.equals(from, other.from) && Objects.equals(messageId, other.messageId) && - Objects.equals(to, other.to) + Objects.equals(from, other.from) && + Objects.equals(to, other.to) && + Objects.equals(event, other.event) ); } @Override public int hashCode() { - return Objects.hash(channel, event, from, messageId, to); + return Objects.hash(channel, messageId, from, to, event); } } diff --git a/src/main/java/com/twilio/rest/numbers/v1/EmbeddedSession.java b/src/main/java/com/twilio/rest/numbers/v1/EmbeddedSession.java index 0882fade7b..92c5ead34f 100644 --- a/src/main/java/com/twilio/rest/numbers/v1/EmbeddedSession.java +++ b/src/main/java/com/twilio/rest/numbers/v1/EmbeddedSession.java @@ -55,6 +55,7 @@ public static EmbeddedSessionCreator creator( @JsonDeserialize( builder = NumbersV1CreateEmbeddedSessionRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1CreateEmbeddedSessionRequest { @@ -82,6 +83,7 @@ public static NumbersV1CreateEmbeddedSessionRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/numbers/v1/PortingPortIn.java b/src/main/java/com/twilio/rest/numbers/v1/PortingPortIn.java index b42dbe6f6e..3a23e4ac6a 100644 --- a/src/main/java/com/twilio/rest/numbers/v1/PortingPortIn.java +++ b/src/main/java/com/twilio/rest/numbers/v1/PortingPortIn.java @@ -89,6 +89,7 @@ public static CustomerType forValue(final String value) { } @JsonDeserialize(builder = NumbersV1PortingAddress.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1PortingAddress { @@ -149,6 +150,7 @@ public static NumbersV1PortingAddress fromJson( return mapper.readValue(jsonString, NumbersV1PortingAddress.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -227,6 +229,7 @@ public int hashCode() { @JsonDeserialize( builder = NumbersV1PortingPortInCreatePhoneNumbers.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1PortingPortInCreatePhoneNumbers { @@ -260,6 +263,7 @@ public static NumbersV1PortingPortInCreatePhoneNumbers fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -315,6 +319,7 @@ public int hashCode() { @JsonDeserialize( builder = NumbersV1PortingPortInPhoneNumberResult.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1PortingPortInPhoneNumberResult { @@ -412,6 +417,7 @@ public static NumbersV1PortingPortInPhoneNumberResult fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -627,6 +633,7 @@ public int hashCode() { } @JsonDeserialize(builder = NumbersV1PortingPortInCreate.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1PortingPortInCreate { @@ -724,6 +731,7 @@ public static NumbersV1PortingPortInCreate fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -913,6 +921,7 @@ public int hashCode() { @JsonDeserialize( builder = NumbersV1PortingLosingCarrierInformation.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1PortingLosingCarrierInformation { @@ -1016,6 +1025,7 @@ public static NumbersV1PortingLosingCarrierInformation fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/numbers/v1/SenderIdRegistration.java b/src/main/java/com/twilio/rest/numbers/v1/SenderIdRegistration.java index 105e232896..ef06f9cac5 100644 --- a/src/main/java/com/twilio/rest/numbers/v1/SenderIdRegistration.java +++ b/src/main/java/com/twilio/rest/numbers/v1/SenderIdRegistration.java @@ -55,6 +55,7 @@ public static SenderIdRegistrationCreator creator( } @JsonDeserialize(builder = NumbersV1EmbeddedSession.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1EmbeddedSession { @@ -88,6 +89,7 @@ public static NumbersV1EmbeddedSession fromJson( return mapper.readValue(jsonString, NumbersV1EmbeddedSession.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -137,6 +139,7 @@ public int hashCode() { @JsonDeserialize( builder = NumbersV1CreateEmbeddedRegistrationRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class NumbersV1CreateEmbeddedRegistrationRequest { @@ -216,6 +219,7 @@ public static NumbersV1CreateEmbeddedRegistrationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/numbers/v2/Application.java b/src/main/java/com/twilio/rest/numbers/v2/Application.java index be5a48ba14..160c15af49 100644 --- a/src/main/java/com/twilio/rest/numbers/v2/Application.java +++ b/src/main/java/com/twilio/rest/numbers/v2/Application.java @@ -292,6 +292,7 @@ public static TrafficType forValue(final String value) { @JsonDeserialize( builder = CreateShortCodeApplicationResponseUserSignUp.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationResponseUserSignUp { @@ -368,6 +369,7 @@ public static CreateShortCodeApplicationResponseUserSignUp fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -523,6 +525,7 @@ public int hashCode() { } @JsonDeserialize(builder = CreateShortCodeApplicationRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationRequest { @@ -578,6 +581,7 @@ public static CreateShortCodeApplicationRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -652,6 +656,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateShortCodeApplicationResponseSetup.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationResponseSetup { @@ -739,6 +744,7 @@ public static CreateShortCodeApplicationResponseSetup fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -910,6 +916,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateShortCodeApplicationRequestSetup.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationRequestSetup { @@ -937,6 +944,7 @@ public static CreateShortCodeApplicationRequestSetup fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -979,6 +987,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateShortCodeApplicationResponseComplianceKeywords.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationResponseComplianceKeywords { @@ -1038,6 +1047,7 @@ public static CreateShortCodeApplicationResponseComplianceKeywords fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1139,6 +1149,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateShortCodeApplicationResponseBusinessInformation.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationResponseBusinessInformation { @@ -1192,6 +1203,7 @@ public static CreateShortCodeApplicationResponseBusinessInformation fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1306,6 +1318,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateShortCodeApplicationResponseContentExamples.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationResponseContentExamples { @@ -1335,6 +1348,7 @@ public static CreateShortCodeApplicationResponseContentExamples fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1379,6 +1393,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateShortCodeApplicationResponseSmsCampaignDetails.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationResponseSmsCampaignDetails { @@ -1508,6 +1523,7 @@ public static CreateShortCodeApplicationResponseSmsCampaignDetails fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1809,6 +1825,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateShortCodeApplicationRequestBusinessInformation.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateShortCodeApplicationRequestBusinessInformation { @@ -1838,6 +1855,7 @@ public static CreateShortCodeApplicationRequestBusinessInformation fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/previewiam/organizations/RoleAssignment.java b/src/main/java/com/twilio/rest/previewiam/organizations/RoleAssignment.java index c39064e215..648522a789 100644 --- a/src/main/java/com/twilio/rest/previewiam/organizations/RoleAssignment.java +++ b/src/main/java/com/twilio/rest/previewiam/organizations/RoleAssignment.java @@ -71,6 +71,7 @@ public static RoleAssignmentReader reader( @JsonDeserialize( builder = PublicApiCreateRoleAssignmentRequest.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class PublicApiCreateRoleAssignmentRequest { @@ -126,6 +127,7 @@ public static PublicApiCreateRoleAssignmentRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/previewiam/organizations/User.java b/src/main/java/com/twilio/rest/previewiam/organizations/User.java index 835f32374c..2a2076f331 100644 --- a/src/main/java/com/twilio/rest/previewiam/organizations/User.java +++ b/src/main/java/com/twilio/rest/previewiam/organizations/User.java @@ -91,6 +91,7 @@ public static UserUpdater updater( } @JsonDeserialize(builder = ScimUser.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ScimUser { @@ -173,6 +174,7 @@ public static ScimUser fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, ScimUser.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -334,6 +336,7 @@ public int hashCode() { } @JsonDeserialize(builder = ScimEmailAddress.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ScimEmailAddress { @@ -370,6 +373,7 @@ public static ScimEmailAddress fromJson( return mapper.readValue(jsonString, ScimEmailAddress.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -433,6 +437,7 @@ public int hashCode() { } @JsonDeserialize(builder = ScimMeta.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ScimMeta { @@ -477,6 +482,7 @@ public static ScimMeta fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, ScimMeta.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -567,6 +573,7 @@ public int hashCode() { } @JsonDeserialize(builder = ScimName.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ScimName { @@ -595,6 +602,7 @@ public static ScimName fromJson(String jsonString, ObjectMapper mapper) return mapper.readValue(jsonString, ScimName.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -647,6 +655,7 @@ public int hashCode() { } @JsonDeserialize(builder = ScimPatchOperation.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ScimPatchOperation { @@ -683,6 +692,7 @@ public static ScimPatchOperation fromJson( return mapper.readValue(jsonString, ScimPatchOperation.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -746,6 +756,7 @@ public int hashCode() { } @JsonDeserialize(builder = ScimPatchRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ScimPatchRequest { @@ -776,6 +787,7 @@ public static ScimPatchRequest fromJson( return mapper.readValue(jsonString, ScimPatchRequest.class); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/verify/v2/service/ApproveChallenge.java b/src/main/java/com/twilio/rest/verify/v2/service/ApproveChallenge.java index 1b2e97aa40..038a111c67 100644 --- a/src/main/java/com/twilio/rest/verify/v2/service/ApproveChallenge.java +++ b/src/main/java/com/twilio/rest/verify/v2/service/ApproveChallenge.java @@ -172,6 +172,7 @@ public static FactorType forValue(final String value) { @JsonDeserialize( builder = ApprovePasskeysChallengeRequestResponse.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ApprovePasskeysChallengeRequestResponse { @@ -221,6 +222,7 @@ public static ApprovePasskeysChallengeRequestResponse fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -293,6 +295,7 @@ public int hashCode() { } @JsonDeserialize(builder = ApprovePasskeysChallengeRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class ApprovePasskeysChallengeRequest { @@ -349,6 +352,7 @@ public static ApprovePasskeysChallengeRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/verify/v2/service/NewChallenge.java b/src/main/java/com/twilio/rest/verify/v2/service/NewChallenge.java index 08d232ccd4..47125a5565 100644 --- a/src/main/java/com/twilio/rest/verify/v2/service/NewChallenge.java +++ b/src/main/java/com/twilio/rest/verify/v2/service/NewChallenge.java @@ -126,6 +126,7 @@ public static FactorType forValue(final String value) { } @JsonDeserialize(builder = CreatePasskeysChallengeRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreatePasskeysChallengeRequest { @@ -159,6 +160,7 @@ public static CreatePasskeysChallengeRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/verify/v2/service/NewFactor.java b/src/main/java/com/twilio/rest/verify/v2/service/NewFactor.java index 3b28bf35a9..163568ebd7 100644 --- a/src/main/java/com/twilio/rest/verify/v2/service/NewFactor.java +++ b/src/main/java/com/twilio/rest/verify/v2/service/NewFactor.java @@ -176,6 +176,7 @@ public static DiscoverableCredentials forValue(final String value) { @JsonDeserialize( builder = CreateNewPasskeysFactorRequestConfigRelyingParty.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateNewPasskeysFactorRequestConfigRelyingParty { @@ -217,6 +218,7 @@ public static CreateNewPasskeysFactorRequestConfigRelyingParty fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -285,6 +287,7 @@ public int hashCode() { @JsonDeserialize( builder = CreateNewPasskeysFactorRequestConfig.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateNewPasskeysFactorRequestConfig { @@ -330,6 +333,7 @@ public static CreateNewPasskeysFactorRequestConfig fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -424,6 +428,7 @@ public int hashCode() { } @JsonDeserialize(builder = CreateNewPasskeysFactorRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateNewPasskeysFactorRequest { @@ -466,6 +471,7 @@ public static CreateNewPasskeysFactorRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/verify/v2/service/NewVerifyFactor.java b/src/main/java/com/twilio/rest/verify/v2/service/NewVerifyFactor.java index 578f84242e..c79231d416 100644 --- a/src/main/java/com/twilio/rest/verify/v2/service/NewVerifyFactor.java +++ b/src/main/java/com/twilio/rest/verify/v2/service/NewVerifyFactor.java @@ -171,6 +171,7 @@ public static FactorType forValue(final String value) { } @JsonDeserialize(builder = VerifyPasskeysFactorRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VerifyPasskeysFactorRequest { @@ -224,6 +225,7 @@ public static VerifyPasskeysFactorRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -324,6 +326,7 @@ public int hashCode() { @JsonDeserialize( builder = VerifyPasskeysFactorRequestResponse.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VerifyPasskeysFactorRequestResponse { @@ -363,6 +366,7 @@ public static VerifyPasskeysFactorRequestResponse fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/voice/v3/Transcription.java b/src/main/java/com/twilio/rest/voice/v3/Transcription.java index 71e515e96e..dc55713387 100644 --- a/src/main/java/com/twilio/rest/voice/v3/Transcription.java +++ b/src/main/java/com/twilio/rest/voice/v3/Transcription.java @@ -388,7 +388,8 @@ public static Status forValue(final String value) { } public enum InputSource { - SOURCE_ID("SOURCE_ID"); + SOURCE_ID("SOURCE_ID"), + MEDIA_URL("MEDIA_URL"); private final String value; @@ -470,6 +471,7 @@ public static Method forValue(final String value) { } @JsonDeserialize(builder = VoiceV3TranscriptionParticipant.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VoiceV3TranscriptionParticipant { @@ -515,6 +517,7 @@ public static VoiceV3TranscriptionParticipant fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -594,6 +597,7 @@ public int hashCode() { @JsonDeserialize( builder = VoiceV3TranscriptionTranscriptionStatusCallback.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VoiceV3TranscriptionTranscriptionStatusCallback { @@ -635,6 +639,7 @@ public static VoiceV3TranscriptionTranscriptionStatusCallback fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -703,6 +708,7 @@ public int hashCode() { @JsonDeserialize( builder = VoiceV3TranscriptionResolvedConfiguration.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VoiceV3TranscriptionResolvedConfiguration { @@ -764,6 +770,7 @@ public static VoiceV3TranscriptionResolvedConfiguration fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -887,16 +894,15 @@ public int hashCode() { } @JsonDeserialize(builder = CreateV3TranscriptionsRequest.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class CreateV3TranscriptionsRequest { - @JsonDeserialize(using = com.twilio.converter.ISO8601Deserializer.class) - @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("audioStartedAt") + @JsonProperty("transcriptionConfigurationId") @Getter - private final ZonedDateTime audioStartedAt; + private final String transcriptionConfigurationId; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("inputSource") @@ -904,9 +910,9 @@ public static class CreateV3TranscriptionsRequest { private final Transcription.InputSource inputSource; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("mediaUrl") + @JsonProperty("sourceId") @Getter - private final URI mediaUrl; + private final String sourceId; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("participants") @@ -914,23 +920,25 @@ public static class CreateV3TranscriptionsRequest { private final List participants; @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("sourceId") + @JsonProperty("mediaUrl") @Getter - private final String sourceId; + private final URI mediaUrl; + @JsonDeserialize(using = com.twilio.converter.ISO8601Deserializer.class) + @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("transcriptionConfigurationId") + @JsonProperty("audioStartedAt") @Getter - private final String transcriptionConfigurationId; + private final ZonedDateTime audioStartedAt; private CreateV3TranscriptionsRequest(Builder builder) { - this.audioStartedAt = builder.audioStartedAt; - this.inputSource = builder.inputSource; - this.mediaUrl = builder.mediaUrl; - this.participants = builder.participants; - this.sourceId = builder.sourceId; this.transcriptionConfigurationId = builder.transcriptionConfigurationId; + this.inputSource = builder.inputSource; + this.sourceId = builder.sourceId; + this.participants = builder.participants; + this.mediaUrl = builder.mediaUrl; + this.audioStartedAt = builder.audioStartedAt; } public static Builder builder() { @@ -947,39 +955,39 @@ public static CreateV3TranscriptionsRequest fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { - @JsonDeserialize( - using = com.twilio.converter.ISO8601Deserializer.class - ) - @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) - @JsonProperty("audioStartedAt") - private ZonedDateTime audioStartedAt; + @JsonProperty("transcriptionConfigurationId") + private String transcriptionConfigurationId; @JsonProperty("inputSource") private Transcription.InputSource inputSource; - @JsonProperty("mediaUrl") - private URI mediaUrl; + @JsonProperty("sourceId") + private String sourceId; @JsonProperty("participants") private List participants; - @JsonProperty("sourceId") - private String sourceId; - - @JsonProperty("transcriptionConfigurationId") - private String transcriptionConfigurationId; + @JsonProperty("mediaUrl") + private URI mediaUrl; @JsonDeserialize( using = com.twilio.converter.ISO8601Deserializer.class ) @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) - @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("audioStartedAt") - public Builder audioStartedAt(ZonedDateTime audioStartedAt) { - this.audioStartedAt = audioStartedAt; + private ZonedDateTime audioStartedAt; + + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonProperty("transcriptionConfigurationId") + public Builder transcriptionConfigurationId( + String transcriptionConfigurationId + ) { + this.transcriptionConfigurationId = + transcriptionConfigurationId; return this; } @@ -991,9 +999,9 @@ public Builder inputSource(Transcription.InputSource inputSource) { } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("mediaUrl") - public Builder mediaUrl(URI mediaUrl) { - this.mediaUrl = mediaUrl; + @JsonProperty("sourceId") + public Builder sourceId(String sourceId) { + this.sourceId = sourceId; return this; } @@ -1007,19 +1015,20 @@ public Builder participants( } @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("sourceId") - public Builder sourceId(String sourceId) { - this.sourceId = sourceId; + @JsonProperty("mediaUrl") + public Builder mediaUrl(URI mediaUrl) { + this.mediaUrl = mediaUrl; return this; } + @JsonDeserialize( + using = com.twilio.converter.ISO8601Deserializer.class + ) + @JsonSerialize(using = com.twilio.converter.ISO8601Serializer.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - @JsonProperty("transcriptionConfigurationId") - public Builder transcriptionConfigurationId( - String transcriptionConfigurationId - ) { - this.transcriptionConfigurationId = - transcriptionConfigurationId; + @JsonProperty("audioStartedAt") + public Builder audioStartedAt(ZonedDateTime audioStartedAt) { + this.audioStartedAt = audioStartedAt; return this; } @@ -1041,27 +1050,27 @@ public boolean equals(final Object o) { CreateV3TranscriptionsRequest other = (CreateV3TranscriptionsRequest) o; return ( - Objects.equals(audioStartedAt, other.audioStartedAt) && - Objects.equals(inputSource, other.inputSource) && - Objects.equals(mediaUrl, other.mediaUrl) && - Objects.equals(participants, other.participants) && - Objects.equals(sourceId, other.sourceId) && Objects.equals( transcriptionConfigurationId, other.transcriptionConfigurationId - ) + ) && + Objects.equals(inputSource, other.inputSource) && + Objects.equals(sourceId, other.sourceId) && + Objects.equals(participants, other.participants) && + Objects.equals(mediaUrl, other.mediaUrl) && + Objects.equals(audioStartedAt, other.audioStartedAt) ); } @Override public int hashCode() { return Objects.hash( - audioStartedAt, + transcriptionConfigurationId, inputSource, - mediaUrl, - participants, sourceId, - transcriptionConfigurationId + participants, + mediaUrl, + audioStartedAt ); } } @@ -1069,6 +1078,7 @@ public int hashCode() { @JsonDeserialize( builder = VoiceV3TranscriptionResolvedConfigurationParticipantDefaults.Builder.class ) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VoiceV3TranscriptionResolvedConfigurationParticipantDefaults { @@ -1107,6 +1117,7 @@ public static VoiceV3TranscriptionResolvedConfigurationParticipantDefaults fromJ ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { @@ -1159,6 +1170,7 @@ public int hashCode() { } @JsonDeserialize(builder = VoiceV3TranscriptionTranscription.Builder.class) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) @ToString public static class VoiceV3TranscriptionTranscription { @@ -1287,6 +1299,7 @@ public static VoiceV3TranscriptionTranscription fromJson( ); } + @JsonIgnoreProperties(ignoreUnknown = true) @JsonPOJOBuilder(withPrefix = "") public static class Builder { diff --git a/src/main/java/com/twilio/rest/voice/v3/TranscriptionFetcher.java b/src/main/java/com/twilio/rest/voice/v3/TranscriptionFetcher.java index 045619fef8..e4de7736dd 100644 --- a/src/main/java/com/twilio/rest/voice/v3/TranscriptionFetcher.java +++ b/src/main/java/com/twilio/rest/voice/v3/TranscriptionFetcher.java @@ -19,7 +19,6 @@ import com.twilio.exception.ApiConnectionException; import com.twilio.exception.ApiException; import com.twilio.exception.RestException; -import com.twilio.exception.RestStandardException; import com.twilio.http.HttpMethod; import com.twilio.http.Request; import com.twilio.http.Response; @@ -60,16 +59,6 @@ private Response makeRequest(final TwilioRestClient client) { ); } else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) { InputStream inputStream = response.getStream(); - RestStandardException standardException = - RestStandardException.fromJson( - inputStream, - client.getObjectMapper() - ); - if ( - standardException != null && standardException.getType() != null - ) { - throw new ApiException(standardException); - } RestException restException = RestException.fromJson( inputStream, client.getObjectMapper() diff --git a/src/test/java/com/twilio/rest/messaging/v2/ChannelsSenderForwardCompatibilityTest.java b/src/test/java/com/twilio/rest/messaging/v2/ChannelsSenderForwardCompatibilityTest.java new file mode 100644 index 0000000000..e8c7992ae8 --- /dev/null +++ b/src/test/java/com/twilio/rest/messaging/v2/ChannelsSenderForwardCompatibilityTest.java @@ -0,0 +1,260 @@ +package com.twilio.rest.messaging.v2; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +public class ChannelsSenderForwardCompatibilityTest { + + private ObjectMapper objectMapper; + + @Before + public void setUp() { + objectMapper = new ObjectMapper(); + } + + @Test + public void testTopLevelUnknownFieldsIgnored() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"ONLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"unknown_top_level_field\": \"should be ignored\"," + + "\"another_new_field\": 12345" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertEquals("XE1234567890abcdef1234567890abcdef", sender.getSid()); + assertEquals(ChannelsSender.Status.ONLINE, sender.getStatus()); + assertEquals("whatsapp:+15017122661", sender.getSenderId()); + } + + @Test + public void testNestedProfileGenericResponseUnknownFieldsIgnored() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"ONLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"profile\": {" + + " \"name\": \"Test Business\"," + + " \"about\": \"Test about\"," + + " \"pending_display_name\": \"New Name Pending Approval\"," + + " \"some_future_field\": true" + + "}" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertNotNull(sender.getProfile()); + assertEquals("Test Business", sender.getProfile().getName()); + assertEquals("Test about", sender.getProfile().getAbout()); + } + + @Test + public void testNestedConfigurationUnknownFieldsIgnored() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"ONLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"configuration\": {" + + " \"waba_id\": \"12345678912345\"," + + " \"verification_method\": \"sms\"," + + " \"new_config_option\": \"future value\"" + + "}" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertNotNull(sender.getConfiguration()); + assertEquals("12345678912345", sender.getConfiguration().getWabaId()); + assertEquals(ChannelsSender.VerificationMethod.SMS, sender.getConfiguration().getVerificationMethod()); + } + + @Test + public void testNestedWebhookUnknownFieldsIgnored() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"ONLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"webhook\": {" + + " \"callback_url\": \"https://example.com/callback\"," + + " \"callback_method\": \"POST\"," + + " \"new_webhook_field\": \"retry_policy_v2\"" + + "}" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertNotNull(sender.getWebhook()); + assertEquals("https://example.com/callback", sender.getWebhook().getCallbackUrl()); + assertEquals(ChannelsSender.CallbackMethod.POST, sender.getWebhook().getCallbackMethod()); + } + + @Test + public void testNestedPropertiesUnknownFieldsIgnored() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"ONLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"properties\": {" + + " \"quality_rating\": \"HIGH\"," + + " \"messaging_limit\": \"10K Customers/24hr\"," + + " \"throughput_limit\": \"1000 msg/sec\"" + + "}" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertNotNull(sender.getProperties()); + assertEquals("HIGH", sender.getProperties().getQualityRating()); + assertEquals("10K Customers/24hr", sender.getProperties().getMessagingLimit()); + } + + @Test + public void testNestedComplianceUnknownFieldsIgnored() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"ONLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"compliance\": {" + + " \"registration_sid\": \"BUxxx\"," + + " \"new_compliance_field\": \"audit_status_v2\"," + + " \"countries\": [{" + + " \"country\": \"US\"," + + " \"registration_sid\": \"BUyyy\"," + + " \"status\": \"ONLINE\"," + + " \"new_country_field\": \"region_code\"," + + " \"carriers\": [{" + + " \"name\": \"Verizon\"," + + " \"status\": \"APPROVED\"," + + " \"new_carrier_field\": \"mcc_mnc\"" + + " }]" + + " }]" + + "}" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertNotNull(sender.getCompliance()); + assertEquals("BUxxx", sender.getCompliance().getRegistrationSid()); + assertNotNull(sender.getCompliance().getCountries()); + assertEquals(1, sender.getCompliance().getCountries().size()); + assertEquals("US", sender.getCompliance().getCountries().get(0).getCountry()); + assertEquals(1, sender.getCompliance().getCountries().get(0).getCarriers().size()); + assertEquals("Verizon", sender.getCompliance().getCountries().get(0).getCarriers().get(0).getName()); + } + + @Test + public void testNestedOfflineReasonsUnknownFieldsIgnored() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"OFFLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"offline_reasons\": [{" + + " \"code\": \"30008\"," + + " \"message\": \"No delivery\"," + + " \"more_info\": \"https://www.twilio.com/docs/api/errors/30008\"," + + " \"severity\": \"critical\"," + + " \"new_reason_field\": 42" + + "}]" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertNotNull(sender.getOfflineReasons()); + assertEquals(1, sender.getOfflineReasons().size()); + assertEquals("30008", sender.getOfflineReasons().get(0).getCode()); + assertEquals("No delivery", sender.getOfflineReasons().get(0).getMessage()); + } + + @Test + public void testFullResponseWithMultipleUnknownFields() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"ONLINE\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"friendly_name\": \"My Sender\"," + + "\"new_top_level_field\": \"v2_feature\"," + + "\"configuration\": {" + + " \"waba_id\": \"12345678912345\"," + + " \"verification_method\": \"sms\"," + + " \"new_config_flag\": true" + + "}," + + "\"webhook\": {" + + " \"callback_url\": \"https://example.com/callback\"," + + " \"callback_method\": \"POST\"," + + " \"retry_config\": {\"max_retries\": 3}" + + "}," + + "\"profile\": {" + + " \"name\": \"Test Business\"," + + " \"about\": \"About text\"," + + " \"pending_display_name\": \"New Pending Name\"," + + " \"display_name_status\": \"PENDING_APPROVAL\"," + + " \"websites\": [{\"website\": \"https://example.com\", \"label\": \"Site\", \"verified\": true}]," + + " \"emails\": [{\"email\": \"test@example.com\", \"label\": \"Email\", \"primary\": true}]," + + " \"phone_numbers\": [{\"phone_number\": \"+15017122661\", \"label\": \"Phone\", \"type\": \"mobile\"}]" + + "}," + + "\"properties\": {" + + " \"quality_rating\": \"HIGH\"," + + " \"messaging_limit\": \"10K Customers/24hr\"," + + " \"health_score\": 95" + + "}," + + "\"url\": \"https://messaging.twilio.com/v2/Channels/Senders/XE1234567890abcdef1234567890abcdef\"" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertEquals("XE1234567890abcdef1234567890abcdef", sender.getSid()); + assertEquals(ChannelsSender.Status.ONLINE, sender.getStatus()); + assertEquals("whatsapp:+15017122661", sender.getSenderId()); + assertNotNull(sender.getConfiguration()); + assertEquals("12345678912345", sender.getConfiguration().getWabaId()); + assertNotNull(sender.getWebhook()); + assertEquals("https://example.com/callback", sender.getWebhook().getCallbackUrl()); + assertNotNull(sender.getProfile()); + assertEquals("Test Business", sender.getProfile().getName()); + assertNotNull(sender.getProperties()); + assertEquals("HIGH", sender.getProperties().getQualityRating()); + } + + @Test + public void testNullNestedObjectsStillWork() throws Exception { + String json = "{" + + "\"sid\": \"XE1234567890abcdef1234567890abcdef\"," + + "\"status\": \"CREATING\"," + + "\"sender_id\": \"whatsapp:+15017122661\"," + + "\"configuration\": null," + + "\"webhook\": null," + + "\"profile\": null," + + "\"properties\": null," + + "\"compliance\": null," + + "\"offline_reasons\": null," + + "\"future_field\": \"should not cause issues\"" + + "}"; + + ChannelsSender sender = ChannelsSender.fromJson(json, objectMapper); + + assertNotNull(sender); + assertEquals("XE1234567890abcdef1234567890abcdef", sender.getSid()); + assertEquals(ChannelsSender.Status.CREATING, sender.getStatus()); + assertNull(sender.getConfiguration()); + assertNull(sender.getWebhook()); + assertNull(sender.getProfile()); + assertNull(sender.getProperties()); + assertNull(sender.getCompliance()); + assertNull(sender.getOfflineReasons()); + } +}