From 262b35cd7af6fd2f0d6bccf71d8d1c5eebc77d1f Mon Sep 17 00:00:00 2001
From: Jianghao Lu <jianghaolu@users.noreply.github.com>
Date: Thu, 14 Jul 2016 15:09:22 -0700
Subject: [PATCH] Sync runtime with SDK repo

---
 .../main/java/com/microsoft/azure/RestClient.java   | 13 ++++++-------
 .../build-tools/src/main/resources/checkstyle.xml   |  1 -
 .../main/java/com/microsoft/rest/ServiceClient.java |  3 +++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/client/Java/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java b/src/client/Java/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
index 2cd137953f..0ace881f0e 100644
--- a/src/client/Java/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
+++ b/src/client/Java/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
@@ -14,6 +14,12 @@
 import com.microsoft.rest.credentials.ServiceClientCredentials;
 import com.microsoft.rest.retry.RetryHandler;
 import com.microsoft.rest.serializer.JacksonMapperAdapter;
+import okhttp3.ConnectionPool;
+import okhttp3.Interceptor;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
 
 import java.lang.reflect.Field;
 import java.net.CookieManager;
@@ -22,13 +28,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.ConnectionPool;
-import okhttp3.Interceptor;
-import okhttp3.JavaNetCookieJar;
-import okhttp3.OkHttpClient;
-import okhttp3.logging.HttpLoggingInterceptor;
-import retrofit2.Retrofit;
-
 /**
  * An instance of this class stores the client information for making REST calls.
  */
diff --git a/src/client/Java/build-tools/src/main/resources/checkstyle.xml b/src/client/Java/build-tools/src/main/resources/checkstyle.xml
index 1875d6f100..b7f9348982 100644
--- a/src/client/Java/build-tools/src/main/resources/checkstyle.xml
+++ b/src/client/Java/build-tools/src/main/resources/checkstyle.xml
@@ -231,7 +231,6 @@
         -->
 
         <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
         <module name="InterfaceIsType"/>
         <module name="VisibilityModifier">
             <property name="protectedAllowed" value="true"/>
diff --git a/src/client/Java/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java b/src/client/Java/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
index 8311a243de..5d6f0f8503 100644
--- a/src/client/Java/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
+++ b/src/client/Java/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
@@ -40,6 +40,9 @@ protected ServiceClient(String baseUrl) {
     /**
      * Initializes a new instance of the ServiceClient class.
      *
+     * @param baseUrl the service base uri
+     * @param clientBuilder the http client builder
+     * @param restBuilder the retrofit rest client builder
      */
     protected ServiceClient(String baseUrl, OkHttpClient.Builder clientBuilder, Retrofit.Builder restBuilder) {
         if (clientBuilder == null) {