Skip to content

Commit

Permalink
Sync Java runtime with changes in SDK (Azure#1270)
Browse files Browse the repository at this point in the history
* Sync runtime with SDK repo

* Reconstruct subtree

* Squashed 'src/client/Java/' content from commit 3596f48

git-subtree-dir: src/client/Java
git-subtree-split: 3596f48
  • Loading branch information
jianghaolu authored and amarzavery committed Jul 15, 2016
1 parent 138bca9 commit ca710eb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
*/
Expand Down
1 change: 0 additions & 1 deletion build-tools/src/main/resources/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
-->

<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
<module name="VisibilityModifier">
<property name="protectedAllowed" value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit ca710eb

Please sign in to comment.