twilio · shrutiburman · Jun 7, 2023 · Jun 5, 2023 · Jun 6, 2023
diff --git a/src/main/java/com/twilio/http/Request.java b/src/main/java/com/twilio/http/Request.java
@@ -37,6 +37,7 @@ public class Request {
 
     private List<String> userAgentExtensions;
 
+    private String contentType;
     /**
      * Create a new API request.
      *
@@ -113,6 +114,14 @@ public List<String> getUserAgentExtensions() {
         return this.userAgentExtensions;
     }
 
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
     /**
      * Create auth string from username and password.
      *

diff --git a/src/main/java/com/twilio/http/ValidationClient.java b/src/main/java/com/twilio/http/ValidationClient.java
@@ -2,12 +2,15 @@
 
 import com.twilio.Twilio;
 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,7 +107,14 @@ public Response makeRequest(Request request) {
 
         HttpMethod method = request.getMethod();
         if (method == HttpMethod.POST) {
-            builder.addHeader(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded");
+            if(request.getContentType() != null && request.getContentType().equals("application/json")){
+                HttpEntity entity = new StringEntity(request.encodeFormBody(), ContentType.APPLICATION_JSON);
+                builder.setEntity(entity);
+                builder.addHeader(HttpHeaders.CONTENT_TYPE, request.getContentType());
+            }
+            else{
+               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()) {

diff --git a/src/test/java/com/twilio/http/RequestTest.java b/src/test/java/com/twilio/http/RequestTest.java
@@ -317,4 +317,10 @@ public void testEquals() {
         assertNotEquals(request, new Object());
         assertNotEquals(null, request);
     }
+    @Test
+    public void testContentType() {
+        Request r = new Request(HttpMethod.POST, "http://example.com/foobar");
+        r.setContentType("application/json");
+        assertEquals("application/json", r.getContentType());
+    }
 }
diff --git a/src/test/java/com/twilio/http/ValidationClientTest.java b/src/test/java/com/twilio/http/ValidationClientTest.java
@@ -23,6 +23,7 @@ public void testHttpGet() throws Exception {
     @Test
     public void testHttpPost() throws Exception {
         exerciseHttpMethod(HttpMethod.POST);
+        testContentType(HttpMethod.POST);
     }
 
     @Test
@@ -46,6 +47,27 @@ private void exerciseHttpMethod(final HttpMethod httpMethod) throws Exception {
         assertNotNull(validationHeaderValue);
         assertTrue(validationHeaderValue.length() > 0);
     }
+    private void testContentType(final HttpMethod httpMethod) throws Exception {
+        final KeyPair keyPair = generateKeyPair();
+        final MockWebServer server = new MockWebServer();
+        server.enqueue(new MockResponse().setBody("{\n" +
+                "    \"key1\": \"value1\",\n" +
+                "    \"key2\": \"value2\"\n" +
+                "}"));
+        final String path = "/example123";
+        final HttpUrl url = server.url(path);
+        final ValidationClient client = new ValidationClient("dummy-sid1", "dummy-sid2", "dummy-signing-key", keyPair.getPrivate());
+        final Request request = new Request(httpMethod, url.url().toString());
+        request.setContentType("application/json");
+        final Response response = client.makeRequest(request);
+        assertEquals(200, response.getStatusCode());
+        final RecordedRequest recordedRequest = server.takeRequest();
+        assertEquals(httpMethod.name(), recordedRequest.getMethod());
+        assertEquals("application/json", recordedRequest.getHeader("Content-Type"));
+        final String validationHeaderValue = recordedRequest.getHeader("Twilio-Client-Validation");
+        assertNotNull(validationHeaderValue);
+        assertTrue(validationHeaderValue.length() > 0);
+    }
 
     private static KeyPair generateKeyPair() throws Exception {
         final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");