From 18c4bc060b2b3c19f1ce9b0b1d6f3f1b6cbf85dd Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter85@gmail.com>
Date: Tue, 11 Oct 2016 13:41:31 -0400
Subject: [PATCH] Upgrade hystrix 1.5.6 (#1388)

Fixes gh-1374
---
 .../zuul/filters/pre/FormBodyWrapperFilter.java     | 13 ++++++-------
 spring-cloud-netflix-dependencies/pom.xml           |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java
index 22681762..500ee5a2 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java
@@ -22,16 +22,14 @@ import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletRequestWrapper;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
@@ -44,6 +42,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ReflectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 import org.springframework.web.servlet.DispatcherServlet;
@@ -65,7 +64,7 @@ public class FormBodyWrapperFilter extends ZuulFilter {
 		this.requestField = ReflectionUtils.findField(HttpServletRequestWrapper.class,
 				"req", HttpServletRequest.class);
 		this.servletRequestField = ReflectionUtils.findField(ServletRequestWrapper.class,
-				"request", ServletRequest.class);		
+				"request", ServletRequest.class);
 		Assert.notNull(this.requestField,
 				"HttpServletRequestWrapper.req field not found");
 		Assert.notNull(this.servletRequestField,
@@ -121,7 +120,7 @@ public class FormBodyWrapperFilter extends ZuulFilter {
 					.getField(this.requestField, request);
 			wrapper = new FormBodyRequestWrapper(wrapped);
 			ReflectionUtils.setField(this.requestField, request, wrapper);
-			if(request instanceof ServletRequestWrapper) {
+			if (request instanceof ServletRequestWrapper) {
 				ReflectionUtils.setField(this.servletRequestField, request, wrapper);
 			}
 		}
@@ -170,7 +169,7 @@ public class FormBodyWrapperFilter extends ZuulFilter {
 			}
 			return this.contentLength;
 		}
-		
+
 		@Override
 		public long getContentLengthLong() {
 			return getContentLength();
@@ -233,7 +232,7 @@ public class FormBodyWrapperFilter extends ZuulFilter {
 			Set<String> result = new HashSet<>();
 			String query = this.request.getQueryString();
 			if (query != null) {
-				for (String value : StringUtils.split(query, "&")) {
+				for (String value : StringUtils.tokenizeToStringArray(query, "&")) {
 					if (value.contains("=")) {
 						value = value.substring(0, value.indexOf("="));
 					}
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 99e3cb2d..094bee0e 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -17,7 +17,7 @@
 		<archaius.version>0.7.4</archaius.version>
 		<eureka.version>1.4.11</eureka.version>
 		<feign.version>9.3.1</feign.version>
-		<hystrix.version>1.5.5</hystrix.version>
+		<hystrix.version>1.5.6</hystrix.version>
 		<ribbon.version>2.2.0</ribbon.version>
 		<servo.version>0.10.1</servo.version>
 		<zuul.version>1.2.2</zuul.version>