From ac3401bc4fac2638e3adae8609916260e4e375f5 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 1 Dec 2016 20:03:26 -0500 Subject: [PATCH] Fixed import ordering --- .../netflix/ribbon/okhttp/OkHttpLoadBalancingClient.java | 8 ++++---- .../ribbon/okhttp/OkHttpLoadBalancingClientTests.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClient.java index bb568c4b..2131cdcd 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClient.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClient.java @@ -19,10 +19,6 @@ package org.springframework.cloud.netflix.ribbon.okhttp; import java.net.URI; import java.util.concurrent.TimeUnit; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - import org.springframework.cloud.netflix.ribbon.ServerIntrospector; import org.springframework.cloud.netflix.ribbon.support.AbstractLoadBalancingClient; import org.springframework.web.util.UriComponentsBuilder; @@ -32,6 +28,10 @@ import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.Server; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; + import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToHttpsIfNeeded; /** diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java index 3a1153a3..2411d0bf 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java @@ -18,7 +18,6 @@ package org.springframework.cloud.netflix.ribbon.okhttp; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import okhttp3.OkHttpClient; import org.junit.Test; import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration; @@ -31,6 +30,7 @@ import com.netflix.client.config.CommonClientConfigKey; import com.netflix.client.config.DefaultClientConfigImpl; import com.netflix.client.config.IClientConfig; +import okhttp3.OkHttpClient; /** * @author Spencer Gibb