From 9da71b1655d9cc0f00e1c139a63718616c680d3e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 1 Dec 2016 20:00:55 -0500 Subject: [PATCH] Removed unnecessary null check and fixed imports --- .../apache/RibbonLoadBalancingHttpClient.java | 19 ++++------- .../okhttp/OkHttpLoadBalancingClient.java | 32 +++++++------------ .../OkHttpLoadBalancingClientTests.java | 5 +-- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClient.java index 75e8f4e4..10fa59aa 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClient.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClient.java @@ -76,19 +76,12 @@ public class RibbonLoadBalancingHttpClient final IClientConfig configOverride) throws Exception { final RequestConfig.Builder builder = RequestConfig.custom(); IClientConfig config = configOverride != null ? configOverride : this.config; - if (config != null) { - builder.setConnectTimeout(config.get( - CommonClientConfigKey.ConnectTimeout, this.connectTimeout)); - builder.setSocketTimeout(config.get( - CommonClientConfigKey.ReadTimeout, this.readTimeout)); - builder.setRedirectsEnabled(config.get( - CommonClientConfigKey.FollowRedirects, this.followRedirects)); - } - else { - builder.setConnectTimeout(this.connectTimeout); - builder.setSocketTimeout(this.readTimeout); - builder.setRedirectsEnabled(this.followRedirects); - } + builder.setConnectTimeout(config.get( + CommonClientConfigKey.ConnectTimeout, this.connectTimeout)); + builder.setSocketTimeout(config.get( + CommonClientConfigKey.ReadTimeout, this.readTimeout)); + builder.setRedirectsEnabled(config.get( + CommonClientConfigKey.FollowRedirects, this.followRedirects)); final RequestConfig requestConfig = builder.build(); 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 a01db69b..bb568c4b 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 @@ -16,15 +16,17 @@ 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 java.net.URI; -import java.util.concurrent.TimeUnit; import org.springframework.cloud.netflix.ribbon.ServerIntrospector; import org.springframework.cloud.netflix.ribbon.support.AbstractLoadBalancingClient; import org.springframework.web.util.UriComponentsBuilder; + import com.netflix.client.config.CommonClientConfigKey; import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.ILoadBalancer; @@ -84,25 +86,15 @@ public class OkHttpLoadBalancingClient OkHttpClient getOkHttpClient(IClientConfig configOverride, boolean secure) { OkHttpClient.Builder builder = this.delegate.newBuilder(); IClientConfig config = configOverride != null ? configOverride : this.config; - if (config != null) { - builder.connectTimeout(config.get( - CommonClientConfigKey.ConnectTimeout, this.connectTimeout), TimeUnit.MILLISECONDS); - builder.readTimeout(config.get( - CommonClientConfigKey.ReadTimeout, this.readTimeout), TimeUnit.MILLISECONDS); - builder.followRedirects(config.get( + builder.connectTimeout(config.get( + CommonClientConfigKey.ConnectTimeout, this.connectTimeout), TimeUnit.MILLISECONDS); + builder.readTimeout(config.get( + CommonClientConfigKey.ReadTimeout, this.readTimeout), TimeUnit.MILLISECONDS); + builder.followRedirects(config.get( + CommonClientConfigKey.FollowRedirects, this.followRedirects)); + if (secure) { + builder.followSslRedirects(configOverride.get( CommonClientConfigKey.FollowRedirects, this.followRedirects)); - if (secure) { - builder.followSslRedirects(configOverride.get( - CommonClientConfigKey.FollowRedirects, this.followRedirects)); - } - } - else { - builder.connectTimeout(this.connectTimeout, TimeUnit.MILLISECONDS); - builder.readTimeout(this.readTimeout, TimeUnit.MILLISECONDS); - builder.followRedirects(this.followRedirects); - if (secure) { - builder.followSslRedirects(this.followRedirects); - } } return builder.build(); 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 750163ea..3a1153a3 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 @@ -16,6 +16,8 @@ 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; @@ -24,12 +26,11 @@ import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; + import com.netflix.client.config.CommonClientConfigKey; import com.netflix.client.config.DefaultClientConfigImpl; import com.netflix.client.config.IClientConfig; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; /** * @author Spencer Gibb