Merge branch 'master' of github.com:Netflix/EVCache

Netflix · Oct 22, 2016 · 259b4c2 · 259b4c2
2 parents 0e939dd + 5cd1dc4
commit 259b4c2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/evcacheproxy/src/main/java/com/netflix/evcache/service/StartServer.java b/evcacheproxy/src/main/java/com/netflix/evcache/service/StartServer.java
@@ -14,6 +14,7 @@
 import com.netflix.evcservice.service.StatusPage;
 import com.netflix.server.base.NFFilter;
 import com.netflix.server.base.lifecycle.BaseServerLifecycleListener;
+import com.sun.jersey.api.core.ResourceConfig;
 import com.sun.jersey.api.core.PackagesResourceConfig;
 import com.sun.jersey.guice.JerseyServletModule;
 import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
@@ -51,10 +52,11 @@ protected void configureServlets() {
 //                initParams.put(ServletContainer.FEATURE_FILTER_FORWARD_ON_404, "true");
 //                initParams.put("requestId.accept", "true");
 //                initParams.put("requestId.require", "true");
+                initParams.put(ResourceConfig.FEATURE_DISABLE_WADL, "true");
                 initParams.put(PackagesResourceConfig.PROPERTY_PACKAGES, "com.netflix.evcservice.resources");
                 filter("/*").through(NFFilter.class, initParams);
                 filter("/healthcheck", "/status").through(NFFilter.class, initParams);
-                serve("/*").with(GuiceContainer.class, createStandardServeParams());
+                serve("/*").with(GuiceContainer.class, initParams);
                 binder().bind(GuiceContainer.class).asEagerSingleton();
 
                 install(new EVCacheServiceModule());