Update Storage to azure-core preview 3

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle.xml

@@ -60,7 +60,12 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <module name="LocalFinalVariableName"/>
     <module name="LocalVariableName"/>
     <module name="MemberName"/>
-    <module name="MethodName"/>
+    <module name="MethodName">
+      <!-- Use default MethodName but block the use of 'builder' as method name -->
+      <property name="format" value="(?=^[a-z][a-zA-Z0-9]*$)(?!^(?i)builder$)"/>
+      <!-- allow the name on private methods  -->
+      <property name="applyToPrivate" value="false"/>
+    </module>
     <module name="PackageName"/>
     <module name="ParameterName"/>
     <module name="StaticVariableName"/>

sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClientBuilder.java

@@ -3,6 +3,7 @@
 
 package com.azure.data.appconfiguration;
 
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.implementation.annotation.ServiceClientBuilder;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.data.appconfiguration.credentials.ConfigurationClientCredentials;
@@ -165,7 +166,7 @@ public ConfigurationAsyncClient buildAsyncClient() {
         HttpPolicyProviders.addAfterRetryPolicies(policies);
         policies.add(new HttpLoggingPolicy(httpLogDetailLevel));
 
-        HttpPipeline pipeline = HttpPipeline.builder()
+        HttpPipeline pipeline = new HttpPipelineBuilder()
             .policies(policies.toArray(new HttpPipelinePolicy[0]))
             .httpClient(httpClient)
             .build();

sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationClientJavaDocCodeSnippets.java

@@ -4,6 +4,7 @@
 package com.azure.data.appconfiguration;
 
 import com.azure.core.http.HttpPipeline;
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.rest.Response;
 import com.azure.core.test.models.RecordedData;
 import com.azure.core.test.policy.RecordNetworkCallPolicy;
@@ -34,7 +35,7 @@ public ConfigurationClient createAsyncConfigurationClientWithPipeline() {
             String connectionString = getConnectionString();
             // BEGIN: com.azure.data.applicationconfig.configurationclient.pipeline.instantiation
             RecordedData networkData = new RecordedData();
-            HttpPipeline pipeline = HttpPipeline.builder().policies(new RecordNetworkCallPolicy(networkData)).build();
+            HttpPipeline pipeline = new HttpPipelineBuilder().policies(new RecordNetworkCallPolicy(networkData)).build();
 
             ConfigurationClient configurationClient = new ConfigurationClientBuilder()
                 .pipeline(pipeline)

sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java

@@ -8,6 +8,7 @@
 import com.azure.core.http.HttpMethod;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpRequest;
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.HttpResponse;
 import com.azure.core.http.policy.CookiePolicy;
 import com.azure.core.http.policy.HttpPipelinePolicy;
@@ -189,7 +190,7 @@ public static HttpPipeline createDefaultPipeline(Class<?> swaggerInterface, Http
             policies.add(credentialsPolicy);
         }
 
-        return HttpPipeline.builder()
+        return new HttpPipelineBuilder()
             .policies(policies.toArray(new HttpPipelinePolicy[0]))
             .build();
     }

sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java

@@ -3,6 +3,7 @@
 
 package com.azure.core.management;
 
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.implementation.annotation.BodyParam;
 import com.azure.core.implementation.annotation.Delete;
 import com.azure.core.implementation.annotation.ExpectedResponses;
@@ -764,7 +765,7 @@ public void service18GetStatus500WithExpectedResponse500() {
     }
 
     private <T> T createService(Class<T> serviceClass) {
-        HttpPipeline pipeline = HttpPipeline.builder()
+        HttpPipeline pipeline = new HttpPipelineBuilder()
             .httpClient(createHttpClient())
             .build();
         //

sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java

@@ -3,6 +3,7 @@
 
 package com.azure.core.management.implementation;
 
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.implementation.annotation.Delete;
 import com.azure.core.implementation.annotation.ExpectedResponses;
 import com.azure.core.implementation.annotation.Get;
@@ -851,7 +852,7 @@ public Mono<HttpResponse> send(HttpRequest request) {
     }
 
     private static <T> T createMockService(Class<T> serviceClass, MockAzureHttpClient httpClient) {
-        HttpPipeline pipeline = HttpPipeline.builder()
+        HttpPipeline pipeline = new HttpPipelineBuilder()
             .httpClient(httpClient)
             .build();
 

sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java

@@ -3,12 +3,6 @@
 
 package com.azure.core.http;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializable;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
@@ -17,7 +11,7 @@
 /**
  * A collection of headers on an HTTP request or response.
  */
-public class HttpHeaders implements Iterable<HttpHeader>, JsonSerializable {
+public class HttpHeaders implements Iterable<HttpHeader> {
     private final Map<String, HttpHeader> headers = new HashMap<>();
 
     /**
@@ -128,14 +122,4 @@ public Map<String, String> toMap() {
     public Iterator<HttpHeader> iterator() {
         return headers.values().iterator();
     }
-
-    @Override
-    public void serialize(JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
-        jsonGenerator.writeObject(toMap());
-    }
-
-    @Override
-    public void serializeWithType(JsonGenerator jsonGenerator, SerializerProvider serializerProvider, TypeSerializer typeSerializer) throws IOException {
-        serialize(jsonGenerator, serializerProvider);
-    }
 }

sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java

@@ -18,15 +18,6 @@ public final class HttpPipeline {
     private final HttpPipelinePolicy[] pipelinePolicies;
 
 
-    /**
-     * Creates a builder that can configure options for the HttpPipeline before creating an instance of it.
-     *
-     * @return A new {@link HttpPipelineBuilder} to create a HttpPipeline from.
-     */
-    public static HttpPipelineBuilder builder() {
-        return new HttpPipelineBuilder();
-    }
-
     /**
      * Creates a HttpPipeline holding array of policies that gets applied to all request initiated through
      * {@link HttpPipeline#send(HttpPipelineCallContext)} and it's response.

sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java

@@ -21,14 +21,14 @@
  * <p>Create a pipeline without configuration</p>
  *
  * <pre>
- * HttpPipeline.builder()
+ * new HttpPipelineBuilder()
  *     .build();
  * </pre>
  *
  * <p>Create a pipeline using the default HTTP client and a retry policy</p>
  *
  * <pre>
- * HttpPipeline.builder()
+ * new HttpPipelineBuilder()
  *     .httpClient(HttpClient.createDefault())
  *     .policies(new RetryPolicy())
  *     .build();
@@ -41,7 +41,12 @@ public class HttpPipelineBuilder {
     private List<HttpPipelinePolicy> pipelinePolicies;
 
 
-    HttpPipelineBuilder() {
+    /**
+     -     * Creates a builder that can configure options for the HttpPipeline before creating an instance of it.
+     -     *
+     -     * @return A new {@link HttpPipelineBuilder} to create a HttpPipeline from.
+     */
+    public HttpPipelineBuilder() {
     }
 
     /**

sdk/core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java

@@ -11,6 +11,7 @@
 import com.azure.core.http.HttpMethod;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpRequest;
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.HttpResponse;
 import com.azure.core.http.policy.CookiePolicy;
 import com.azure.core.http.policy.HttpPipelinePolicy;
@@ -624,7 +625,7 @@ public static HttpPipeline createDefaultPipeline(HttpPipelinePolicy credentialsP
             policies.add(credentialsPolicy);
         }
 
-        return HttpPipeline.builder()
+        return new HttpPipelineBuilder()
             .policies(policies.toArray(new HttpPipelinePolicy[0]))
             .build();
     }

sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/HttpHeadersSerializer.java

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.core.implementation.serializer.jackson;
+
+import com.azure.core.http.HttpHeaders;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+import java.io.IOException;
+
+/**
+ * Custom serializer for serializing {@code HttpHeaders} objects into Base64 strings.
+ */
+final class HttpHeadersSerializer extends JsonSerializer<HttpHeaders> {
+    /**
+     * Gets a module wrapping this serializer as an adapter for the Jackson
+     * ObjectMapper.
+     *
+     * @return a simple module to be plugged onto Jackson ObjectMapper.
+     */
+    public static SimpleModule getModule() {
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(HttpHeaders.class, new HttpHeadersSerializer());
+        return module;
+    }
+
+    @Override
+    public void serialize(HttpHeaders value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+        jgen.writeObject(value.toMap());
+    }
+}

sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java

@@ -170,7 +170,8 @@ private static <T extends ObjectMapper> T initializeObjectMapper(T mapper) {
                 .registerModule(Base64UrlSerializer.getModule())
                 .registerModule(DateTimeSerializer.getModule())
                 .registerModule(DateTimeRfc1123Serializer.getModule())
-                .registerModule(DurationSerializer.getModule());
+                .registerModule(DurationSerializer.getModule())
+                .registerModule(HttpHeadersSerializer.getModule());
         mapper.setVisibility(mapper.getSerializationConfig().getDefaultVisibilityChecker()
                 .withFieldVisibility(JsonAutoDetect.Visibility.ANY)
                 .withSetterVisibility(JsonAutoDetect.Visibility.NONE)

sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java

@@ -3,6 +3,7 @@
 
 package com.azure.core.implementation.util;
 
+import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
@@ -199,6 +200,16 @@ public static <T> Mono<T> withContext(Function<Context, Mono<T>> serviceCall) {
             .flatMap(serviceCall);
     }
 
+    /**
+     * Converts the incoming content to Mono.
+     *
+     * @param response whose {@link Response#value() value} is to be converted
+     * @return The converted {@link Mono}
+     */
+    public static <T> Mono<T> toMono(Response<T> response) {
+        return Mono.justOrEmpty(response.value());
+    }
+
     /**
      * This method converts the incoming {@code subscriberContext} from {@link reactor.util.context.Context Reactor
      * Context} to {@link Context Azure Context} and calls the given lambda function with this context and returns a

sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java

@@ -3,6 +3,9 @@
 
 package com.azure.core.implementation.util;
 
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -54,4 +57,33 @@ private Mono<String> serviceCallReturnsSingle(String prefix, Context context) {
         return Mono.empty();
     }
 
+    /**
+     * Implementation not provided
+     * @param value The value
+     * @return A {@link Mono} containing a {@link Response} containing a {@link Response#value() value}.
+     */
+    private <T> Mono<Response<T>> getMonoRestResponse(T value) {
+        Response<T> response = new Response<T>() {
+            @Override
+            public int statusCode() {
+                return 200;
+            }
+
+            @Override
+            public HttpHeaders headers() {
+                return null;
+            }
+
+            @Override
+            public HttpRequest request() {
+                return null;
+            }
+
+            @Override
+            public T value() {
+                return value;
+            }
+        };
+        return Mono.just(response);
+    }
 }

sdk/core/azure-core/src/test/java/com/azure/core/UserAgentTests.java

@@ -6,6 +6,7 @@
 import com.azure.core.http.HttpMethod;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpRequest;
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.HttpResponse;
 import com.azure.core.http.MockHttpClient;
 import com.azure.core.http.MockHttpResponse;
@@ -19,7 +20,7 @@
 public class UserAgentTests {
     @Test
     public void defaultUserAgentTests() throws Exception {
-        final HttpPipeline pipeline = HttpPipeline.builder()
+        final HttpPipeline pipeline = new HttpPipelineBuilder()
             .httpClient(new MockHttpClient() {
                 @Override
                 public Mono<HttpResponse> send(HttpRequest request) {
@@ -40,7 +41,7 @@ public Mono<HttpResponse> send(HttpRequest request) {
 
     @Test
     public void customUserAgentTests() throws Exception {
-        final HttpPipeline pipeline = HttpPipeline.builder()
+        final HttpPipeline pipeline = new HttpPipelineBuilder()
             .httpClient(new MockHttpClient() {
                 @Override
                 public Mono<HttpResponse> send(HttpRequest request) {

sdk/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java

@@ -5,6 +5,7 @@
 
 import com.azure.core.http.HttpMethod;
 import com.azure.core.http.HttpPipeline;
+import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.HttpRequest;
 import com.azure.core.http.MockHttpClient;
 import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
@@ -28,7 +29,7 @@ public void basicCredentialsTest() throws Exception {
             return next.process();
         };
         //
-        final HttpPipeline pipeline = HttpPipeline.builder()
+        final HttpPipeline pipeline = new HttpPipelineBuilder()
             .httpClient(new MockHttpClient())
             .policies((context, next) -> credentials.getToken("scope./default")
                 .flatMap(token -> {
@@ -56,7 +57,7 @@ public Mono<AccessToken> getToken(String... scopes) {
             return next.process();
         };
 
-        final HttpPipeline pipeline = HttpPipeline.builder()
+        final HttpPipeline pipeline = new HttpPipelineBuilder()
             .httpClient(new MockHttpClient())
             .policies(new BearerTokenAuthenticationPolicy(credentials, "scope./default"), auditorPolicy)
             .build();