From e1df7c3b4dc27d78b18a08382a5aa2ef0d44088f Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Fri, 24 Jun 2016 09:13:18 -0600
Subject: [PATCH] Add back RestClientRibbonCommand api's.

---
 .../route/RestClientRibbonCommand.java        | 42 ++++++++++++++++++-
 .../route/RestClientRibbonCommandFactory.java | 15 +++----
 .../filters/route/RibbonCommandContext.java   |  9 ++++
 .../route/support/AbstractRibbonCommand.java  |  8 ++++
 4 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommand.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommand.java
index dae27414..3acb2dd3 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommand.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommand.java
@@ -21,7 +21,10 @@ import com.netflix.client.http.HttpRequest;
 import com.netflix.client.http.HttpResponse;
 import com.netflix.niws.client.http.RestClient;
 import org.springframework.cloud.netflix.zuul.filters.route.support.AbstractRibbonCommand;
+import org.springframework.util.MultiValueMap;
 
+import java.io.InputStream;
+import java.net.URI;
 import java.util.List;
 
 /**
@@ -34,6 +37,14 @@ import java.util.List;
 @SuppressWarnings("deprecation")
 public class RestClientRibbonCommand extends AbstractRibbonCommand<RestClient, HttpRequest, HttpResponse> {
 
+	@SuppressWarnings("unused")
+	@Deprecated
+	public RestClientRibbonCommand(String commandKey, RestClient restClient, HttpRequest.Verb verb, String uri,
+								   Boolean retryable, MultiValueMap<String, String> headers,
+								   MultiValueMap<String, String> params, InputStream requestEntity) {
+		this(commandKey, restClient, new RibbonCommandContext(commandKey, verb.verb(), uri, retryable, headers, params, requestEntity));
+	}
+
 	public RestClientRibbonCommand(String commandKey, RestClient client, RibbonCommandContext context) {
 		super(commandKey, client, context);
 	}
@@ -41,7 +52,7 @@ public class RestClientRibbonCommand extends AbstractRibbonCommand<RestClient, H
 	@Override
 	protected HttpRequest createRequest() throws Exception {
 		HttpRequest.Builder builder = HttpRequest.newBuilder()
-				.verb(RestClientRibbonCommandFactory.getVerb(this.context.getMethod()))
+				.verb(getVerb(this.context.getMethod()))
 				.uri(this.context.uri())
 				.entity(this.context.getRequestEntity());
 
@@ -62,6 +73,35 @@ public class RestClientRibbonCommand extends AbstractRibbonCommand<RestClient, H
 			}
 		}
 
+		customizeRequest(builder);
+
 		return builder.build();
 	}
+
+	protected void customizeRequest(HttpRequest.Builder requestBuilder) {
+		// noop
+	}
+
+	@Deprecated
+	public URI getUri() {
+		return this.context.uri();
+	}
+
+	@SuppressWarnings("unused")
+	@Deprecated
+	public HttpRequest.Verb getVerb() {
+		return getVerb(this.context.getVerb());
+	}
+
+	protected static HttpRequest.Verb getVerb(String method) {
+		if (method == null)
+			return HttpRequest.Verb.GET;
+		try {
+			return HttpRequest.Verb.valueOf(method.toUpperCase());
+		}
+		catch (IllegalArgumentException e) {
+			return HttpRequest.Verb.GET;
+		}
+	}
+
 }
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandFactory.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandFactory.java
index 72f006d9..f5ab494e 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandFactory.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandFactory.java
@@ -41,14 +41,11 @@ public class RestClientRibbonCommandFactory implements RibbonCommandFactory<Rest
 		return new RestClientRibbonCommand(context.getServiceId(), restClient, context);
 	}
 
-	static HttpRequest.Verb getVerb(String method) {
-		if (method == null)
-			return HttpRequest.Verb.GET;
-		try {
-			return HttpRequest.Verb.valueOf(method.toUpperCase());
-		}
-		catch (IllegalArgumentException e) {
-			return HttpRequest.Verb.GET;
-		}
+	public SpringClientFactory getClientFactory() {
+		return clientFactory;
+	}
+
+	protected static HttpRequest.Verb getVerb(String method) {
+		return RestClientRibbonCommand.getVerb(method);
 	}
 }
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonCommandContext.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonCommandContext.java
index 9d704d8a..5b65ccf5 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonCommandContext.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonCommandContext.java
@@ -47,4 +47,13 @@ public class RibbonCommandContext {
 		}
 		return null;
 	}
+
+	/**
+	 * Use getMethod()
+	 * @return
+	 */
+	@Deprecated
+	public String getVerb() {
+		return this.method;
+	}
 }
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/support/AbstractRibbonCommand.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/support/AbstractRibbonCommand.java
index 29935600..04261c79 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/support/AbstractRibbonCommand.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/support/AbstractRibbonCommand.java
@@ -96,5 +96,13 @@ public abstract class AbstractRibbonCommand<LBC extends AbstractLoadBalancerAwar
 		return new RibbonHttpResponse(response);
 	}
 
+	public LBC getClient() {
+		return client;
+	}
+
+	public RibbonCommandContext getContext() {
+		return context;
+	}
+
 	protected abstract RQ createRequest() throws Exception;
 }