From 110f87277921d7b7ed823bca56d6bbf24c1b5ca5 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 21 Jul 2016 08:24:50 +0100 Subject: [PATCH] Fix generic type signature (otherwise breaks with Spring 4.3) --- .../netflix/endpoint/ServletWrappingEndpoint.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java index f98afe4a..5148531b 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java @@ -16,6 +16,7 @@ package org.springframework.cloud.netflix.endpoint; +import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -60,8 +61,8 @@ public abstract class ServletWrappingEndpoint implements InitializingBean, this.controller.setApplicationContext(applicationContext); } - protected ServletWrappingEndpoint(Class servletClass, String servletName, - String path, boolean sensitive, boolean enabled) { + protected ServletWrappingEndpoint(Class servletClass, + String servletName, String path, boolean sensitive, boolean enabled) { this.controller.setServletClass(servletClass); this.controller.setServletName(servletName); this.path = path; @@ -76,12 +77,13 @@ public abstract class ServletWrappingEndpoint implements InitializingBean, } public boolean isEnabled() { - return enabled; + return this.enabled; } public ServletWrappingController getController() { - return controller; + return this.controller; } + @Override public String getPath() { return this.path;