From bec6a13f05c68a2d4f8cb6508b7f8a52ccd17d72 Mon Sep 17 00:00:00 2001
From: saga <spring_holy@163.com>
Date: Tue, 2 Jan 2018 21:35:41 +0800
Subject: [PATCH] Minor changes (#300)

Code cleanup
---
 .../client/discovery/composite/CompositeDiscoveryClient.java | 2 +-
 .../commons/httpclient/DefaultApacheHttpClientFactory.java   | 5 +----
 .../cloud/commons/httpclient/DefaultOkHttpClientFactory.java | 2 --
 .../cloud/commons/httpclient/OkHttpClientFactory.java        | 3 ---
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java
index 62e40beb..21a328de 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java
@@ -32,7 +32,7 @@ public class CompositeDiscoveryClient implements DiscoveryClient {
 		if (this.discoveryClients != null) {
 			for (DiscoveryClient discoveryClient : discoveryClients) {
 				List<ServiceInstance> instances = discoveryClient.getInstances(serviceId);
-				if (instances != null && instances.size() > 0) {
+				if (instances != null && !instances.isEmpty()) {
 					return instances;
 				}
 			}
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java
index 66827bd8..da90c05e 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java
@@ -1,8 +1,5 @@
 package org.springframework.cloud.commons.httpclient;
 
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 
 /**
@@ -12,7 +9,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
 public class DefaultApacheHttpClientFactory implements ApacheHttpClientFactory {
 
 	/**
-	 * A default {@link HttpClientBuilder}.  The {@link HttpClientBuilder} returned will
+	 * A default {@link HttpClientBuilder}. The {@link HttpClientBuilder} returned will
 	 * have content compression disabled, cookie management disabled, and use system properties.
 	 */
 	@Override
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java
index 7ea0aad8..4c5fd074 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java
@@ -1,11 +1,9 @@
 package org.springframework.cloud.commons.httpclient;
 
-import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;
 
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
-import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java
index e4323ca0..25652393 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java
@@ -1,14 +1,11 @@
 package org.springframework.cloud.commons.httpclient;
 
-import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.util.concurrent.TimeUnit;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
 
 /**