uploadBlob(BinaryData content) {
*
* contentClient.getManifest("latest")
* .doOnNext(downloadResult -> {
- * if (ManifestMediaType.OCI_MANIFEST.equals(downloadResult.getManifestMediaType())
+ * if (ManifestMediaType.OCI_IMAGE_MANIFEST.equals(downloadResult.getManifestMediaType())
* || ManifestMediaType.DOCKER_MANIFEST.equals(downloadResult.getManifestMediaType())) {
* OciImageManifest manifest = downloadResult.getManifest().toObject(OciImageManifest.class);
* System.out.println("Got OCI manifest");
@@ -273,7 +273,7 @@ public Mono getManifest(String tagOrDigest) {
* contentClient.getManifestWithResponse("latest")
* .doOnNext(response -> {
* GetManifestResult manifestResult = response.getValue();
- * if (ManifestMediaType.OCI_MANIFEST.equals(manifestResult.getManifestMediaType())
+ * if (ManifestMediaType.OCI_IMAGE_MANIFEST.equals(manifestResult.getManifestMediaType())
* || ManifestMediaType.DOCKER_MANIFEST.equals(manifestResult.getManifestMediaType())) {
* OciImageManifest manifest = manifestResult.getManifest().toObject(OciImageManifest.class);
* System.out.println("Got OCI manifest");
diff --git a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRegistryContentClient.java b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRegistryContentClient.java
index 783f9e48279f..d9a2c2f597fb 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRegistryContentClient.java
+++ b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/ContainerRegistryContentClient.java
@@ -127,7 +127,7 @@ public String getEndpoint() {
@ServiceMethod(returns = ReturnType.SINGLE)
public SetManifestResult setManifest(OciImageManifest manifest, String tag) {
Objects.requireNonNull(manifest, "'manifest' cannot be null.");
- return setManifestWithResponse(BinaryData.fromObject(manifest), tag, ManifestMediaType.OCI_MANIFEST, Context.NONE).getValue();
+ return setManifestWithResponse(BinaryData.fromObject(manifest), tag, ManifestMediaType.OCI_IMAGE_MANIFEST, Context.NONE).getValue();
}
/**
@@ -248,7 +248,7 @@ public UploadRegistryBlobResult uploadBlob(BinaryData content, Context context)
*
* GetManifestResult latestResult = contentClient.getManifest("latest");
* if (ManifestMediaType.DOCKER_MANIFEST.equals(latestResult.getManifestMediaType())
- * || ManifestMediaType.OCI_MANIFEST.equals(latestResult.getManifestMediaType())) {
+ * || ManifestMediaType.OCI_IMAGE_MANIFEST.equals(latestResult.getManifestMediaType())) {
* OciImageManifest manifest = latestResult.getManifest().toObject(OciImageManifest.class);
* } else {
* throw new IllegalArgumentException("Unexpected manifest type: " + latestResult.getManifestMediaType());
diff --git a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/implementation/UtilsImpl.java b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/implementation/UtilsImpl.java
index 08a02790ce94..b3636856fa6f 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/implementation/UtilsImpl.java
+++ b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/implementation/UtilsImpl.java
@@ -87,7 +87,7 @@ public final class UtilsImpl {
public static final HttpHeaderName DOCKER_DIGEST_HEADER_NAME = HttpHeaderName.fromString("docker-content-digest");
public static final String SUPPORTED_MANIFEST_TYPES = "*/*"
- + "," + ManifestMediaType.OCI_MANIFEST
+ + "," + ManifestMediaType.OCI_IMAGE_MANIFEST
+ "," + ManifestMediaType.DOCKER_MANIFEST
+ ",application/vnd.oci.image.index.v1+json"
+ ",application/vnd.docker.distribution.manifest.list.v2+json"
diff --git a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ContainerRepositoryProperties.java b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ContainerRepositoryProperties.java
index ff233f48e6e7..ad1d50f881bd 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ContainerRepositoryProperties.java
+++ b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ContainerRepositoryProperties.java
@@ -15,7 +15,7 @@
/** Properties of this repository. */
@Fluent
-public class ContainerRepositoryProperties implements JsonSerializable {
+public final class ContainerRepositoryProperties implements JsonSerializable {
/*
* Registry login server name. This is likely to be similar to {registry-name}.azurecr.io.
*/
diff --git a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ManifestMediaType.java b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ManifestMediaType.java
index 4cff5f3df634..30cbef32ba6a 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ManifestMediaType.java
+++ b/sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/models/ManifestMediaType.java
@@ -18,7 +18,7 @@ public final class ManifestMediaType extends ExpandableStringEnum {
- if (ManifestMediaType.OCI_MANIFEST.equals(downloadResult.getManifestMediaType())
+ if (ManifestMediaType.OCI_IMAGE_MANIFEST.equals(downloadResult.getManifestMediaType())
|| ManifestMediaType.DOCKER_MANIFEST.equals(downloadResult.getManifestMediaType())) {
OciImageManifest manifest = downloadResult.getManifest().toObject(OciImageManifest.class);
System.out.println("Got OCI manifest");
@@ -149,7 +149,7 @@ private static void getManifestWithResponse() {
contentClient.getManifestWithResponse("latest")
.doOnNext(response -> {
GetManifestResult manifestResult = response.getValue();
- if (ManifestMediaType.OCI_MANIFEST.equals(manifestResult.getManifestMediaType())
+ if (ManifestMediaType.OCI_IMAGE_MANIFEST.equals(manifestResult.getManifestMediaType())
|| ManifestMediaType.DOCKER_MANIFEST.equals(manifestResult.getManifestMediaType())) {
OciImageManifest manifest = manifestResult.getManifest().toObject(OciImageManifest.class);
System.out.println("Got OCI manifest");
diff --git a/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientIntegrationTests.java b/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientIntegrationTests.java
index 644a1a61d38a..87023b332c52 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientIntegrationTests.java
+++ b/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientIntegrationTests.java
@@ -120,7 +120,7 @@ public void canUploadOciManifestBinaryData(HttpClient httpClient) {
client = getContentClient("oci-artifact", httpClient);
setManifestPrerequisites();
- SetManifestOptions options = new SetManifestOptions(BinaryData.fromObject(MANIFEST), ManifestMediaType.OCI_MANIFEST);
+ SetManifestOptions options = new SetManifestOptions(BinaryData.fromObject(MANIFEST), ManifestMediaType.OCI_IMAGE_MANIFEST);
SetManifestResult result = client.setManifestWithResponse(options, Context.NONE).getValue();
assertNotNull(result);
assertNotNull(result.getDigest());
diff --git a/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientTests.java b/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientTests.java
index 24dd335f119c..46760f88eed4 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientTests.java
+++ b/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/ContainerRegistryContentClientTests.java
@@ -75,7 +75,7 @@
public class ContainerRegistryContentClientTests {
private static final BinaryData SMALL_CONTENT = BinaryData.fromString("foobar");
private static final String SMALL_CONTENT_SHA256 = "sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2";
- private static final String DEFAULT_MANIFEST_CONTENT_TYPE = "*/*," + ManifestMediaType.OCI_MANIFEST + "," + ManifestMediaType.DOCKER_MANIFEST + ",application/vnd.oci.image.index.v1+json"
+ private static final String DEFAULT_MANIFEST_CONTENT_TYPE = "*/*," + ManifestMediaType.OCI_IMAGE_MANIFEST + "," + ManifestMediaType.DOCKER_MANIFEST + ",application/vnd.oci.image.index.v1+json"
+ ",application/vnd.docker.distribution.manifest.list.v2+json,application/vnd.cncf.oras.artifact.manifest.v1+json";
private static final BinaryData MANIFEST_DATA = BinaryData.fromObject(MANIFEST);
private static final BinaryData OCI_INDEX = BinaryData.fromString("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1+json\","
@@ -166,7 +166,7 @@ public void getManifest() {
assertArrayEquals(MANIFEST_DATA.toBytes(), result.getManifest().toBytes());
assertNotNull(result.getManifest().toObject(ManifestMediaType.class));
- assertEquals(ManifestMediaType.OCI_MANIFEST, result.getManifestMediaType());
+ assertEquals(ManifestMediaType.OCI_IMAGE_MANIFEST, result.getManifestMediaType());
}
@SyncAsyncTest
@@ -469,7 +469,7 @@ public static HttpClient createClientManifests(BinaryData content, String digest
assertEquals(DEFAULT_MANIFEST_CONTENT_TYPE, request.getHeaders().getValue(HttpHeaderName.ACCEPT));
HttpHeaders headers = new HttpHeaders()
.add(UtilsImpl.DOCKER_DIGEST_HEADER_NAME, digest)
- .add(HttpHeaderName.CONTENT_TYPE, returnContentType == null ? ManifestMediaType.OCI_MANIFEST.toString() : returnContentType.toString())
+ .add(HttpHeaderName.CONTENT_TYPE, returnContentType == null ? ManifestMediaType.OCI_IMAGE_MANIFEST.toString() : returnContentType.toString())
.add(HttpHeaderName.CONTENT_LENGTH, content.getLength().toString());
return new MockHttpResponse(request, 200, headers, content.toBytes());
});