DX-2093 voice, mfa, messaging interface updates (breaking changes) (#35)

* New deploy

* readded tests

* updated tests

* added dynamic response

* fixed more classes

* fixed pom

Co-authored-by: jmulford-bw <[email protected]>

Author: jmulford-bw

.gitkeep

@@ -1,3 +1,4 @@
 README.md
 src/main/java/com/bandwidth/voice/bxml/*.java
-src/main/java/com/bandwidth/webrtc/utils/*.java
+src/main/java/com/bandwidth/webrtc/utils/*.java
+src/test/*

pom.xml

@@ -1,7 +1,7 @@
 <!--
  - BandwidthLib
  -
- - This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+ - This file was automatically generated by APIMATIC v3.0 ( https://www.apimatic.io ).
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -46,6 +46,14 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-maven-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -124,7 +132,7 @@
 
   <properties>
     <jackson.version>2.9.10</jackson.version>
-    <jackson.databind.version>2.9.10.7</jackson.databind.version>
+    <jackson.databind.version>2.9.10.5</jackson.databind.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -166,7 +174,7 @@
     <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>okhttp</artifactId>
-        <version>3.12.1</version>
+        <version>[3.12, 4.9.1]</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

src/main/java/com/bandwidth/ApiHelper.java

@@ -1,7 +1,7 @@
 /*
  * BandwidthLib
  *
- * This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+ * This file was automatically generated by APIMATIC v3.0 ( https://www.apimatic.io ).
  */
 
 package com.bandwidth;
@@ -11,7 +11,6 @@
 import com.bandwidth.http.request.MultipartWrapper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -26,6 +25,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.AbstractMap.SimpleEntry;
@@ -52,7 +52,6 @@ public class ApiHelper {
         private static final long serialVersionUID = -174113593500315394L;
         {
             configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            setSerializationInclusion(JsonInclude.Include.NON_NULL);
             configOverride(BigDecimal.class).setFormat(
                     JsonFormat.Value.forShape(JsonFormat.Shape.STRING));
         }
@@ -136,7 +135,6 @@ public static String serialize(Object obj, final JsonSerializer serializer)
         }.writeValueAsString(obj);
     }
 
-
     /**
      * Json deserialization of the given Json string using a specified JsonDerializer.
      * @param   json The Json string to deserialize.
@@ -215,6 +213,24 @@ public static <T extends Object> T deserialize(String json, TypeReference<T> typ
         return mapper.readValue(json, typeReference);
     }
 
+    /**
+     * Json deserialization of the given Json string.
+     * @param   json The Json string to deserialize
+     * @return  The deserialized Json as an Object
+     */
+    public static Object deserializeAsObject(String json) {
+        if (isNullOrWhiteSpace(json)) {
+            return null;
+        }
+        try {
+            return ApiHelper.deserialize(json, new TypeReference<Object>() {});
+        } catch (IOException e) {
+            // Failed to deserialize when json is not representing a JSON object.
+            // i.e. either its string or any primitive type.
+            return json;
+        }
+    }
+
     /**
      * JSON Deserialization of the given json string.
      * @param   <T> The type of the object to deserialize into
@@ -558,42 +574,52 @@ private static void objectToList(String objName, Object obj,
         } else {
             // Process objects
             // Invoke getter methods
-            Method[] methods = obj.getClass().getMethods();
-            for (Method method : methods) {
-                // Is a getter?
-                if (method.getParameterTypes().length != 0 || !method.getName().startsWith("get")) {
-                    continue;
-                }
+            Class<?> clazz = obj.getClass();
+            while (clazz != null) {
+                for (Method method : clazz.getDeclaredMethods()) {
+
+                    // Is a public/protected getter or internalGetter?
+                    if (method.getParameterTypes().length != 0
+                            || Modifier.isPrivate(method.getModifiers())
+                            || (!method.getName().startsWith("get")
+                                    && !method.getName().startsWith("internalGet"))) {
+                        continue;
+                    }
 
-                // Get Json attribute name
-                Annotation getterAnnotation = method.getAnnotation(JsonGetter.class);
-                if (getterAnnotation == null) {
-                    continue;
-                }
+                    // Get JsonGetter annotation
+                    Annotation getterAnnotation = method.getAnnotation(JsonGetter.class);
+                    if (getterAnnotation == null) {
+                        continue;
+                    }
 
-                // Load key name
-                String attribName = ((JsonGetter) getterAnnotation).value();
-                if ((objName != null) && (!objName.isEmpty())) {
-                    attribName = String.format("%s[%s]", objName, attribName);
-                }
+                    // Load key name from getter attribute name
+                    String attribName = ((JsonGetter) getterAnnotation).value();
+                    if ((objName != null) && (!objName.isEmpty())) {
+                        attribName = String.format("%s[%s]", objName, attribName);
+                    }
 
-                try {
-                    // Load key value pair
-                    Object value = method.invoke(obj);
-                    JsonSerialize serializerAnnotation = method.getAnnotation(JsonSerialize.class);
-                    if (serializerAnnotation != null) {
-                        loadKeyValuePairForEncoding(attribName, value, objectList, processed,
-                                serializerAnnotation);
-                    } else {
-                        loadKeyValuePairForEncoding(attribName, value, objectList, processed);
+                    try {
+                        // Load value by invoking getter method
+                        method.setAccessible(true);
+                        Object value = method.invoke(obj);
+                        JsonSerialize serializerAnnotation = method
+                                .getAnnotation(JsonSerialize.class);
+                        // Load key value pair into objectList
+                        if (serializerAnnotation != null) {
+                            loadKeyValuePairForEncoding(attribName, value, objectList, processed,
+                                    serializerAnnotation);
+                        } else {
+                            loadKeyValuePairForEncoding(attribName, value, objectList, processed);
+                        }
+                    } catch (IllegalAccessException | IllegalArgumentException
+                            | InvocationTargetException e) {
+                        // This block only calls getter methods.
+                        // These getters don't throw any exception except invocationTargetException.
+                        // The getters are public so there is no chance of an IllegalAccessException
+                        // Steps we've followed ensure that the object has the specified method.
                     }
-                } catch (IllegalAccessException | IllegalArgumentException
-                        | InvocationTargetException e) {
-                    // This block only calls getter methods.
-                    // These getters don't throw any exception except invocationTargetException.
-                    // The getters are public so there is no chance of an IllegalAccessException
-                    // Steps we've followed ensure that the object has the specified method.
                 }
+                clazz = clazz.getSuperclass();
             }
         }
     }

src/main/java/com/bandwidth/AuthManager.java

@@ -1,7 +1,7 @@
 /*
  * BandwidthLib
  *
- * This file was automatically generated by APIMATIC v2.0 ( https://apimatic.io ).
+ * This file was automatically generated by APIMATIC v3.0 ( https://www.apimatic.io ).
  */
 
 package com.bandwidth;