From 8b98f5ca07822892a730046dfe7b8fc73cf65070 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 22 Feb 2018 16:58:03 -0500 Subject: [PATCH] Update to tests due to new openfeign project --- .../src/main/java/demo/ExampleClient.java | 2 +- .../main/java/demo/FeignEagerInstantiationApplication.java | 2 +- feign-eureka/src/main/java/demo/HelloClientApplication.java | 4 ++-- feign-hystrix/src/main/java/demo/FeignClientApplication.java | 4 ++-- .../src/test/java/demo/FeignClientApplicationTests.java | 2 +- .../java/demo/FeignClientWithServerListApplicationTests.java | 4 ++-- feign/src/main/java/demo/FeignClientApplication.java | 4 ++-- .../java/demo/FeignClientWithServerListApplicationTests.java | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/feign-eager-instantiation/src/main/java/demo/ExampleClient.java b/feign-eager-instantiation/src/main/java/demo/ExampleClient.java index 91edab8..71819bf 100644 --- a/feign-eager-instantiation/src/main/java/demo/ExampleClient.java +++ b/feign-eager-instantiation/src/main/java/demo/ExampleClient.java @@ -1,6 +1,6 @@ package demo; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/feign-eager-instantiation/src/main/java/demo/FeignEagerInstantiationApplication.java b/feign-eager-instantiation/src/main/java/demo/FeignEagerInstantiationApplication.java index 6f00967..2d48647 100644 --- a/feign-eager-instantiation/src/main/java/demo/FeignEagerInstantiationApplication.java +++ b/feign-eager-instantiation/src/main/java/demo/FeignEagerInstantiationApplication.java @@ -2,7 +2,7 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.feign.EnableFeignClients; +import org.springframework.cloud.openfeign.EnableFeignClients; @EnableFeignClients // Workaround for Camden.RELEASE diff --git a/feign-eureka/src/main/java/demo/HelloClientApplication.java b/feign-eureka/src/main/java/demo/HelloClientApplication.java index 3f6bb60..664843d 100644 --- a/feign-eureka/src/main/java/demo/HelloClientApplication.java +++ b/feign-eureka/src/main/java/demo/HelloClientApplication.java @@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/feign-hystrix/src/main/java/demo/FeignClientApplication.java b/feign-hystrix/src/main/java/demo/FeignClientApplication.java index 34da72c..14f2bfa 100644 --- a/feign-hystrix/src/main/java/demo/FeignClientApplication.java +++ b/feign-hystrix/src/main/java/demo/FeignClientApplication.java @@ -4,8 +4,8 @@ import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java b/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java index 6031bda..2fc3323 100644 --- a/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java +++ b/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java @@ -9,7 +9,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.cloud.netflix.feign.EnableFeignClients; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; diff --git a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java index d5ac4c1..adc2ac2 100644 --- a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java +++ b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java @@ -9,8 +9,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; diff --git a/feign/src/main/java/demo/FeignClientApplication.java b/feign/src/main/java/demo/FeignClientApplication.java index 785c969..3e645ed 100644 --- a/feign/src/main/java/demo/FeignClientApplication.java +++ b/feign/src/main/java/demo/FeignClientApplication.java @@ -2,8 +2,8 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java index d92d6ed..4ab7528 100644 --- a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java +++ b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java @@ -9,8 +9,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner;