Skip to content

Commit

Permalink
Extract all inner classes to their own files (Azure#321)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Schulte authored Dec 12, 2017
1 parent 1806ac5 commit 14705e4
Show file tree
Hide file tree
Showing 40 changed files with 641 additions and 585 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
import com.microsoft.rest.v2.credentials.ServiceClientCredentials;
import com.microsoft.rest.v2.http.HttpClient;
import com.microsoft.rest.v2.http.HttpPipeline;
import com.microsoft.rest.v2.http.HttpPipelineBuilder;
import com.microsoft.rest.v2.http.NettyClient;
import com.microsoft.rest.v2.policy.AddCookiesPolicy;
import com.microsoft.rest.v2.policy.CredentialsPolicy;
import com.microsoft.rest.v2.policy.LoggingPolicy;
import com.microsoft.rest.v2.policy.RequestPolicy;
import com.microsoft.rest.v2.policy.RequestPolicyFactory;
import com.microsoft.rest.v2.policy.RetryPolicy;
import com.microsoft.rest.v2.protocol.SerializerAdapter;
import com.microsoft.rest.v2.InvalidReturnTypeException;
Expand Down Expand Up @@ -143,7 +144,7 @@ private static <T> String getDefaultUserAgentString(Class<?> swaggerInterface) {
* @return the default HttpPipeline.
*/
public static HttpPipeline defaultPipeline(Class<?> swaggerInterface) {
return defaultPipeline(swaggerInterface, (RequestPolicy.Factory) null);
return defaultPipeline(swaggerInterface, (RequestPolicyFactory) null);
}

/**
Expand All @@ -165,9 +166,9 @@ public static HttpPipeline defaultPipeline(Class<?> swaggerInterface, ServiceCli
* pipeline.
* @return the default HttpPipeline.
*/
public static HttpPipeline defaultPipeline(Class<?> swaggerInterface, RequestPolicy.Factory credentialsPolicy) {
public static HttpPipeline defaultPipeline(Class<?> swaggerInterface, RequestPolicyFactory credentialsPolicy) {
final HttpClient httpClient = new NettyClient.Factory().create(null);
final HttpPipeline.Builder builder = new HttpPipeline.Builder().withHttpClient(httpClient);
final HttpPipelineBuilder builder = new HttpPipelineBuilder().withHttpClient(httpClient);
builder.withUserAgent(getDefaultUserAgentString(swaggerInterface));
builder.withRequestPolicy(new RetryPolicy.Factory());
builder.withRequestPolicy(new AddCookiesPolicy.Factory());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
import com.microsoft.rest.v2.http.HttpHeader;
import com.microsoft.rest.v2.http.HttpHeaders;
import com.microsoft.rest.v2.http.HttpPipeline;
import com.microsoft.rest.v2.http.HttpPipelineBuilder;
import com.microsoft.rest.v2.http.HttpRequest;
import com.microsoft.rest.v2.http.HttpResponse;
import com.microsoft.rest.v2.http.UrlBuilder;
import com.microsoft.rest.v2.policy.AddCookiesPolicy;
import com.microsoft.rest.v2.policy.CredentialsPolicy;
import com.microsoft.rest.v2.policy.RequestPolicy;
import com.microsoft.rest.v2.policy.RequestPolicyFactory;
import com.microsoft.rest.v2.policy.RetryPolicy;
import com.microsoft.rest.v2.policy.UserAgentPolicy;
import com.microsoft.rest.v2.protocol.SerializerAdapter;
Expand All @@ -32,8 +33,8 @@
import io.reactivex.Maybe;
import io.reactivex.Observable;
import io.reactivex.Single;
import org.joda.time.DateTime;
import io.reactivex.functions.Function;
import org.joda.time.DateTime;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -591,7 +592,7 @@ public static SerializerAdapter<?> createDefaultSerializer() {
* @return the default HttpPipeline.
*/
public static HttpPipeline createDefaultPipeline() {
return createDefaultPipeline((RequestPolicy.Factory) null);
return createDefaultPipeline((RequestPolicyFactory) null);
}

/**
Expand All @@ -609,8 +610,8 @@ public static HttpPipeline createDefaultPipeline(ServiceClientCredentials creden
* pipeline.
* @return the default HttpPipeline.
*/
public static HttpPipeline createDefaultPipeline(RequestPolicy.Factory credentialsPolicy) {
final HttpPipeline.Builder builder = new HttpPipeline.Builder();
public static HttpPipeline createDefaultPipeline(RequestPolicyFactory credentialsPolicy) {
final HttpPipelineBuilder builder = new HttpPipelineBuilder();
builder.withRequestPolicy(new UserAgentPolicy.Factory());
builder.withRequestPolicy(new RetryPolicy.Factory());
builder.withRequestPolicy(new AddCookiesPolicy.Factory());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*/

package com.microsoft.rest.v2.http;

/**
* An abstract Logger for HttpPipeline RequestPolicies that contains functionality that is
* common to Loggers.
*/
public abstract class AbstractHttpPipelineLogger implements HttpPipelineLogger {
private HttpPipelineLogLevel minimumLogLevel = HttpPipelineLogLevel.INFO;

/**
* Set the minimum log level that this logger should log. Anything with a higher log level
* should be ignored.
* @param minimumLogLevel The minimum log level to set.
* @return This Logger.
*/
public AbstractHttpPipelineLogger withMinimumLogLevel(HttpPipelineLogLevel minimumLogLevel) {
this.minimumLogLevel = minimumLogLevel;
return this;
}

@Override
public HttpPipelineLogLevel minimumLogLevel() {
return minimumLogLevel;
}

protected static String format(String message, Object... formattedMessageArguments) {
if (formattedMessageArguments != null && formattedMessageArguments.length >= 1) {
message = String.format(message, formattedMessageArguments);
}
return message;
}
}
Loading

0 comments on commit 14705e4

Please sign in to comment.