From 94d7d2574b0345595c9b8bcf17edbffdd57e3ce1 Mon Sep 17 00:00:00 2001 From: saga Date: Wed, 10 Jan 2018 23:51:47 +0800 Subject: [PATCH] Minor changes (#2632) * Remove invalid import * Remove invalid line --- .../cloud/netflix/feign/FeignClientFactoryTests.java | 8 +++++--- .../netflix/feign/FeignClientUsingPropertiesTests.java | 3 ++- .../cloud/netflix/ribbon/PropertiesFactory.java | 2 -- .../cloud/netflix/ribbon/SpringRetryDisabledTests.java | 2 -- .../cloud/netflix/ribbon/SpringRetryEnabledTests.java | 1 - .../ribbon/ZonePreferenceServerListFilterTests.java | 1 - .../cloud/netflix/zuul/RoutesEndpointTests.java | 1 - 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientFactoryTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientFactoryTests.java index 30921294..e3587367 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientFactoryTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientFactoryTests.java @@ -16,15 +16,17 @@ package org.springframework.cloud.netflix.feign; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import java.util.Arrays; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; + /** * @author Spencer Gibb */ diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientUsingPropertiesTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientUsingPropertiesTests.java index 5822444d..bc3ff336 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientUsingPropertiesTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientUsingPropertiesTests.java @@ -39,7 +39,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; /** * @author Eko Kurniawan Khannedy diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java index ed0fc42f..3e26ee31 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java +++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/PropertiesFactory.java @@ -13,8 +13,6 @@ import com.netflix.loadbalancer.ServerList; import com.netflix.loadbalancer.ServerListFilter; import static org.springframework.cloud.netflix.ribbon.SpringClientFactory.NAMESPACE; -import static org.springframework.cloud.netflix.ribbon.SpringClientFactory.instantiateWithConfig; - /** * @author Spencer Gibb diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryDisabledTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryDisabledTests.java index 848f1304..e32733a7 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryDisabledTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryDisabledTests.java @@ -33,8 +33,6 @@ import org.springframework.context.ConfigurableApplicationContext; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.core.Is.is; /** * @author Ryan Baxter diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java index 52e6d108..1c66f951 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java @@ -19,7 +19,6 @@ package org.springframework.cloud.netflix.ribbon; import java.util.Map; -import org.hamcrest.Matchers; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.BeansException; diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilterTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilterTests.java index e7524e47..6dfefc59 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilterTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilterTests.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.netflix.ribbon.ZonePreferenceServerListFilter; import org.springframework.test.util.ReflectionTestUtils; import com.netflix.loadbalancer.Server; diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointTests.java index 3cd93d67..ffe2de8f 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointTests.java @@ -27,7 +27,6 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.netflix.zuul.RoutesEndpoint; import org.springframework.cloud.netflix.zuul.filters.Route; import org.springframework.cloud.netflix.zuul.filters.RouteLocator;