Browse Source

Merge pull request #2114 from gzurowski/remove-lombok-from-hystrix-dashboard

Remove Lombok from spring-cloud-netflix-hystrix-dashboard module
pull/6/head
Ryan Baxter 7 years ago committed by GitHub
parent
commit
050dc31c97
  1. 7
      spring-cloud-netflix-hystrix-dashboard/pom.xml
  2. 7
      spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java

7
spring-cloud-netflix-hystrix-dashboard/pom.xml

@ -56,13 +56,6 @@
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>d3js</artifactId> <artifactId>d3js</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<!-- Only needed at compile time -->
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>

7
spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java

@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import lombok.extern.apachecommons.CommonsLog; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.Header; import org.apache.http.Header;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
@ -103,9 +103,10 @@ public class HystrixDashboardConfiguration {
* not yet support CORS (https://bugs.webkit.org/show_bug.cgi?id=61862) so that a UI * not yet support CORS (https://bugs.webkit.org/show_bug.cgi?id=61862) so that a UI
* can request a stream from a different server. * can request a stream from a different server.
*/ */
@CommonsLog
public static class ProxyStreamServlet extends HttpServlet { public static class ProxyStreamServlet extends HttpServlet {
private static final Log log = LogFactory.getLog(ProxyStreamServlet.class);
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String CONNECTION_CLOSE_VALUE = "close"; private static final String CONNECTION_CLOSE_VALUE = "close";

Loading…
Cancel
Save