feat!: Merging 10rc branch to main

CHANGES.md

@@ -1,6 +1,16 @@
 twilio-java changelog
 =====================
 
+[2023-06-15] Version 9.7.0
+--------------------------
+**Api**
+- Added `content_sid` as conditional parameter
+- Removed `content_sid` as optional field **(breaking change)**
+
+**Insights**
+- Added `annotation` to list summary output
+
+
 [2023-06-01] Version 9.6.2
 --------------------------
 **Api**

README.md

@@ -41,15 +41,15 @@ Use the following dependency in your project to grab via Maven:
 <dependency>
   <groupId>com.twilio.sdk</groupId>
   <artifactId>twilio</artifactId>
-  <version>9.X.X</version>
+  <version>10.X.X</version>
   <scope>compile</scope>
 </dependency>
 ```
 
 or Gradle:
 
 ```groovy
-implementation "com.twilio.sdk:twilio:9.X.X"
+implementation "com.twilio.sdk:twilio:10.X.X"
 ```
 
 If you want to compile it yourself, here's how:

UPGRADE.md

@@ -2,6 +2,14 @@
 
 _`MAJOR` version bumps will have upgrade notes posted here._
 
+[2024-02-08] 9.x.x to 10.x.x
+### Overview
+
+##### Twilio Java Helper Library’s major version 10.0.0 is now available. We ensured that you can upgrade to Java helper Library 10.0.0 version without any breaking changes of existing apis
+
+Behind the scenes Java Helper is now auto-generated via OpenAPI with this release. This  enables us to rapidly add new features and enhance consistency across versions and languages.
+We're pleased to inform you that version 10.0.0 adds support for the application/json content type in the request body.
+
 [2022-09-21] 8.x.x to 9.x.x
 -----------------------------
 ### Overview

pom.xml

@@ -5,7 +5,7 @@
   <artifactId>twilio</artifactId>
   <packaging>jar</packaging>
   <name>twilio</name>
-  <version>9.6.2</version>
+  <version>10.0.0-rc.6</version>
   <description>Twilio Java Helper Library</description>
   <url>https://www.twilio.com</url>
   <licenses>
@@ -19,7 +19,7 @@
     <url>[email protected]:twilio/twilio-java.git</url>
     <connection>scm:git:[email protected]:twilio/twilio-java.git</connection>
     <developerConnection>scm:git:[email protected]:twilio/twilio-java.git</developerConnection>
-    <tag>9.6.2</tag>
+    <tag>10.0.0-rc.6</tag>
   </scm>
   <developers>
     <developer>
@@ -323,8 +323,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <source>8</source>
-          <target>8</target>
+          <source>9</source>
+          <target>9</target>
           <showDeprecation>true</showDeprecation>
         </configuration>
       </plugin>

src/main/java/com/twilio/Domains.java

@@ -26,6 +26,7 @@ public enum Domains {
     IPMESSAGING("ip-messaging"),
     LOOKUPS("lookups"),
     MEDIA("media"),
+    PREVIEWMESSAGING("preview.messaging"),
     MESSAGING("messaging"),
     MICROVISOR("microvisor"),
     MONITOR("monitor"),

src/main/java/com/twilio/Twilio.java

@@ -21,7 +21,7 @@
  */
 public class Twilio {
 
-    public static final String VERSION = "9.6.2";
+    public static final String VERSION = "10.0.0-rc.6";
     public static final String JAVA_VERSION = System.getProperty("java.version");
     public static final String OS_NAME = System.getProperty("os.name");
     public static final String OS_ARCH = System.getProperty("os.arch");
@@ -241,7 +241,7 @@ public static void setExecutorService(final ExecutorService executorService) {
     }
 
     /**
-     * Validate that we can connect to the new SSL certificate posted on api.twilio.com.
+     * Validate that we can connect to the new SSL certificate posted on tls-test.twilio.com
      *
      * @throws CertificateValidationException if the connection fails
      */
@@ -252,7 +252,7 @@ public static void validateSslCertificate() {
 
 
     public static void validateSslCertificate(NetworkHttpClient client) {
-        final Request request = new Request(HttpMethod.GET, "https://api.twilio.com:8443");
+        final Request request = new Request(HttpMethod.GET, "https://tls-test.twilio.com:443");
         try {
             final Response response = client.makeRequest(request);
 

src/main/java/com/twilio/constant/EnumConstants.java

@@ -0,0 +1,16 @@
+package com.twilio.constant;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+public class EnumConstants {
+
+    @Getter
+    @RequiredArgsConstructor
+    public enum ContentType {
+        JSON("application/json"),
+        FORM_URLENCODED("application/x-www-form-urlencoded");
+
+        private final String value;
+    }
+}

src/main/java/com/twilio/converter/Converter.java

@@ -18,7 +18,7 @@ public class Converter {
      * @param map map to convert
      * @return converted JSON string
      */
-    public static String mapToJson(final Map<String, Object> map) {
+    public static String mapToJson(final Map<String, ? extends Object> map) {
         try {
             return MAPPER.writeValueAsString(map);
         } catch (JsonProcessingException e) {

src/main/java/com/twilio/exception/ApiException.java

@@ -30,6 +30,16 @@ public ApiException(final String message, final Throwable cause) {
         this(message, null, null, null, cause);
     }
 
+    /**
+     * Create a new API Exception.
+     *
+     * @param message exception message
+     * @param status status code
+     */
+    public ApiException(final String message, final Integer status) {
+        this(message, null, null, status, null);
+    }
+
     /**
      * Create a new API Exception.
      *

src/main/java/com/twilio/http/NetworkHttpClient.java

@@ -1,6 +1,7 @@
 package com.twilio.http;
 
 import com.twilio.Twilio;
+import com.twilio.constant.EnumConstants;
 import com.twilio.exception.ApiException;
 
 import java.io.IOException;
@@ -19,6 +20,8 @@
 import org.apache.http.client.utils.HttpClientUtils;
 import org.apache.http.config.SocketConfig;
 import org.apache.http.entity.BufferedHttpEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHeader;
@@ -123,13 +126,23 @@ public Response makeRequest(final Request request) {
         }
 
         if (method == HttpMethod.POST) {
-            builder.addHeader(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded");
-
-            for (Map.Entry<String, List<String>> entry : request.getPostParams().entrySet()) {
-                for (String value : entry.getValue()) {
-                    builder.addParameter(entry.getKey(), value);
+            // TODO: It will be removed after one RC Release.
+            if (request.getContentType() == null) request.setContentType(EnumConstants.ContentType.FORM_URLENCODED);
+            if (EnumConstants.ContentType.JSON.getValue().equals(request.getContentType().getValue())) {
+                HttpEntity entity = new StringEntity(request.getBody(), ContentType.APPLICATION_JSON);
+                builder.setEntity(entity);
+                builder.addHeader(
+                        HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.JSON.getValue());
+            } else {
+                builder.addHeader(
+                        HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.FORM_URLENCODED.getValue());
+                for (Map.Entry<String, List<String>> entry : request.getPostParams().entrySet()) {
+                    for (String value : entry.getValue()) {
+                        builder.addParameter(entry.getKey(), value);
+                    }
                 }
             }
+
         }
         builder.addHeader(HttpHeaders.USER_AGENT, HttpUtility.getUserAgentString(request.getUserAgentExtensions(), isCustomClient));
 

src/main/java/com/twilio/http/Request.java

@@ -1,20 +1,20 @@
 package com.twilio.http;
 
+import com.twilio.constant.EnumConstants;
 import com.twilio.exception.ApiException;
 import com.twilio.exception.InvalidRequestException;
 
-import java.time.ZonedDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.LocalDate;
-
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 public class Request {
@@ -37,6 +37,10 @@ public class Request {
 
     private List<String> userAgentExtensions;
 
+    private EnumConstants.ContentType contentType;
+
+    private String body;
+
     /**
      * Create a new API request.
      *
@@ -113,6 +117,22 @@ public List<String> getUserAgentExtensions() {
         return this.userAgentExtensions;
     }
 
+    public EnumConstants.ContentType getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(EnumConstants.ContentType contentType) {
+        this.contentType = contentType;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+
     /**
      * Create auth string from username and password.
      *

src/main/java/com/twilio/http/ValidationClient.java

@@ -1,13 +1,17 @@
 package com.twilio.http;
 
 import com.twilio.Twilio;
+import com.twilio.constant.EnumConstants;
 import com.twilio.exception.ApiException;
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.config.SocketConfig;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHeader;
@@ -104,11 +108,20 @@ public Response makeRequest(Request request) {
 
         HttpMethod method = request.getMethod();
         if (method == HttpMethod.POST) {
-            builder.addHeader(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded");
-
-            for (Map.Entry<String, List<String>> entry : request.getPostParams().entrySet()) {
-                for (String value : entry.getValue()) {
-                    builder.addParameter(entry.getKey(), value);
+            // TODO: It will be removed after one RC Release.
+            if (request.getContentType() == null) request.setContentType(EnumConstants.ContentType.FORM_URLENCODED);
+            if (EnumConstants.ContentType.JSON.getValue().equals(request.getContentType().getValue())) {
+                HttpEntity entity = new StringEntity(request.getBody(), ContentType.APPLICATION_JSON);
+                builder.setEntity(entity);
+                builder.addHeader(
+                        HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.JSON.getValue());
+            } else {
+                builder.addHeader(
+                        HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.FORM_URLENCODED.getValue());
+                for (Map.Entry<String, List<String>> entry : request.getPostParams().entrySet()) {
+                    for (String value : entry.getValue()) {
+                        builder.addParameter(entry.getKey(), value);
+                    }
                 }
             }
         }