From ef056583c824ff7e58cc5c3468b80a4c13971a03 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Sat, 10 Feb 2018 09:38:25 -0500 Subject: [PATCH] Fix compile errors --- .../netflix/zuul/ZuulProxyAutoConfiguration.java | 3 ++- .../zuul/filters/TraceProxyRequestHelper.java | 16 ++++++++-------- .../zuul/FormZuulProxyApplicationTests.java | 5 +++-- .../FormZuulServletProxyApplicationTests.java | 5 +++-- .../zuul/filters/ProxyRequestHelperTests.java | 7 +++---- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java index 042e2755b..a65abcc60 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java @@ -20,10 +20,11 @@ import java.util.Collections; import java.util.List; import org.apache.http.impl.client.CloseableHttpClient; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.web.trace.HttpTraceRepository; +import org.springframework.boot.actuate.trace.http.HttpTraceRepository; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java index edec513ca..13bc5d768 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java @@ -30,17 +30,17 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.springframework.boot.actuate.web.trace.HttpExchangeTracer; -import org.springframework.boot.actuate.web.trace.HttpTrace; -import org.springframework.boot.actuate.web.trace.HttpTraceRepository; -import org.springframework.boot.actuate.web.trace.Include; -import org.springframework.boot.actuate.web.trace.TraceableRequest; -import org.springframework.util.MultiValueMap; +import javax.servlet.http.HttpServletRequest; import com.netflix.zuul.context.RequestContext; -import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletRequest; +import org.springframework.boot.actuate.trace.http.HttpExchangeTracer; +import org.springframework.boot.actuate.trace.http.HttpTrace; +import org.springframework.boot.actuate.trace.http.HttpTraceRepository; +import org.springframework.boot.actuate.trace.http.Include; +import org.springframework.boot.actuate.trace.http.TraceableRequest; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; /** * @author Spencer Gibb diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java index d4f8e436e..fae6ec92b 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java @@ -26,8 +26,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.actuate.web.trace.HttpTraceRepository; -import org.springframework.boot.actuate.web.trace.InMemoryHttpTraceRepository; + +import org.springframework.boot.actuate.trace.http.HttpTraceRepository; +import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java index eedc82657..d270b61e4 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java @@ -26,9 +26,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.web.trace.HttpTraceRepository; -import org.springframework.boot.actuate.web.trace.InMemoryHttpTraceRepository; +import org.springframework.boot.actuate.trace.http.HttpTraceRepository; +import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java index d8e6c809e..606f1548b 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelperTests.java @@ -20,16 +20,15 @@ import java.io.IOException; import java.util.List; import com.netflix.zuul.context.RequestContext; - import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.springframework.boot.actuate.web.trace.HttpTrace; -import org.springframework.boot.actuate.web.trace.HttpTraceRepository; -import org.springframework.boot.actuate.web.trace.InMemoryHttpTraceRepository; +import org.springframework.boot.actuate.trace.http.HttpTrace; +import org.springframework.boot.actuate.trace.http.HttpTraceRepository; +import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletRequest;