Prepare ACR for beta release. (Azure#28036)

* Prepare ACR for beta release.

* Incorporate PR comments.

Author: pallavit

sdk/containerregistry/azure-containers-containerregistry/CHANGELOG.md

@@ -6,12 +6,6 @@
 - Added interfaces from `com.azure.core.client.traits` to `ContainerRegistryClientBuilder`.
 - Added support for `ContainerRegistryBlobAsyncClient`.
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
 ## 1.0.2 (2022-03-08)
 
 ### Other Changes

sdk/containerregistry/azure-containers-containerregistry/README.md

@@ -56,7 +56,7 @@ and then include the direct dependency in the dependencies section without the v
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-containers-containerregistry</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/implementation/ContainerRegistryRedirectPolicy.java

@@ -19,14 +19,15 @@
 import java.util.Set;
 
 import static com.azure.containers.containerregistry.implementation.UtilsImpl.DOCKER_DIGEST_HEADER_NAME;
+import static com.azure.containers.containerregistry.implementation.UtilsImpl.getDigestFromHeader;
 
 /**
  * <p> Redirect policy for the container registry.</p>
  *
  * <p> This reads some of the headers that are returned from the redirect call that core redirect policy does not handle.</p>
  */
 public final class ContainerRegistryRedirectPolicy implements HttpPipelinePolicy {
-    private static final ClientLogger LOGGER = new ClientLogger(com.azure.core.http.policy.DefaultRedirectStrategy.class);
+    private static final ClientLogger LOGGER = new ClientLogger(ContainerRegistryRedirectPolicy.class);
     private static final int MAX_REDIRECT_ATTEMPTS;
     private static final String REDIRECT_LOCATION_HEADER_NAME;
     private static final int PERMANENT_REDIRECT_STATUS_CODE;
@@ -60,9 +61,9 @@ private Mono<HttpResponse> attemptRedirect(HttpPipelineCallContext context, Http
                 return httpResponse.getBody().ignoreElements()
                     .then(this.attemptRedirect(context, next, redirectRequestCopy, redirectAttempt + 1, attemptedRedirectUrls))
                     .flatMap(newResponse -> {
-                        String digest = httpResponse.getHeaders().getValue(DOCKER_DIGEST_HEADER_NAME);
+                        String digest = getDigestFromHeader(httpResponse.getHeaders());
                         if (digest != null) {
-                            newResponse.getHeaders().add(DOCKER_DIGEST_HEADER_NAME, digest);
+                            newResponse.getHeaders().set(DOCKER_DIGEST_HEADER_NAME, digest);
                         }
                         return Mono.just(newResponse);
                     });
@@ -76,7 +77,7 @@ public boolean shouldAttemptRedirect(HttpPipelineCallContext context, HttpRespon
         if (this.isValidRedirectStatusCode(httpResponse.getStatusCode()) && this.isValidRedirectCount(tryCount) && this.isAllowedRedirectMethod(httpResponse.getRequest().getHttpMethod())) {
             String redirectUrl = this.tryGetRedirectHeader(httpResponse.getHeaders(), REDIRECT_LOCATION_HEADER_NAME);
             if (redirectUrl != null && !this.alreadyAttemptedRedirectUrl(redirectUrl, attemptedRedirectUrls)) {
-                LOGGER.verbose("[Redirecting] Try count: {}, Attempted Redirect URLs: {}", tryCount, String.join(",", attemptedRedirectUrls));
+                LOGGER.verbose("[Redirecting] Try count:" + tryCount + ", Attempted Redirect URLs:" + String.join(",", attemptedRedirectUrls));
                 attemptedRedirectUrls.add(redirectUrl);
                 return true;
             } else {
@@ -97,7 +98,7 @@ private HttpRequest createRedirectRequest(HttpResponse httpResponse) {
 
     private boolean alreadyAttemptedRedirectUrl(String redirectUrl, Set<String> attemptedRedirectUrls) {
         if (attemptedRedirectUrls.contains(redirectUrl)) {
-            LOGGER.error("Request was redirected more than once to: {}", new Object[]{redirectUrl});
+            LOGGER.error("Request was redirected more than once to:" + redirectUrl);
             return true;
         } else {
             return false;
@@ -106,7 +107,7 @@ private boolean alreadyAttemptedRedirectUrl(String redirectUrl, Set<String> atte
 
     private boolean isValidRedirectCount(int tryCount) {
         if (tryCount >= MAX_REDIRECT_ATTEMPTS) {
-            LOGGER.error("Request has been redirected more than {} times.", new Object[]{MAX_REDIRECT_ATTEMPTS});
+            LOGGER.error("Request has been redirected more than " + MAX_REDIRECT_ATTEMPTS + "times");
             return false;
         } else {
             return true;
@@ -117,7 +118,7 @@ private boolean isAllowedRedirectMethod(HttpMethod httpMethod) {
         if (REDIRECT_ALLOWED_METHODS.contains(httpMethod)) {
             return true;
         } else {
-            LOGGER.error("Request was redirected from an invalid redirect allowed method: {}", new Object[]{httpMethod});
+            LOGGER.error("Request was redirected from an invalid redirect allowed method:" + httpMethod);
             return false;
         }
     }
@@ -129,7 +130,7 @@ private boolean isValidRedirectStatusCode(int statusCode) {
     String tryGetRedirectHeader(HttpHeaders headers, String headerName) {
         String headerValue = headers.getValue(headerName);
         if (CoreUtils.isNullOrEmpty(headerValue)) {
-            LOGGER.error("Redirect url was null for header name: {}, request redirect was terminated.", headerName);
+            LOGGER.error("Redirect url was null for header name:" + headerName + " request redirect was terminated.");
             return null;
         } else {
             return headerValue;

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/implementation/UtilsImpl.java

@@ -339,10 +339,10 @@ public static <T, R> PagedResponse<T> getPagedResponseWithContinuationToken(Page
 
     /**
      * Get the digest from the response header if available.
-     * @param response The HttpResponse to parse.
+     * @param headers The headers to parse.
      * @return The digest value.
      */
-    public static <T> String getDigestFromHeader(Response<T> response) {
-        return response.getHeaders().getValue(DOCKER_DIGEST_HEADER_NAME);
+    public static <T> String getDigestFromHeader(HttpHeaders headers) {
+        return headers.getValue(DOCKER_DIGEST_HEADER_NAME);
     }
 }

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/specialized/ContainerRegistryBlobAsyncClient.java

@@ -284,7 +284,7 @@ Mono<Response<DownloadManifestResult>> downloadManifestWithResponse(DownloadMani
 
         return this.registriesImpl.getManifestWithResponseAsync(repositoryName, tagOrDigest, UtilsImpl.OCI_MANIFEST_MEDIA_TYPE, context)
             .flatMap(response -> {
-                String digest = UtilsImpl.getDigestFromHeader(response);
+                String digest = UtilsImpl.getDigestFromHeader(response.getHeaders());
                 ManifestWrapper wrapper = response.getValue();
 
                 // The service wants us to validate the digest here since a lot of customers forget to do it before consuming
@@ -341,7 +341,7 @@ Mono<Response<DownloadBlobResult>> downloadBlobWithResponse(String digest, Conte
         }
 
         return this.blobsImpl.getBlobWithResponseAsync(repositoryName, digest, context).flatMap(streamResponse -> {
-            String resDigest = UtilsImpl.getDigestFromHeader(streamResponse);
+            String resDigest = UtilsImpl.getDigestFromHeader(streamResponse.getHeaders());
 
             return BinaryData.fromFlux(streamResponse.getValue())
                 .flatMap(binaryData -> {