Support DELETE method body for SimpleHostRoutingFilter

fixes gh-1329

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java

@@ -63,6 +63,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHeader;
+import org.apache.http.message.BasicHttpEntityEnclosingRequest;
 import org.apache.http.message.BasicHttpRequest;
 import org.apache.http.protocol.HttpContext;
 import org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelper;
@@ -271,11 +272,33 @@ public class SimpleHostRoutingFilter extends ZuulFilter {
 		URL host = RequestContext.getCurrentContext().getRouteHost();
 		HttpHost httpHost = getHttpHost(host);
 		uri = StringUtils.cleanPath((host.getPath() + uri).replaceAll("/{2,}", "/"));
-		HttpRequest httpRequest;
 		int contentLength = request.getContentLength();
 		InputStreamEntity entity = new InputStreamEntity(requestEntity, contentLength,
 				request.getContentType() != null
 						? ContentType.create(request.getContentType()) : null);
+
+		HttpRequest httpRequest = buildHttpRequest(verb, uri, entity, headers, params);
+		try {
+			log.debug(httpHost.getHostName() + " " + httpHost.getPort() + " "
+					+ httpHost.getSchemeName());
+			HttpResponse zuulResponse = forwardRequest(httpclient, httpHost, httpRequest);
+			this.helper.appendDebug(info, zuulResponse.getStatusLine().getStatusCode(),
+					revertHeaders(zuulResponse.getAllHeaders()));
+			return zuulResponse;
+		}
+		finally {
+			// When HttpClient instance is no longer needed,
+			// shut down the connection manager to ensure
+			// immediate deallocation of all system resources
+			// httpclient.getConnectionManager().shutdown();
+		}
+	}
+
+	protected HttpRequest buildHttpRequest (String verb, String uri, InputStreamEntity entity,
+											MultiValueMap<String, String> headers, MultiValueMap<String, String> params)
+	{
+		HttpRequest httpRequest;
+
 		switch (verb.toUpperCase()) {
 			case "POST":
 				HttpPost httpPost = new HttpPost(uri + this.helper.getQueryString(params));
@@ -292,26 +315,20 @@ public class SimpleHostRoutingFilter extends ZuulFilter {
 				httpRequest = httpPatch;
 				httpPatch.setEntity(entity);
 				break;
+			case "DELETE":
+				BasicHttpEntityEnclosingRequest entityRequest = new BasicHttpEntityEnclosingRequest(verb,
+						uri + this.helper.getQueryString(params));
+				httpRequest = entityRequest;
+				entityRequest.setEntity(entity);
+				break;
 			default:
 				httpRequest = new BasicHttpRequest(verb,
 						uri + this.helper.getQueryString(params));
 				log.debug(uri + this.helper.getQueryString(params));
 		}
-		try {
+
 		httpRequest.setHeaders(convertHeaders(headers));
-			log.debug(httpHost.getHostName() + " " + httpHost.getPort() + " "
+		return httpRequest;
-					+ httpHost.getSchemeName());
-			HttpResponse zuulResponse = forwardRequest(httpclient, httpHost, httpRequest);
-			this.helper.appendDebug(info, zuulResponse.getStatusLine().getStatusCode(),
-					revertHeaders(zuulResponse.getAllHeaders()));
-			return zuulResponse;
-		}
-		finally {
-			// When HttpClient instance is no longer needed,
-			// shut down the connection manager to ensure
-			// immediate deallocation of all system resources
-			// httpclient.getConnectionManager().shutdown();
-		}
 	}
 
 	private MultiValueMap<String, String> revertHeaders(Header[] headers) {

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java

@@ -16,6 +16,11 @@
 
 package org.springframework.cloud.netflix.zuul.filters.route;
 
+import java.io.ByteArrayInputStream;
+
+import org.apache.http.HttpEntityEnclosingRequest;
+import org.apache.http.HttpRequest;
+import org.apache.http.entity.InputStreamEntity;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.junit.After;
 import org.junit.Test;
@@ -26,6 +31,7 @@ import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.util.LinkedMultiValueMap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -80,6 +86,18 @@ public class SimpleHostRoutingFilterTests {
 		assertEquals(20, connMgr.getDefaultMaxPerRoute());
 	}
 
+	@Test
+	public void deleteRequestBuiltWithBody() {
+		setupContext();
+		InputStreamEntity inputStreamEntity = new InputStreamEntity(new ByteArrayInputStream(new byte[]{1}));
+		HttpRequest httpRequest = getFilter().buildHttpRequest("DELETE", "uri", inputStreamEntity,
+				new LinkedMultiValueMap<String, String>(), new LinkedMultiValueMap<String, String>());
+
+		assertTrue(httpRequest instanceof HttpEntityEnclosingRequest);
+		HttpEntityEnclosingRequest httpEntityEnclosingRequest = (HttpEntityEnclosingRequest) httpRequest;
+		assertTrue(httpEntityEnclosingRequest.getEntity() != null);
+	}
+
 	private void setupContext() {
 		this.context.register(PropertyPlaceholderAutoConfiguration.class,
 				TestConfiguration.class);