Ensure user-suppplied ZuulFilters are added properly

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulConfiguration.java

@@ -30,7 +30,7 @@ import com.netflix.zuul.http.ZuulServlet;
 @ConditionalOnExpression("${zuul.enabled:true}")
 public class ZuulConfiguration {
 
-    @Autowired(required=false)
+	@Autowired(required = false)
 	private TraceRepository traces;
 
 	@Autowired
@@ -39,11 +39,8 @@ public class ZuulConfiguration {
 	@Autowired
 	private ZuulProperties zuulProperties;
 
-    @Autowired
-    private Map<String, ZuulFilter> filters;
-
 	@Bean
-    public RouteLocator routes(){
+	public RouteLocator routes() {
 		return new RouteLocator(discovery, zuulProperties);
 	}
 
@@ -57,11 +54,19 @@ public class ZuulConfiguration {
 		return new ZuulHandlerMapping(routes(), zuulController(), zuulProperties);
 	}
 
+	@Configuration
+	protected static class ZuulFilterConfiguration {
+
+		@Autowired
+		private Map<String, ZuulFilter> filters;
+
 		@Bean
 		public FilterInitializer zuulFilterInitializer() {
 			return new FilterInitializer(filters);
 		}
 
+	}
+
 	// pre filters
 	@Bean
 	public DebugFilter debugFilter() {
@@ -82,7 +87,7 @@ public class ZuulConfiguration {
 	@Bean
 	public RibbonRoutingFilter ribbonRoutingFilter() {
 		RibbonRoutingFilter filter = new RibbonRoutingFilter();
-        if (traces!=null) {
+		if (traces != null) {
 			filter.setTraces(traces);
 		}
 		return filter;

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplication.java

@@ -3,10 +3,13 @@ package org.springframework.cloud.netflix.zuul;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.netflix.zuul.ZuulFilter;
+
 @SpringBootApplication
 @RestController
 @EnableZuulProxy
@@ -38,6 +41,28 @@ public class SampleZuulProxyApplication {
 		return "Hello world";
 	}
 	
+	@Bean
+	public ZuulFilter sampleFilter() {
+		return new ZuulFilter() {
+			@Override
+			public String filterType() {
+				return "pre";
+			}
+			@Override
+			public boolean shouldFilter() {
+				return true;
+			}
+			@Override
+			public Object run() {
+				return null;
+			}
+			@Override
+			public int filterOrder() {
+				return 0;
+			}
+		};
+	}
+	
 	public static void main(String[] args) {
 		SpringApplication.run(SampleZuulProxyApplication.class, args);
 	}

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplicationTests.java

@@ -38,6 +38,7 @@ public class SampleZuulProxyApplicationTests {
 		ResponseEntity<String> result = new TestRestTemplate().exchange("http://localhost:" + port + "/self/1",
 				HttpMethod.DELETE, new HttpEntity<Void>((Void) null), String.class);
 		assertEquals(HttpStatus.OK, result.getStatusCode());
+		assertEquals("Deleted!", result.getBody());
 	}
 
 }

spring-cloud-netflix-core/src/test/resources/application.yml

@@ -6,6 +6,9 @@ spring:
 eureka:
   server:
     enabled: false
+  client:
+    registerWithEureka: false
+    fetchRegistry: false
 #error:
 #  path: /myerror
 management: