ACR arch board feedback (Azure#34070)

* Address arch board feedback
* Rename client and methods
* update manifest media types and autorest
* remove /oauth2/token and regenerate
* config -> configuration
* Remove response from downloadStreamWithResponse
* align swagger

Author: Liudmila Molkova

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

@@ -193,7 +193,7 @@ the main ServiceBusClientBuilder. -->
 
   <!-- suppress eceptions caught to for tracing-->
   <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck"
-            files="com.azure.containers.containerregistry.specialized.ContainerRegistryBlobClient.java"/>
+            files="com.azure.containers.containerregistry.ContainerRegistryContentClient.java"/>
 
 
   <!-- Nested blocks are still readable in the switch statements in Avro. -->

sdk/containerregistry/azure-containers-containerregistry-perf/src/main/java/com/azure/containers/containerregistry/perf/DownloadBlobTests.java

@@ -5,6 +5,7 @@
 
 import com.azure.containers.containerregistry.perf.core.ServiceTest;
 import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
 import com.azure.perf.test.core.NullOutputStream;
 import com.azure.perf.test.core.PerfStressOptions;
 import reactor.core.publisher.Mono;
@@ -36,13 +37,13 @@ public Mono<Void> setupAsync() {
 
     @Override
     public void run() {
-        blobClient.downloadStream(digest[0], Channels.newChannel(output), Context.NONE);
+        blobClient.downloadStream(digest[0], Channels.newChannel(output));
     }
 
     @Override
     public Mono<Void> runAsync() {
         return blobAsyncClient.downloadStream(digest[0])
-            .flatMap(result -> result.writeValueTo(Channels.newChannel(output)))
+            .flatMap(result -> FluxUtil.writeToOutputStream(result.toFluxByteBuffer(), output))
             .then();
     }
 }

sdk/containerregistry/azure-containers-containerregistry-perf/src/main/java/com/azure/containers/containerregistry/perf/core/ServiceTest.java

@@ -6,9 +6,9 @@
 import com.azure.containers.containerregistry.ContainerRegistryAsyncClient;
 import com.azure.containers.containerregistry.ContainerRegistryClient;
 import com.azure.containers.containerregistry.ContainerRegistryClientBuilder;
-import com.azure.containers.containerregistry.specialized.ContainerRegistryBlobAsyncClient;
-import com.azure.containers.containerregistry.specialized.ContainerRegistryBlobClient;
-import com.azure.containers.containerregistry.specialized.ContainerRegistryBlobClientBuilder;
+import com.azure.containers.containerregistry.ContainerRegistryContentAsyncClient;
+import com.azure.containers.containerregistry.ContainerRegistryContentClient;
+import com.azure.containers.containerregistry.ContainerRegistryContentClientBuilder;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.http.netty.NettyAsyncHttpClientProvider;
 import com.azure.core.http.okhttp.OkHttpAsyncClientProvider;
@@ -60,8 +60,8 @@ public abstract class ServiceTest<TOptions extends PerfStressOptions> extends Pe
      */
     protected ContainerRegistryAsyncClient containerRegistryAsyncClient;
 
-    protected ContainerRegistryBlobClient blobClient;
-    protected ContainerRegistryBlobAsyncClient blobAsyncClient;
+    protected ContainerRegistryContentClient blobClient;
+    protected ContainerRegistryContentAsyncClient blobAsyncClient;
 
     /**
      * The base class for Azure Container Registry performance tests.
@@ -91,11 +91,11 @@ public ServiceTest(TOptions options) {
         this.containerRegistryClient = builder.buildClient();
         this.containerRegistryAsyncClient  = builder.buildAsyncClient();
 
-        ContainerRegistryBlobClientBuilder blobClientBuilder = new ContainerRegistryBlobClientBuilder()
+        ContainerRegistryContentClientBuilder blobClientBuilder = new ContainerRegistryContentClientBuilder()
             .credential(tokenCredential)
             .clientOptions(httpOptions)
             .endpoint(registryEndpoint)
-            .repository("oci-artifact");
+            .repositoryName("oci-artifact");
 
         this.blobClient = blobClientBuilder.buildClient();
         this.blobAsyncClient = blobClientBuilder.buildAsyncClient();

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

@@ -4,10 +4,22 @@
 
 ### Features Added
 
-### Breaking Changes
-
-- Replaced `uploadManifest(OciImageManifest)` method on `ContainerRegistryBlobClient` and `ContainerRegistryBlobAsyncClient` classes
-  with `uploadManifest(OciImageManifest manifest, String tag)` method.
+### Breaking Changes from version 1.1.0-beta.3
+
+- `ContainerRegistryBlobClientBuilder`, `ContainerRegistryBlobClient` and `ContainerRegistryBlobAsyncClient` were renamed to `ContainerRegistryContentClientBuilder`,
+  `ContainerRegistryContentClient`, and `ContainerRegistryContentAsyncClient` and moved to `com.azure.containers.containerregistry` package. 
+- `UploadBlobResult` was renamed to `UploadRegistryBlobResult`
+- `ContainerRegistryContentClient` and `ContainerRegistryContentAsyncClient` changes:
+  - `uploadManifest` method was renamed to `setManifest`, `uploadManifestWithResponse` renamed to `setManifestWithResponse`, the return type of these methods was renamed to `SetManifestResult`.
+    `UploadManifestOptions` renamed to `SetManifestOptions`.
+  - `downloadManifest` method was renamed to `getManifest`, `downloadManifestWithResponse` renamed to `getManifestWithResponse`, the return type of these methods renamed to `GetManifestResult`.
+  - Removed `DownloadBlobAsyncResult` and changes `ContainerRegistryContentAsyncClient.downloadStream` return type to `Mono<BinaryData>`.
+  - Removed `Collection<ManifestMediaType> mediaTypes` parameter from `downloadManifestWithResponse` method on blob clients.
+  - Renamed `ContainerRegistryContentClientBuilder.repository` method to `repositoryName`.
+- Renamed `GetManifestResult.getMediaType` and `UploadManifestOptions.getMediaType` to `getManifestMediaType`.
+- Removed `GetManifestResult.asOciManifest` - use `GetManifestResult.getManifest().toObject(OciImageManifest.class)` instead.
+- Renamed `OciImageManifest.getConfig` and `setConfig` methods to `getConfiguration` and `setConfiguration`.
+- Renamed `OciAnnotations.getCreated` and `setCreated` methods to `getCreatedOn` and `setCreatedOn`.
 
 ### Bugs Fixed
 
@@ -183,8 +195,8 @@
 ## 1.0.0 (2022-01-11)
 
 ### Breaking Changes
- - Renamed `ArtifactTagOrderBy` to `ArtifactTagOrder`.
- - Renamed `ArtifactManifestOrderBy` to `ArtifactManifestOrder`.
+  - Renamed `ArtifactTagOrderBy` to `ArtifactTagOrder`.
+  - Renamed `ArtifactManifestOrderBy` to `ArtifactManifestOrder`.
 
 ### Other Changes
 

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

@@ -251,16 +251,16 @@ try {
 
 ### Blob and manifest operations
 
-This section contains samples for `ContainerRegistryBlobClient` that show how to upload and download images. 
+This section contains samples for `ContainerRegistryContentClient` that show how to upload and download images. 
 
 First, we need to create blob client.
 
-```java readme-sample-createBlobClient
+```java readme-sample-createContentClient
 DefaultAzureCredential credential = new DefaultAzureCredentialBuilder().build();
-ContainerRegistryBlobClient blobClient = new ContainerRegistryBlobClientBuilder()
+ContainerRegistryContentClient contentClient = new ContainerRegistryContentClientBuilder()
     .endpoint(endpoint)
     .credential(credential)
-    .repository(repository)
+    .repositoryName(repository)
     .buildClient();
 ```
 
@@ -272,7 +272,7 @@ which describes an image or artifact and assign it a tag.
 ```java readme-sample-uploadImage
 BinaryData configContent = BinaryData.fromObject(Collections.singletonMap("hello", "world"));
 
-UploadBlobResult configUploadResult = blobClient.uploadBlob(configContent);
+UploadRegistryBlobResult configUploadResult = contentClient.uploadBlob(configContent);
 System.out.printf("Uploaded config: digest - %s, size - %s\n", configUploadResult.getDigest(), configContent.getLength());
 
 OciDescriptor configDescriptor = new OciDescriptor()
@@ -281,19 +281,19 @@ OciDescriptor configDescriptor = new OciDescriptor()
     .setSizeInBytes(configContent.getLength());
 
 BinaryData layerContent = BinaryData.fromString("Hello Azure Container Registry");
-UploadBlobResult layerUploadResult = blobClient.uploadBlob(layerContent);
+UploadRegistryBlobResult layerUploadResult = contentClient.uploadBlob(layerContent);
 System.out.printf("Uploaded layer: digest - %s, size - %s\n", layerUploadResult.getDigest(), layerContent.getLength());
 
 OciImageManifest manifest = new OciImageManifest()
-    .setConfig(configDescriptor)
+    .setConfiguration(configDescriptor)
     .setSchemaVersion(2)
     .setLayers(Collections.singletonList(
         new OciDescriptor()
             .setDigest(layerUploadResult.getDigest())
             .setSizeInBytes(layerContent.getLength())
             .setMediaType("application/octet-stream")));
 
-UploadManifestResult manifestResult = blobClient.uploadManifest(manifest, "latest");
+SetManifestResult manifestResult = contentClient.setManifest(manifest, "latest");
 System.out.printf("Uploaded manifest: digest - %s\n", manifestResult.getDigest());
 ```
 
@@ -302,37 +302,37 @@ System.out.printf("Uploaded manifest: digest - %s\n", manifestResult.getDigest()
 To download a full image, we need to download its manifest and then download individual layers and configuration. 
 
 ```java readme-sample-downloadImage
-DownloadManifestResult manifestResult = blobClient.downloadManifest("latest");
+GetManifestResult manifestResult = contentClient.getManifest("latest");
 
-OciImageManifest manifest = manifestResult.asOciManifest();
+OciImageManifest manifest = manifestResult.getManifest().toObject(OciImageManifest.class);
 System.out.printf("Got manifest:\n%s\n", PRETTY_PRINT.writeValueAsString(manifest));
 
-String configFileName = manifest.getConfig().getDigest() + ".json";
-blobClient.downloadStream(manifest.getConfig().getDigest(), createFileChannel(configFileName));
+String configFileName = manifest.getConfiguration().getDigest() + ".json";
+contentClient.downloadStream(manifest.getConfiguration().getDigest(), createFileChannel(configFileName));
 System.out.printf("Got config: %s\n", configFileName);
 
 for (OciDescriptor layer : manifest.getLayers()) {
-    blobClient.downloadStream(layer.getDigest(), createFileChannel(layer.getDigest()));
+    contentClient.downloadStream(layer.getDigest(), createFileChannel(layer.getDigest()));
     System.out.printf("Got layer: %s\n", layer.getDigest());
 }
 ```
 
 #### Delete blob
 
 ```java readme-sample-deleteBlob
-DownloadManifestResult manifestResult = blobClient.downloadManifest("latest");
+GetManifestResult manifestResult = contentClient.getManifest("latest");
 
-OciImageManifest manifest = manifestResult.asOciManifest();
+OciImageManifest manifest = manifestResult.getManifest().toObject(OciImageManifest.class);
 for (OciDescriptor layer : manifest.getLayers()) {
-    blobClient.deleteBlob(layer.getDigest());
+    contentClient.deleteBlob(layer.getDigest());
 }
 ```
 
 #### Delete manifest
 
 ```java readme-sample-deleteManifest
-DownloadManifestResult manifestResult = blobClient.downloadManifest("latest");
-blobClient.deleteManifest(manifestResult.getDigest());
+GetManifestResult manifestResult = contentClient.getManifest("latest");
+contentClient.deleteManifest(manifestResult.getDigest());
 ```
 
 ## Troubleshooting