SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove regex mapper properties from ZuulProperties

Browse Source 
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
This commit is contained in:
Dave Syer
2016-01-31 16:19:51 +00:00
parent 82d8a11021
commit 32c0f90999
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ZuulProperties.java
View File

@@ -57,8 +57,6 @@ public class ZuulProperties {
private boolean ignoreLocalService = true;
private RegexMapper regexMapper = new RegexMapper();
@PostConstruct
public void init() {
for (Entry<String, ZuulRoute> 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 = "(?<name>.*)-(?<version>v.*$)";
private String routePattern = "${version}/${name}";
}
@Data
@AllArgsConstructor
@NoArgsConstructor

23
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocatorTests.java
View File

@@ -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 = "(?<name>.*)-(?<version>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<Route> 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<Route> routesMap = routeLocator.getRoutes();