fix: fromXml for self-closing child twiml (#722)

twilio · Dec 6, 2022 · 795541f · 795541f
1 parent 07855ba
commit 795541f
Show file tree

Hide file tree

Showing 75 changed files with 612 additions and 0 deletions.
diff --git a/src/main/java/com/twilio/twiml/FaxResponse.java b/src/main/java/com/twilio/twiml/FaxResponse.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.twiml.TwiMLException;
 import com.twilio.twiml.fax.Receive;
@@ -35,6 +36,7 @@ private FaxResponse(Builder b) {
     /**
      * Create a new {@code <Response>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <FaxResponse.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/MessagingResponse.java b/src/main/java/com/twilio/twiml/MessagingResponse.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.twiml.TwiMLException;
 import com.twilio.twiml.messaging.Message;
@@ -36,6 +37,7 @@ private MessagingResponse(Builder b) {
     /**
      * Create a new {@code <Response>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <MessagingResponse.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/VoiceResponse.java b/src/main/java/com/twilio/twiml/VoiceResponse.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.twiml.TwiMLException;
 import com.twilio.twiml.voice.Connect;
@@ -54,6 +55,7 @@ private VoiceResponse(Builder b) {
     /**
      * Create a new {@code <Response>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <VoiceResponse.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/fax/Receive.java b/src/main/java/com/twilio/twiml/fax/Receive.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -156,6 +157,7 @@ public Boolean isStoreMedia() {
     /**
      * Create a new {@code <Receive>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Receive.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/messaging/Body.java b/src/main/java/com/twilio/twiml/messaging/Body.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
 
@@ -55,6 +56,7 @@ public String getMessage() {
     /**
      * Create a new {@code <Body>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Body.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/messaging/Media.java b/src/main/java/com/twilio/twiml/messaging/Media.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.twilio.converter.Promoter;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
@@ -58,6 +59,7 @@ public URI getUrl() {
     /**
      * Create a new {@code <Media>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Media.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/messaging/Message.java b/src/main/java/com/twilio/twiml/messaging/Message.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -145,6 +146,7 @@ public String getBody() {
     /**
      * Create a new {@code <Message>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Message.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/messaging/Redirect.java b/src/main/java/com/twilio/twiml/messaging/Redirect.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -89,6 +90,7 @@ public URI getUrl() {
     /**
      * Create a new {@code <Redirect>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Redirect.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Autopilot.java b/src/main/java/com/twilio/twiml/voice/Autopilot.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
 
@@ -55,6 +56,7 @@ public String getName() {
     /**
      * Create a new {@code <Autopilot>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Autopilot.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Client.java b/src/main/java/com/twilio/twiml/voice/Client.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -176,6 +177,7 @@ public String getIdentity() {
     /**
      * Create a new {@code <Client>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Client.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Conference.java b/src/main/java/com/twilio/twiml/voice/Conference.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -503,6 +504,7 @@ public String getName() {
     /**
      * Create a new {@code <Conference>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Conference.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Config.java b/src/main/java/com/twilio/twiml/voice/Config.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
@@ -80,6 +81,7 @@ public String getValue() {
     /**
      * Create a new {@code <Config>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Config.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Connect.java b/src/main/java/com/twilio/twiml/voice/Connect.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -83,6 +84,7 @@ public HttpMethod getMethod() {
     /**
      * Create a new {@code <Connect>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Connect.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Conversation.java b/src/main/java/com/twilio/twiml/voice/Conversation.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -345,6 +346,7 @@ protected String getStatusCallbackEventsAsString() {
     /**
      * Create a new {@code <Conversation>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Conversation.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Dial.java b/src/main/java/com/twilio/twiml/voice/Dial.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -453,6 +454,7 @@ public String getNumber() {
     /**
      * Create a new {@code <Dial>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Dial.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Echo.java b/src/main/java/com/twilio/twiml/voice/Echo.java
@@ -8,6 +8,7 @@
 package com.twilio.twiml.voice;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
 
@@ -32,6 +33,7 @@ private Echo(Builder b) {
     /**
      * Create a new {@code <Echo>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Echo.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Enqueue.java b/src/main/java/com/twilio/twiml/voice/Enqueue.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -159,6 +160,7 @@ public String getName() {
     /**
      * Create a new {@code <Enqueue>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Enqueue.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Gather.java b/src/main/java/com/twilio/twiml/voice/Gather.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -499,6 +500,7 @@ public Boolean isEnhanced() {
     /**
      * Create a new {@code <Gather>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Gather.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Hangup.java b/src/main/java/com/twilio/twiml/voice/Hangup.java
@@ -8,6 +8,7 @@
 package com.twilio.twiml.voice;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
 
@@ -32,6 +33,7 @@ private Hangup(Builder b) {
     /**
      * Create a new {@code <Hangup>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Hangup.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Identity.java b/src/main/java/com/twilio/twiml/voice/Identity.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
 
@@ -55,6 +56,7 @@ public String getClientIdentity() {
     /**
      * Create a new {@code <Identity>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Identity.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Leave.java b/src/main/java/com/twilio/twiml/voice/Leave.java
@@ -8,6 +8,7 @@
 package com.twilio.twiml.voice;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
 
@@ -32,6 +33,7 @@ private Leave(Builder b) {
     /**
      * Create a new {@code <Leave>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Leave.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Number.java b/src/main/java/com/twilio/twiml/voice/Number.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.http.HttpMethod;
@@ -305,6 +306,7 @@ public com.twilio.type.PhoneNumber getPhoneNumber() {
     /**
      * Create a new {@code <Number>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Number.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Parameter.java b/src/main/java/com/twilio/twiml/voice/Parameter.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
@@ -80,6 +81,7 @@ public String getValue() {
     /**
      * Create a new {@code <Parameter>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Parameter.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Pause.java b/src/main/java/com/twilio/twiml/voice/Pause.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.twiml.TwiML;
 import com.twilio.twiml.TwiMLException;
@@ -66,6 +67,7 @@ public Integer getLength() {
     /**
      * Create a new {@code <Pause>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Pause.Builder>} from an XML string

diff --git a/src/main/java/com/twilio/twiml/voice/Pay.java b/src/main/java/com/twilio/twiml/voice/Pay.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.twilio.converter.Promoter;
 import com.twilio.twiml.TwiML;
@@ -453,6 +454,7 @@ public Pay.Language getLanguage() {
     /**
      * Create a new {@code <Pay>} element
      */
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder extends TwiML.Builder<Builder> {
         /**
          * Create and return a {@code <Pay.Builder>} from an XML string