Autorest changes for ACR (Azure#24489)

Ingest new swagger changes without updating the public surface area.

Author: pallavit

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRegistryAsyncClient.java

@@ -4,8 +4,8 @@
 package com.azure.containers.containerregistry;
 
 import com.azure.containers.containerregistry.implementation.ContainerRegistriesImpl;
-import com.azure.containers.containerregistry.implementation.ContainerRegistryImpl;
-import com.azure.containers.containerregistry.implementation.ContainerRegistryImplBuilder;
+import com.azure.containers.containerregistry.implementation.AzureContainerRegistryImpl;
+import com.azure.containers.containerregistry.implementation.AzureContainerRegistryImplBuilder;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceClient;
 import com.azure.core.annotation.ServiceMethod;
@@ -41,7 +41,7 @@
  */
 @ServiceClient(builder = ContainerRegistryClientBuilder.class, isAsync = true)
 public final class ContainerRegistryAsyncClient {
-    private final ContainerRegistryImpl registryImplClient;
+    private final AzureContainerRegistryImpl registryImplClient;
     private final ContainerRegistriesImpl registriesImplClient;
     private final HttpPipeline httpPipeline;
     private final String endpoint;
@@ -52,9 +52,10 @@ public final class ContainerRegistryAsyncClient {
     ContainerRegistryAsyncClient(HttpPipeline httpPipeline, String endpoint, String version) {
         this.httpPipeline = httpPipeline;
         this.endpoint = endpoint;
-        this.registryImplClient = new ContainerRegistryImplBuilder()
+        this.registryImplClient = new AzureContainerRegistryImplBuilder()
             .url(endpoint)
             .pipeline(httpPipeline)
+            .apiVersion(version)
             .buildClient();
         this.registriesImplClient = this.registryImplClient.getContainerRegistries();
         this.apiVersion = version;

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRegistryClientBuilder.java

@@ -300,6 +300,7 @@ private HttpPipeline getHttpPipeline() {
             this.perRetryPolicies,
             this.httpClient,
             this.endpoint,
+            this.version,
             this.logger);
     }
 

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRegistryServiceVersion.java

@@ -9,10 +9,17 @@
  * The versions of Azure Container Registry supported by this client library.
  */
 public enum ContainerRegistryServiceVersion implements ServiceVersion {
-    V1_0("1");
+    /**
+     * The api-version of 2021-07-01.
+     */
+    V2021_07_01("2021-07-01");
 
     private final String version;
 
+    /**
+     * The service version.
+     * @param version The service version.
+     */
     ContainerRegistryServiceVersion(String version) {
         this.version = version;
     }
@@ -31,7 +38,7 @@ public String getVersion() {
      * @return the latest {@link ContainerRegistryServiceVersion }
      */
     public static ContainerRegistryServiceVersion getLatest() {
-        return V1_0;
+        return V2021_07_01;
     }
 }
 

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRepositoryAsync.java

@@ -5,8 +5,8 @@
 
 import com.azure.containers.containerregistry.implementation.ArtifactManifestPropertiesHelper;
 import com.azure.containers.containerregistry.implementation.ContainerRegistriesImpl;
-import com.azure.containers.containerregistry.implementation.ContainerRegistryImpl;
-import com.azure.containers.containerregistry.implementation.ContainerRegistryImplBuilder;
+import com.azure.containers.containerregistry.implementation.AzureContainerRegistryImpl;
+import com.azure.containers.containerregistry.implementation.AzureContainerRegistryImplBuilder;
 import com.azure.containers.containerregistry.implementation.models.ManifestAttributesBase;
 import com.azure.containers.containerregistry.implementation.models.RepositoryWriteableProperties;
 import com.azure.containers.containerregistry.models.ArtifactManifestOrderBy;
@@ -70,9 +70,11 @@ public final class ContainerRepositoryAsync {
             throw logger.logExceptionAsError(new IllegalArgumentException("'repositoryName' can't be empty."));
         }
 
-        ContainerRegistryImpl registryImpl = new ContainerRegistryImplBuilder()
+        AzureContainerRegistryImpl registryImpl = new AzureContainerRegistryImplBuilder()
             .pipeline(httpPipeline)
-            .url(endpoint).buildClient();
+            .url(endpoint)
+            .apiVersion(version)
+            .buildClient();
 
         this.endpoint = endpoint;
         this.repositoryName = repositoryName;
@@ -348,8 +350,8 @@ Mono<Response<ContainerRepositoryProperties>> updatePropertiesWithResponse(Conta
                 .setDeleteEnabled(repositoryProperties.isDeleteEnabled())
                 .setListEnabled(repositoryProperties.isListEnabled())
                 .setWriteEnabled(repositoryProperties.isWriteEnabled())
-                .setReadEnabled(repositoryProperties.isReadEnabled())
-                .setTeleportEnabled(repositoryProperties.isTeleportEnabled());
+                .setReadEnabled(repositoryProperties.isReadEnabled());
+//                .setTeleportEnabled(repositoryProperties.isTeleportEnabled());
 
             return this.serviceClient.updatePropertiesWithResponseAsync(repositoryName, writableProperties, context)
                 .onErrorMap(Utils::mapException);

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/RegistryArtifactAsync.java

@@ -6,8 +6,8 @@
 
 import com.azure.containers.containerregistry.implementation.ArtifactTagPropertiesHelper;
 import com.azure.containers.containerregistry.implementation.ContainerRegistriesImpl;
-import com.azure.containers.containerregistry.implementation.ContainerRegistryImpl;
-import com.azure.containers.containerregistry.implementation.ContainerRegistryImplBuilder;
+import com.azure.containers.containerregistry.implementation.AzureContainerRegistryImpl;
+import com.azure.containers.containerregistry.implementation.AzureContainerRegistryImplBuilder;
 import com.azure.containers.containerregistry.implementation.models.ManifestWriteableProperties;
 import com.azure.containers.containerregistry.implementation.models.TagAttributesBase;
 import com.azure.containers.containerregistry.implementation.models.TagWriteableProperties;
@@ -85,9 +85,11 @@ public final class RegistryArtifactAsync {
             throw logger.logExceptionAsError(new IllegalArgumentException("'digest' can't be empty"));
         }
 
-        ContainerRegistryImpl registryImpl = new ContainerRegistryImplBuilder()
+        AzureContainerRegistryImpl registryImpl = new AzureContainerRegistryImplBuilder()
             .pipeline(httpPipeline)
-            .url(endpoint).buildClient();
+            .url(endpoint)
+            .apiVersion(version)
+            .buildClient();
 
         this.endpoint = endpoint;
         this.repositoryName = repositoryName;

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/Utils.java

@@ -178,6 +178,7 @@ static Throwable mapException(Throwable exception) {
      * @param perRetryPolicies per retry policies.
      * @param httpClient http client
      * @param endpoint endpoint to be called
+     * @param serviceVersion the service api version being targeted by the client.
      * @return returns the httpPipeline to be consumed by the builders.
      */
     static HttpPipeline buildHttpPipeline(
@@ -191,6 +192,7 @@ static HttpPipeline buildHttpPipeline(
         List<HttpPipelinePolicy> perRetryPolicies,
         HttpClient httpClient,
         String endpoint,
+        ContainerRegistryServiceVersion serviceVersion,
         ClientLogger logger) {
 
         ArrayList<HttpPipelinePolicy> policies = new ArrayList<>();
@@ -225,6 +227,7 @@ static HttpPipeline buildHttpPipeline(
             credential,
             audience,
             endpoint,
+            serviceVersion,
             new HttpPipelineBuilder()
                 .policies(credentialPolicies.toArray(new HttpPipelinePolicy[0]))
                 .httpClient(httpClient)
@@ -252,18 +255,22 @@ private static ArrayList<HttpPipelinePolicy> clone(ArrayList<HttpPipelinePolicy>
         return clonedPolicy;
     }
 
-    static Mono<Response<Void>> deleteResponseToSuccess(Response<Void> responseT) {
+    static <T> Mono<Response<Void>> deleteResponseToSuccess(Response<T> responseT) {
         if (responseT.getStatusCode() != HTTP_STATUS_CODE_NOT_FOUND) {
-            return Mono.just(responseT);
+            // In case of success scenario return Response<Void>.
+            return getAcceptedDeleteResponse(responseT, responseT.getStatusCode());
         }
 
-        Response<Void> successResponse = new ResponseBase<String, Void>(
+        // In case of 400, we still convert it to success i.e. no-op.
+        return getAcceptedDeleteResponse(responseT, HTTP_STATUS_CODE_ACCEPTED);
+    }
+
+    static <T> Mono<Response<Void>> getAcceptedDeleteResponse(Response<T> responseT, int statusCode) {
+        return Mono.just(new ResponseBase<String, Void>(
             responseT.getRequest(),
-            HTTP_STATUS_CODE_ACCEPTED,
+            statusCode,
             responseT.getHeaders(),
             null,
-            null);
-
-        return Mono.just(successResponse);
+            null));
     }
 }