From 789cf6d7528805b818595ccfaed8508fc839f779 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 15 Dec 2014 17:15:49 -0700 Subject: [PATCH] change the default route from / to /** fixes gh-105 --- .../cloud/netflix/zuul/ProxyRouteLocator.java | 2 +- .../cloud/netflix/zuul/ProxyRouteLocatorTests.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java index 91afe00d..1db05ef6 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java @@ -22,7 +22,7 @@ import org.springframework.util.StringUtils; @Slf4j public class ProxyRouteLocator { - public static final String DEFAULT_ROUTE = "/"; + public static final String DEFAULT_ROUTE = "/**"; private DiscoveryClient discovery; diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocatorTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocatorTests.java index 09455f09..5fc0e6b3 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocatorTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocatorTests.java @@ -147,7 +147,7 @@ public class ProxyRouteLocatorTests { @Test public void testGetDefaultRoute() { ProxyRouteLocator routeLocator = new ProxyRouteLocator(this.discovery, this.properties); - this.properties.getRoutes().put(ASERVICE, new ZuulRoute("/", ASERVICE)); + this.properties.getRoutes().put(ASERVICE, new ZuulRoute("/**", ASERVICE)); Map routesMap = routeLocator.getRoutes(); @@ -159,7 +159,7 @@ public class ProxyRouteLocatorTests { @Test public void testGetDefaultPhysicalRoute() { ProxyRouteLocator routeLocator = new ProxyRouteLocator(this.discovery, this.properties); - this.properties.getRoutes().put(ASERVICE, new ZuulRoute("/", "http://" + ASERVICE)); + this.properties.getRoutes().put(ASERVICE, new ZuulRoute("/**", "http://" + ASERVICE)); Map routesMap = routeLocator.getRoutes(); @@ -226,7 +226,7 @@ public class ProxyRouteLocatorTests { } protected void assertDefaultMapping(Map routesMap, String expectedRoute) { - String mapping = "/"; + String mapping = "/**"; String route = routesMap.get(mapping); assertEquals("routesMap had wrong value for " + mapping, expectedRoute, route);