Version Bump:2.1.0: DELETE can now have a request body

Author: thinkingserious

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.0] - 2016-06-08
+### Added
+- DELETE can now have a request body
+
 ## [2.0.0] - 2016-06-03
 ### Changed
 - Made the Request and Response variables non-redundant. e.g. request.requestBody becomes request.body

build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 group         = 'com.sendgrid'
-version       = '2.0.0'
+version       = '2.1.0'
 ext.packaging = 'jar'
 
 allprojects {

pom.xml

@@ -11,7 +11,7 @@
   <packaging>jar</packaging>
   <name>A simple HTTP client</name>
   <description>HTTP REST client, simplified for Java</description>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <url>https://github.com/sendgrid/java-http-client</url>
   <licenses>
     <license>

src/main/java/com/sendgrid/Client.java

@@ -1,8 +1,10 @@
 package com.sendgrid;
 
 import org.apache.http.Header;
+import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPatch;
@@ -33,6 +35,21 @@
 import java.util.Map;
 import java.util.Scanner;
 
+// Hack to get DELETE to accept a request body
+@NotThreadSafe
+class HttpDeleteWithBody extends HttpEntityEnclosingRequestBase {
+    public static final String METHOD_NAME = "DELETE";
+
+    public String getMethod() {
+        return METHOD_NAME;
+    }
+
+    public HttpDeleteWithBody(final String uri) {
+        super();
+        setURI(URI.create(uri));
+    }
+}
+
 /**
   * Class Client allows for quick and easy access any REST or REST-like API.
   */
@@ -286,11 +303,11 @@ public Response delete(Request request) throws URISyntaxException, IOException {
     CloseableHttpResponse serverResponse = null;
     Response response = new Response();
     URI uri = null;
-    HttpDelete httpDelete = null;
+    HttpDeleteWithBody httpDelete = null;
 
     try {
       uri = buildUri(request.baseUri, request.endpoint, request.queryParams);
-      httpDelete = new HttpDelete(uri.toString());
+      httpDelete = new HttpDeleteWithBody(uri.toString());
     } catch (URISyntaxException ex) {
       throw ex;
     }
@@ -301,6 +318,12 @@ public Response delete(Request request) throws URISyntaxException, IOException {
       }
     }
 
+    try {
+      httpDelete.setEntity(new StringEntity(request.body));
+    } catch (IOException ex) {
+      throw ex;
+    }
+
     try {
       serverResponse = httpClient.execute(httpDelete);
       response = getResponse(serverResponse);