Commit 110f8727 by Dave Syer

Fix generic type signature (otherwise breaks with Spring 4.3)

parent 54931afa
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package org.springframework.cloud.netflix.endpoint; package org.springframework.cloud.netflix.endpoint;
import javax.servlet.Servlet;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -60,8 +61,8 @@ public abstract class ServletWrappingEndpoint implements InitializingBean, ...@@ -60,8 +61,8 @@ public abstract class ServletWrappingEndpoint implements InitializingBean,
this.controller.setApplicationContext(applicationContext); this.controller.setApplicationContext(applicationContext);
} }
protected ServletWrappingEndpoint(Class<?> servletClass, String servletName, protected ServletWrappingEndpoint(Class<? extends Servlet> servletClass,
String path, boolean sensitive, boolean enabled) { String servletName, String path, boolean sensitive, boolean enabled) {
this.controller.setServletClass(servletClass); this.controller.setServletClass(servletClass);
this.controller.setServletName(servletName); this.controller.setServletName(servletName);
this.path = path; this.path = path;
...@@ -76,12 +77,13 @@ public abstract class ServletWrappingEndpoint implements InitializingBean, ...@@ -76,12 +77,13 @@ public abstract class ServletWrappingEndpoint implements InitializingBean,
} }
public boolean isEnabled() { public boolean isEnabled() {
return enabled; return this.enabled;
} }
public ServletWrappingController getController() { public ServletWrappingController getController() {
return controller; return this.controller;
} }
@Override @Override
public String getPath() { public String getPath() {
return this.path; return this.path;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment