azure-sdk · azure-sdk · Nov 18, 2024
diff --git a/sdk/mediaservices/azure-resourcemanager-mediaservices/CHANGELOG.md b/sdk/mediaservices/azure-resourcemanager-mediaservices/CHANGELOG.md
diff --git a/sdk/mediaservices/azure-resourcemanager-mediaservices/README.md b/sdk/mediaservices/azure-resourcemanager-mediaservices/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager MediaServices client library for Java.
 
-This package contains Microsoft Azure SDK for MediaServices Management SDK. This Swagger was generated by the API Framework. Package tag package-account-2023-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for MediaServices Management SDK. This Swagger was generated by the API Framework. Package tag package-metadata-2023-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-mediaservices</artifactId>
-    <version>2.4.0-beta.2</version>
+    <version>2.4.0-beta.3</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/mediaservices/azure-resourcemanager-mediaservices/SAMPLE.md b/sdk/mediaservices/azure-resourcemanager-mediaservices/SAMPLE.md
diff --git a/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml b/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml
@@ -18,7 +18,7 @@
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for MediaServices Management</name>
-  <description>This package contains Microsoft Azure SDK for MediaServices Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. This Swagger was generated by the API Framework. Package tag package-account-2023-01.</description>
+  <description>This package contains Microsoft Azure SDK for MediaServices Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. This Swagger was generated by the API Framework. Package tag package-metadata-2023-01.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>

diff --git a/...aservices/src/main/java/com/azure/resourcemanager/mediaservices/MediaServicesManager.java b/...aservices/src/main/java/com/azure/resourcemanager/mediaservices/MediaServicesManager.java
@@ -11,6 +11,7 @@
 import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.policy.AddDatePolicy;
 import com.azure.core.http.policy.AddHeadersFromContextPolicy;
+import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
 import com.azure.core.http.policy.HttpPipelinePolicy;
@@ -19,7 +20,6 @@
 import com.azure.core.http.policy.RetryOptions;
 import com.azure.core.http.policy.RetryPolicy;
 import com.azure.core.http.policy.UserAgentPolicy;
-import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.logging.ClientLogger;
@@ -285,7 +285,7 @@ public MediaServicesManager authenticate(TokenCredential credential, AzureProfil
                 .append("-")
                 .append("com.azure.resourcemanager.mediaservices")
                 .append("/")
-                .append("2.4.0-beta.2");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder.append(" (")
                     .append(Configuration.getGlobalConfiguration().get("java.version"))
@@ -318,7 +318,7 @@ public MediaServicesManager authenticate(TokenCredential credential, AzureProfil
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
-            policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
+            policies.add(new BearerTokenAuthenticationPolicy(credential, scopes.toArray(new String[0])));
             policies.addAll(this.policies.stream()
                 .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
                 .collect(Collectors.toList()));

diff --git a/...vices/src/main/java/com/azure/resourcemanager/mediaservices/fluent/models/AssetInner.java b/...vices/src/main/java/com/azure/resourcemanager/mediaservices/fluent/models/AssetInner.java
@@ -227,6 +227,29 @@ public AssetStorageEncryptionFormat storageEncryptionFormat() {
         return this.innerProperties() == null ? null : this.innerProperties().storageEncryptionFormat();
     }
 
+    /**
+     * Get the encryptionScope property: The Asset container encryption scope in the storage account.
+     * 
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.innerProperties() == null ? null : this.innerProperties().encryptionScope();
+    }
+
+    /**
+     * Set the encryptionScope property: The Asset container encryption scope in the storage account.
+     * 
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the AssetInner object itself.
+     */
+    public AssetInner withEncryptionScope(String encryptionScope) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new AssetProperties();
+        }
+        this.innerProperties().withEncryptionScope(encryptionScope);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 

diff --git a/.../src/main/java/com/azure/resourcemanager/mediaservices/fluent/models/AssetProperties.java b/.../src/main/java/com/azure/resourcemanager/mediaservices/fluent/models/AssetProperties.java
@@ -60,6 +60,11 @@ public final class AssetProperties implements JsonSerializable<AssetProperties>
      */
     private AssetStorageEncryptionFormat storageEncryptionFormat;
 
+    /*
+     * The Asset container encryption scope in the storage account.
+     */
+    private String encryptionScope;
+
     /**
      * Creates an instance of AssetProperties class.
      */
@@ -182,6 +187,26 @@ public AssetStorageEncryptionFormat storageEncryptionFormat() {
         return this.storageEncryptionFormat;
     }
 
+    /**
+     * Get the encryptionScope property: The Asset container encryption scope in the storage account.
+     * 
+     * @return the encryptionScope value.
+     */
+    public String encryptionScope() {
+        return this.encryptionScope;
+    }
+
+    /**
+     * Set the encryptionScope property: The Asset container encryption scope in the storage account.
+     * 
+     * @param encryptionScope the encryptionScope value to set.
+     * @return the AssetProperties object itself.
+     */
+    public AssetProperties withEncryptionScope(String encryptionScope) {
+        this.encryptionScope = encryptionScope;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -200,6 +225,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("description", this.description);
         jsonWriter.writeStringField("container", this.container);
         jsonWriter.writeStringField("storageAccountName", this.storageAccountName);
+        jsonWriter.writeStringField("encryptionScope", this.encryptionScope);
         return jsonWriter.writeEndObject();
     }
 
@@ -238,6 +264,8 @@ public static AssetProperties fromJson(JsonReader jsonReader) throws IOException
                 } else if ("storageEncryptionFormat".equals(fieldName)) {
                     deserializedAssetProperties.storageEncryptionFormat
                         = AssetStorageEncryptionFormat.fromString(reader.getString());
+                } else if ("encryptionScope".equals(fieldName)) {
+                    deserializedAssetProperties.encryptionScope = reader.getString();
                 } else {
                     reader.skipChildren();
                 }

diff --git a/...java/com/azure/resourcemanager/mediaservices/implementation/AccountFiltersClientImpl.java b/...java/com/azure/resourcemanager/mediaservices/implementation/AccountFiltersClientImpl.java
@@ -155,7 +155,7 @@ private Mono<PagedResponse<AccountFilterInner>> listSinglePageAsync(String resou
         if (accountName == null) {
             return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -197,7 +197,7 @@ private Mono<PagedResponse<AccountFilterInner>> listSinglePageAsync(String resou
         if (accountName == null) {
             return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -314,7 +314,7 @@ private Mono<Response<AccountFilterInner>> getWithResponseAsync(String resourceG
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -358,7 +358,7 @@ private Mono<Response<AccountFilterInner>> getWithResponseAsync(String resourceG
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, accountName,
@@ -462,7 +462,7 @@ private Mono<Response<AccountFilterInner>> createOrUpdateWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -511,7 +511,7 @@ private Mono<Response<AccountFilterInner>> createOrUpdateWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -615,7 +615,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -658,7 +658,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -760,7 +760,7 @@ private Mono<Response<AccountFilterInner>> updateWithResponseAsync(String resour
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -809,7 +809,7 @@ private Mono<Response<AccountFilterInner>> updateWithResponseAsync(String resour
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,

diff --git a/...n/java/com/azure/resourcemanager/mediaservices/implementation/AssetFiltersClientImpl.java b/...n/java/com/azure/resourcemanager/mediaservices/implementation/AssetFiltersClientImpl.java
@@ -161,7 +161,7 @@ private Mono<PagedResponse<AssetFilterInner>> listSinglePageAsync(String resourc
         if (assetName == null) {
             return Mono.error(new IllegalArgumentException("Parameter assetName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -207,7 +207,7 @@ private Mono<PagedResponse<AssetFilterInner>> listSinglePageAsync(String resourc
         if (assetName == null) {
             return Mono.error(new IllegalArgumentException("Parameter assetName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -334,7 +334,7 @@ private Mono<Response<AssetFilterInner>> getWithResponseAsync(String resourceGro
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -382,7 +382,7 @@ private Mono<Response<AssetFilterInner>> getWithResponseAsync(String resourceGro
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, accountName,
@@ -495,7 +495,7 @@ private Mono<Response<AssetFilterInner>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -548,7 +548,7 @@ private Mono<Response<AssetFilterInner>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -660,7 +660,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -707,7 +707,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (filterName == null) {
             return Mono.error(new IllegalArgumentException("Parameter filterName is required and cannot be null."));
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -817,7 +817,7 @@ private Mono<Response<AssetFilterInner>> updateWithResponseAsync(String resource
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -870,7 +870,7 @@ private Mono<Response<AssetFilterInner>> updateWithResponseAsync(String resource
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2022-08-01";
+        final String apiVersion = "2023-01-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,

diff --git a/...vices/src/main/java/com/azure/resourcemanager/mediaservices/implementation/AssetImpl.java b/...vices/src/main/java/com/azure/resourcemanager/mediaservices/implementation/AssetImpl.java
@@ -70,6 +70,10 @@ public AssetStorageEncryptionFormat storageEncryptionFormat() {
         return this.innerModel().storageEncryptionFormat();
     }
 
+    public String encryptionScope() {
+        return this.innerModel().encryptionScope();
+    }
+
     public String resourceGroupName() {
         return resourceGroupName;
     }
@@ -205,4 +209,9 @@ public AssetImpl withStorageAccountName(String storageAccountName) {
         this.innerModel().withStorageAccountName(storageAccountName);
         return this;
     }
+
+    public AssetImpl withEncryptionScope(String encryptionScope) {
+        this.innerModel().withEncryptionScope(encryptionScope);
+        return this;
+    }
 }