From 32c0f90999fb7e88f0225f92a0051a1a03a3c46d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sun, 31 Jan 2016 16:19:51 +0000 Subject: [PATCH] Remove regex mapper properties from ZuulProperties It is up to the user to configure a mapper if needed (one is no longer provided automatically), so it doesn't need to take up space in ZuulProperties --- .../netflix/zuul/filters/ZuulProperties.java | 13 ----------- .../DiscoveryClientRouteLocatorTests.java | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ZuulProperties.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ZuulProperties.java index db49a56b..fd748bdc 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ZuulProperties.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ZuulProperties.java @@ -57,8 +57,6 @@ public class ZuulProperties { private boolean ignoreLocalService = true; - private RegexMapper regexMapper = new RegexMapper(); - @PostConstruct public void init() { for (Entry entry : this.routes.entrySet()) { @@ -75,17 +73,6 @@ public class ZuulProperties { } } - @Data - @AllArgsConstructor - @NoArgsConstructor - public static class RegexMapper { - private boolean enabled = false; - - private String servicePattern = "(?.*)-(?v.*$)"; - - private String routePattern = "${version}/${name}"; - } - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java index f8162353..2b8c8b09 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java @@ -41,6 +41,10 @@ import static org.junit.Assert.assertTrue; import static org.mockito.BDDMockito.given; import static org.mockito.MockitoAnnotations.initMocks; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @author Spencer Gibb * @author Dave Syer @@ -63,6 +67,19 @@ public class DiscoveryClientRouteLocatorTests { private ZuulProperties properties = new ZuulProperties(); + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class RegexMapper { + private boolean enabled = false; + + private String servicePattern = "(?.*)-(?v.*$)"; + + private String routePattern = "${version}/${name}"; + } + + private RegexMapper regexMapper = new RegexMapper(); + @Before public void init() { initMocks(this); @@ -590,8 +607,7 @@ public class DiscoveryClientRouteLocatorTests { .willReturn(Collections.singletonList(MYSERVICE)); PatternServiceRouteMapper regExServiceRouteMapper = new PatternServiceRouteMapper( - this.properties.getRegexMapper().getServicePattern(), - this.properties.getRegexMapper().getRoutePattern()); + this.regexMapper.getServicePattern(), this.regexMapper.getRoutePattern()); DiscoveryClientRouteLocator routeLocator = new DiscoveryClientRouteLocator("/", this.discovery, this.properties, regExServiceRouteMapper); List routesMap = routeLocator.getRoutes(); @@ -606,8 +622,7 @@ public class DiscoveryClientRouteLocatorTests { .willReturn(Collections.singletonList("rest-service-v1")); PatternServiceRouteMapper regExServiceRouteMapper = new PatternServiceRouteMapper( - this.properties.getRegexMapper().getServicePattern(), - this.properties.getRegexMapper().getRoutePattern()); + this.regexMapper.getServicePattern(), this.regexMapper.getRoutePattern()); DiscoveryClientRouteLocator routeLocator = new DiscoveryClientRouteLocator("/", this.discovery, this.properties, regExServiceRouteMapper); List routesMap = routeLocator.getRoutes();