From b58c8230f9e8c5ad1d03bfdd7c074878fbaa0ae1 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 20 Mar 2018 14:33:45 -0400
Subject: [PATCH] Allows setting string and URI for fallback.

fixes gh-232
---
 .../factory/HystrixGatewayFilterFactory.java  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java
index ed1c0d25..bbbd97b6 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixGatewayFilterFactory.java
@@ -77,7 +77,7 @@ public class HystrixGatewayFilterFactory extends AbstractGatewayFilterFactory<Hy
 		}
 
 		return (exchange, chain) -> {
-			RouteHystrixCommand command = new RouteHystrixCommand(config.setter, config.fallback, exchange, chain);
+			RouteHystrixCommand command = new RouteHystrixCommand(config.setter, config.fallbackUri, exchange, chain);
 
 			return Mono.create(s -> {
 				Subscription sub = command.toObservable().subscribe(s::success, s::error, s::success);
@@ -140,9 +140,8 @@ public class HystrixGatewayFilterFactory extends AbstractGatewayFilterFactory<Hy
 
 	public static class Config {
 		private String name;
-		private String fallbackUri;
 		private Setter setter;
-		private URI fallback;
+		private URI fallbackUri;
 
 		public String getName() {
 			return name;
@@ -153,19 +152,22 @@ public class HystrixGatewayFilterFactory extends AbstractGatewayFilterFactory<Hy
 			return this;
 		}
 
-		public String getFallbackUri() {
+		public Config setFallbackUri(String fallbackUri) {
+			if (fallbackUri != null) {
+				setFallbackUri(URI.create(fallbackUri));
+			}
+			return this;
+		}
+
+		public URI getFallbackUri() {
 			return fallbackUri;
 		}
 
-		public Config setFallbackUri(String fallbackUri) {
-			this.fallbackUri = fallbackUri;
-			if (this.fallbackUri != null) {
-				fallback = URI.create(fallbackUri);
-				if (!"forward".equals(fallback.getScheme())) {
-					throw new IllegalArgumentException("Hystrix Filter currently only supports 'forward' URIs, found " + fallbackUri);
-				}
+		public void setFallbackUri(URI fallbackUri) {
+			if (fallbackUri != null && !"forward".equals(fallbackUri.getScheme())) {
+				throw new IllegalArgumentException("Hystrix Filter currently only supports 'forward' URIs, found " + fallbackUri);
 			}
-			return this;
+			this.fallbackUri = fallbackUri;
 		}
 
 		public Config setSetter(Setter setter) {