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

Don't run PreDecorationFilter if serviceId already set.

Browse Source 
fixes gh-695
This commit is contained in:
Spencer Gibb
2016-03-02 18:25:52 -07:00
parent 8a2a608af0
commit 472b9d1757
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java
View File

@@ -58,7 +58,8 @@ public class PreDecorationFilter extends ZuulFilter {
@Override
public boolean shouldFilter() {
RequestContext ctx = RequestContext.getCurrentContext();
return !ctx.containsKey("forward.to");
return !ctx.containsKey("forward.to") // another filter has already forwarded
&& !ctx.containsKey("serviceId"); // another filter has already determined serviceId
}
@Override

12
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilterTests.java
View File

@@ -68,6 +68,18 @@ public class PreDecorationFilterTests {
assertEquals("pre", this.filter.filterType());
}
@Test
public void skippedIfServiceIdSet() throws Exception {
RequestContext.getCurrentContext().set("serviceId", "myservice");
assertEquals(false, this.filter.shouldFilter());
}
@Test
public void skippedIfForwardToSet() throws Exception {
RequestContext.getCurrentContext().set("forward.to", "mycontext");
assertEquals(false, this.filter.shouldFilter());
}
@Test
public void prefixRouteAddsHeader() throws Exception {
this.properties.setPrefix("/api");