Cleanup Based on Changes in Generated Code (Azure#31594)

Cleanup Based on Changes in Generated Code

Author: alzimmermsft

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/ServicesImpl.java

@@ -531,6 +531,73 @@ public Mono<BlobServiceStatistics> getStatisticsAsync(Integer timeout, String re
                 .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
+    /**
+     * The List Containers Segment operation returns a list of the containers under the specified account.
+     *
+     * @param prefix Filters the results to return only containers whose name begins with the specified prefix.
+     * @param marker A string value that identifies the portion of the list of containers to be returned with the next
+     *     listing operation. The operation returns the NextMarker value within the response body if the listing
+     *     operation did not return all containers remaining to be listed with the current page. The NextMarker value
+     *     can be used as the value for the marker parameter in a subsequent call to request the next page of list
+     *     items. The marker value is opaque to the client.
+     * @param maxresults Specifies the maximum number of containers to return. If the request does not specify
+     *     maxresults, or specifies a value greater than 5000, the server will return up to 5000 items. Note that if the
+     *     listing operation crosses a partition boundary, then the service will return a continuation token for
+     *     retrieving the remainder of the results. For this reason, it is possible that the service will return fewer
+     *     results than specified by maxresults, or than the default of 5000.
+     * @param listBlobContainersIncludeType Include this parameter to specify that the container's metadata be returned
+     *     as part of the response body.
+     * @param timeout The timeout parameter is expressed in seconds. For more information, see &lt;a
+     *     href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations"&gt;Setting
+     *     Timeouts for Blob Service Operations.&lt;/a&gt;.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
+     *     analytics logs when storage analytics logging is enabled.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws BlobStorageException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return an enumeration of containers along with {@link PagedResponse} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<PagedResponse<BlobContainerItem>> listBlobContainersSegmentSinglePageAsync(
+            String prefix,
+            String marker,
+            Integer maxresults,
+            List<ListBlobContainersIncludeType> listBlobContainersIncludeType,
+            Integer timeout,
+            String requestId) {
+        final String comp = "list";
+        final String accept = "application/xml";
+        String listBlobContainersIncludeTypeConverted =
+                (listBlobContainersIncludeType == null)
+                        ? null
+                        : listBlobContainersIncludeType.stream()
+                                .map(value -> Objects.toString(value, ""))
+                                .collect(Collectors.joining(","));
+        return FluxUtil.withContext(
+                        context ->
+                                service.listBlobContainersSegment(
+                                        this.client.getUrl(),
+                                        comp,
+                                        prefix,
+                                        marker,
+                                        maxresults,
+                                        listBlobContainersIncludeTypeConverted,
+                                        timeout,
+                                        this.client.getVersion(),
+                                        requestId,
+                                        accept,
+                                        context))
+                .map(
+                        res ->
+                                new PagedResponseBase<>(
+                                        res.getRequest(),
+                                        res.getStatusCode(),
+                                        res.getHeaders(),
+                                        res.getValue().getBlobContainerItems(),
+                                        res.getValue().getNextMarker(),
+                                        res.getDeserializedHeaders()));
+    }
+
     /**
      * The List Containers Segment operation returns a list of the containers under the specified account.
      *
@@ -632,14 +699,11 @@ public PagedFlux<BlobContainerItem> listBlobContainersSegmentAsync(
             List<ListBlobContainersIncludeType> listBlobContainersIncludeType,
             Integer timeout,
             String requestId) {
-        // TODO (alzimmer): This wasn't passing context as there is no Context to pass.
-        //  There will be a fix for this in a future Autorest release but for now this was done manually.
-        // Adding this comment to make this obvious on diff.
-        return new PagedFlux<>(() -> FluxUtil.withContext(context ->
-            listBlobContainersSegmentSinglePageAsync(
-                prefix, marker, maxresults, listBlobContainersIncludeType, timeout, requestId, context)),
-            nextLink -> FluxUtil.withContext(context ->
-                listBlobContainersSegmentNextSinglePageAsync(nextLink, requestId, context)));
+        return new PagedFlux<>(
+                () ->
+                        listBlobContainersSegmentSinglePageAsync(
+                                prefix, marker, maxresults, listBlobContainersIncludeType, timeout, requestId),
+                nextLink -> listBlobContainersSegmentNextSinglePageAsync(nextLink, requestId));
     }
 
     /**
@@ -1283,6 +1347,42 @@ public Mono<FilterBlobSegment> filterBlobsAsync(
                 .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
+    /**
+     * Get the next page of items.
+     *
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
+     * @param requestId Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the
+     *     analytics logs when storage analytics logging is enabled.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws BlobStorageException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return an enumeration of containers along with {@link PagedResponse} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<PagedResponse<BlobContainerItem>> listBlobContainersSegmentNextSinglePageAsync(
+            String nextLink, String requestId) {
+        final String accept = "application/xml";
+        return FluxUtil.withContext(
+                        context ->
+                                service.listBlobContainersSegmentNext(
+                                        nextLink,
+                                        this.client.getUrl(),
+                                        this.client.getVersion(),
+                                        requestId,
+                                        accept,
+                                        context))
+                .map(
+                        res ->
+                                new PagedResponseBase<>(
+                                        res.getRequest(),
+                                        res.getStatusCode(),
+                                        res.getHeaders(),
+                                        res.getValue().getBlobContainerItems(),
+                                        res.getValue().getNextMarker(),
+                                        res.getDeserializedHeaders()));
+    }
+
     /**
      * Get the next page of items.
      *

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/accesshelpers/BlobQueryHeadersConstructorProxy.java

@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.blob.implementation.accesshelpers;
+
+import com.azure.storage.blob.implementation.models.BlobsQueryHeaders;
+import com.azure.storage.blob.models.BlobQueryHeaders;
+
+/**
+ * Helper class to access private values of {@link BlobQueryHeaders} across package boundaries.
+ */
+public final class BlobQueryHeadersConstructorProxy {
+    private static BlobQueryHeadersConstructorAccessor accessor;
+
+    private BlobQueryHeadersConstructorProxy() { }
+
+    /**
+     * Type defining the methods to set the non-public properties of a {@link BlobQueryHeaders} instance.
+     */
+    public interface BlobQueryHeadersConstructorAccessor {
+        /**
+         * Creates a new instance of {@link BlobQueryHeaders} backed by an internal instance of
+         * {@link BlobsQueryHeaders}.
+         *
+         * @param internalHeader The internal headers.
+         * @return A new instance of {@link BlobQueryHeaders}.
+         */
+        BlobQueryHeaders create(BlobsQueryHeaders internalHeader);
+    }
+
+    /**
+     * The method called from {@link BlobQueryHeaders} to set it's accessor.
+     *
+     * @param accessor The accessor.
+     */
+    public static void setAccessor(final BlobQueryHeadersConstructorAccessor accessor) {
+        BlobQueryHeadersConstructorProxy.accessor = accessor;
+    }
+
+    /**
+     * Creates a new instance of {@link BlobQueryHeaders} backed by an internal instance of
+     * {@link BlobsQueryHeaders}.
+     *
+     * @param internalHeaders The internal headers.
+     * @return A new instance of {@link BlobQueryHeaders}.
+     */
+    public static BlobQueryHeaders create(BlobsQueryHeaders internalHeaders) {
+        // This looks odd but is necessary, it is possible to engage the access helper before anywhere else in the
+        // application accesses BlobQueryHeaders which triggers the accessor to be configured. So, if the accessor
+        // is null this effectively pokes the class to set up the accessor.
+        if (accessor == null) {
+            new BlobQueryHeaders();
+        }
+
+        assert accessor != null;
+        return accessor.create(internalHeaders);
+    }
+}

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/util/ModelHelper.java

@@ -9,18 +9,18 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.core.util.serializer.JacksonAdapter;
-import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.storage.blob.BlobAsyncClient;
 import com.azure.storage.blob.implementation.accesshelpers.BlobDownloadHeadersConstructorProxy;
 import com.azure.storage.blob.implementation.accesshelpers.BlobPropertiesConstructorProxy;
+import com.azure.storage.blob.implementation.accesshelpers.BlobQueryHeadersConstructorProxy;
 import com.azure.storage.blob.implementation.models.BlobItemInternal;
 import com.azure.storage.blob.implementation.models.BlobItemPropertiesInternal;
 import com.azure.storage.blob.implementation.models.BlobName;
 import com.azure.storage.blob.implementation.models.BlobPropertiesInternalDownload;
 import com.azure.storage.blob.implementation.models.BlobTag;
 import com.azure.storage.blob.implementation.models.BlobTags;
 import com.azure.storage.blob.implementation.models.BlobsDownloadHeaders;
+import com.azure.storage.blob.implementation.models.BlobsQueryHeaders;
 import com.azure.storage.blob.implementation.models.FilterBlobItem;
 import com.azure.storage.blob.models.BlobBeginCopySourceRequestConditions;
 import com.azure.storage.blob.models.BlobDownloadAsyncResponse;
@@ -41,7 +41,6 @@
 import com.azure.storage.common.Utility;
 import com.azure.storage.common.implementation.Constants;
 
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -53,12 +52,10 @@
 
 /**
  * This class provides helper methods for common model patterns.
- *
+ * <p>
  * RESERVED FOR INTERNAL USE.
  */
 public final class ModelHelper {
-
-    private static final SerializerAdapter SERIALIZER = JacksonAdapter.createDefaultSerializerAdapter();
     private static final ClientLogger LOGGER = new ClientLogger(ModelHelper.class);
 
     /**
@@ -420,19 +417,9 @@ public static BlobsDownloadHeaders transformBlobDownloadHeaders(HttpHeaders head
         return new BlobsDownloadHeaders(headers);
     }
 
-    public static BlobQueryHeaders transformQueryHeaders(HttpHeaders headers) {
-        return transformHeadersToClass(headers);
-    }
-
-    private static <T> T transformHeadersToClass(HttpHeaders headers) {
-        if (headers == null) {
-            return null;
-        }
-        try {
-            return SERIALIZER.deserialize(headers, BlobQueryHeaders.class);
-        } catch (IOException e) {
-            throw LOGGER.logExceptionAsError(new RuntimeException(e));
-        }
+    public static BlobQueryHeaders transformQueryHeaders(BlobsQueryHeaders headers, HttpHeaders rawHeaders) {
+        return BlobQueryHeadersConstructorProxy.create(headers)
+            .setErrorCode(ModelHelper.getErrorCode(rawHeaders));
     }
 
     public static void validateConditionsNotPresent(BlobRequestConditions requestConditions,

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java

@@ -29,13 +29,7 @@ public final class BlobDownloadHeaders {
     private final BlobsDownloadHeaders internalHeaders;
 
     static {
-        BlobDownloadHeadersConstructorProxy.setAccessor(
-            new BlobDownloadHeadersConstructorProxy.BlobDownloadHeadersConstructorAccessor() {
-                @Override
-                public BlobDownloadHeaders create(BlobsDownloadHeaders internalHeaders) {
-                    return new BlobDownloadHeaders(internalHeaders);
-                }
-            });
+        BlobDownloadHeadersConstructorProxy.setAccessor(BlobDownloadHeaders::new);
     }
 
     private BlobDownloadHeaders(BlobsDownloadHeaders internalHeaders) {