Remove Constant from HttpClient (#17814)

Azure · Nov 25, 2020 · c67d58b · c67d58b
1 parent c0827b3
commit c67d58b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/...p-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClient.java b/...p-jdk-httpclient/src/main/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClient.java
@@ -57,7 +57,7 @@ public Mono<HttpResponse> send(HttpRequest request) {
 
     @Override
     public Mono<HttpResponse> send(HttpRequest request, Context context) {
-        boolean eagerlyReadResponse = (boolean) context.getData(EAGERLY_READ_RESPONSE_CONTEXT_KEY).orElse(false);
+        boolean eagerlyReadResponse = (boolean) context.getData("azure-eagerly-read-response").orElse(false);
 
         return toJdkHttpRequest(request)
             .flatMap(jdkRequest -> Mono.fromCompletionStage(jdkHttpClient.sendAsync(jdkRequest, ofPublisher()))

diff --git a/...e/azure-core-http-netty/src/main/java/com/azure/core/http/netty/NettyAsyncHttpClient.java b/...e/azure-core-http-netty/src/main/java/com/azure/core/http/netty/NettyAsyncHttpClient.java
@@ -73,7 +73,7 @@ public Mono<HttpResponse> send(HttpRequest request, Context context) {
         Objects.requireNonNull(request.getUrl(), "'request.getUrl()' cannot be null.");
         Objects.requireNonNull(request.getUrl().getProtocol(), "'request.getUrl().getProtocol()' cannot be null.");
 
-        boolean eagerlyReadResponse = (boolean) context.getData(EAGERLY_READ_RESPONSE_CONTEXT_KEY).orElse(false);
+        boolean eagerlyReadResponse = (boolean) context.getData("azure-eagerly-read-response").orElse(false);
 
         return nettyClient
             .request(HttpMethod.valueOf(request.getHttpMethod().toString()))

diff --git a/...zure-core-http-okhttp/src/main/java/com/azure/core/http/okhttp/OkHttpAsyncHttpClient.java b/...zure-core-http-okhttp/src/main/java/com/azure/core/http/okhttp/OkHttpAsyncHttpClient.java
@@ -48,7 +48,7 @@ public Mono<HttpResponse> send(HttpRequest request) {
 
     @Override
     public Mono<HttpResponse> send(HttpRequest request, Context context) {
-        boolean eagerlyReadResponse = (boolean) context.getData(EAGERLY_READ_RESPONSE_CONTEXT_KEY).orElse(false);
+        boolean eagerlyReadResponse = (boolean) context.getData("azure-eagerly-read-response").orElse(false);
 
         return Mono.create(sink -> sink.onRequest(value -> {
             // Using MonoSink::onRequest for back pressure support.

diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java
@@ -11,12 +11,6 @@
  * A generic interface for sending HTTP requests and getting responses.
  */
 public interface HttpClient {
-    /**
-     * Key for {@link Context} where the value is a boolean flag that indicates whether the {@link HttpResponse} body
-     * should be eagerly read and buffered into memory.
-     */
-    String EAGERLY_READ_RESPONSE_CONTEXT_KEY = "azure-eagerly-read-response";
-
     /**
      * Send the provided request asynchronously.
      *

diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java
@@ -52,7 +52,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import static com.azure.core.http.HttpClient.EAGERLY_READ_RESPONSE_CONTEXT_KEY;
 import static com.azure.core.implementation.serializer.HttpResponseBodyDecoder.isReturnTypeDecodable;
 
 /**
@@ -124,7 +123,7 @@ public Object invoke(Object proxy, final Method method, Object[] args) {
             final HttpRequest request = createHttpRequest(methodParser, args);
             Context context = methodParser.setContext(args)
                 .addData("caller-method", methodParser.getFullyQualifiedMethodName())
-                .addData(EAGERLY_READ_RESPONSE_CONTEXT_KEY, isReturnTypeDecodable(methodParser.getReturnType()));
+                .addData("azure-eagerly-read-response", isReturnTypeDecodable(methodParser.getReturnType()));
             context = startTracingSpan(method, context);
 
             if (request.getBody() != null) {