Skip to content

[AutoPR azure-resourcemanager-mediaservices] Matteberhart/merging main for readme #5306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
azure-sdk wants to merge 1 commit into from
Closed

[AutoPR azure-resourcemanager-mediaservices] Matteberhart/merging main for readme #5306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion sdk/mediaservices/azure-resourcemanager-mediaservices/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Release History

## 2.4.0-beta.2 (Unreleased)
## 1.0.0-beta.1 (2023-05-08)

- 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-metadata-2023-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

### Features Added

Expand Down
4 changes: 2 additions & 2 deletions sdk/mediaservices/azure-resourcemanager-mediaservices/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.1</version>
<version>2.4.0-beta.2</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
140 changes: 80 additions & 60 deletions sdk/mediaservices/azure-resourcemanager-mediaservices/SAMPLE.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...aservices/src/main/java/com/azure/resourcemanager/mediaservices/MediaServicesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public MediaServicesManager authenticate(TokenCredential credential, AzureProfil
.append("-")
.append("com.azure.resourcemanager.mediaservices")
.append("/")
.append("2.4.0-beta.1");
.append("1.0.0-beta.1");
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
userAgentBuilder
.append(" (")
Expand Down
23 changes: 23 additions & 0 deletions ...vices/src/main/java/com/azure/resourcemanager/mediaservices/fluent/models/AssetInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,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.
*
Expand Down
26 changes: 26 additions & 0 deletions .../src/main/java/com/azure/resourcemanager/mediaservices/fluent/models/AssetProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ public final class AssetProperties {
@JsonProperty(value = "storageEncryptionFormat", access = JsonProperty.Access.WRITE_ONLY)
private AssetStorageEncryptionFormat storageEncryptionFormat;

/*
* The Asset container encryption scope in the storage account.
*/
@JsonProperty(value = "encryptionScope")
private String encryptionScope;

/** Creates an instance of AssetProperties class. */
public AssetProperties() {
}
Expand Down Expand Up @@ -181,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.
*
Expand Down
35 changes: 15 additions & 20 deletions ...java/com/azure/resourcemanager/mediaservices/implementation/AccountFiltersClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public final class AccountFiltersClientImpl implements AccountFiltersClient {
public interface AccountFiltersService {
@Headers({"Content-Type: application/json"})
@Get(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/accountFilters")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/accountFilters")
@ExpectedResponses({200})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AccountFilterCollection>> list(
Expand All @@ -77,8 +76,7 @@ Mono<Response<AccountFilterCollection>> list(

@Headers({"Content-Type: application/json"})
@Get(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/accountFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/accountFilters/{filterName}")
@ExpectedResponses({200})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AccountFilterInner>> get(
Expand All @@ -93,8 +91,7 @@ Mono<Response<AccountFilterInner>> get(

@Headers({"Content-Type: application/json"})
@Put(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/accountFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/accountFilters/{filterName}")
@ExpectedResponses({200, 201})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AccountFilterInner>> createOrUpdate(
Expand All @@ -110,8 +107,7 @@ Mono<Response<AccountFilterInner>> createOrUpdate(

@Headers({"Content-Type: application/json"})
@Delete(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/accountFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/accountFilters/{filterName}")
@ExpectedResponses({200, 204})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<Void>> delete(
Expand All @@ -126,8 +122,7 @@ Mono<Response<Void>> delete(

@Headers({"Content-Type: application/json"})
@Patch(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/accountFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/accountFilters/{filterName}")
@ExpectedResponses({200})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AccountFilterInner>> update(
Expand Down Expand Up @@ -186,7 +181,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(
Expand Down Expand Up @@ -248,7 +243,7 @@ private Mono<PagedResponse<AccountFilterInner>> listSinglePageAsync(
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
Expand Down Expand Up @@ -383,7 +378,7 @@ private Mono<Response<AccountFilterInner>> getWithResponseAsync(
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(
Expand Down Expand Up @@ -441,7 +436,7 @@ private Mono<Response<AccountFilterInner>> getWithResponseAsync(
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
Expand Down Expand Up @@ -557,7 +552,7 @@ private Mono<Response<AccountFilterInner>> createOrUpdateWithResponseAsync(
} else {
parameters.validate();
}
final String apiVersion = "2022-08-01";
final String apiVersion = "2023-01-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -625,7 +620,7 @@ private Mono<Response<AccountFilterInner>> createOrUpdateWithResponseAsync(
} 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
Expand Down Expand Up @@ -746,7 +741,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
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(
Expand Down Expand Up @@ -803,7 +798,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
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
Expand Down Expand Up @@ -917,7 +912,7 @@ private Mono<Response<AccountFilterInner>> updateWithResponseAsync(
} else {
parameters.validate();
}
final String apiVersion = "2022-08-01";
final String apiVersion = "2023-01-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -985,7 +980,7 @@ private Mono<Response<AccountFilterInner>> updateWithResponseAsync(
} 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
Expand Down
35 changes: 15 additions & 20 deletions ...n/java/com/azure/resourcemanager/mediaservices/implementation/AssetFiltersClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public final class AssetFiltersClientImpl implements AssetFiltersClient {
public interface AssetFiltersService {
@Headers({"Content-Type: application/json"})
@Get(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/assets/{assetName}/assetFilters")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/assets/{assetName}/assetFilters")
@ExpectedResponses({200})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AssetFilterCollection>> list(
Expand All @@ -78,8 +77,7 @@ Mono<Response<AssetFilterCollection>> list(

@Headers({"Content-Type: application/json"})
@Get(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/assets/{assetName}/assetFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/assets/{assetName}/assetFilters/{filterName}")
@ExpectedResponses({200})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AssetFilterInner>> get(
Expand All @@ -95,8 +93,7 @@ Mono<Response<AssetFilterInner>> get(

@Headers({"Content-Type: application/json"})
@Put(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/assets/{assetName}/assetFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/assets/{assetName}/assetFilters/{filterName}")
@ExpectedResponses({200, 201})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AssetFilterInner>> createOrUpdate(
Expand All @@ -113,8 +110,7 @@ Mono<Response<AssetFilterInner>> createOrUpdate(

@Headers({"Content-Type: application/json"})
@Delete(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/assets/{assetName}/assetFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/assets/{assetName}/assetFilters/{filterName}")
@ExpectedResponses({200, 204})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<Void>> delete(
Expand All @@ -130,8 +126,7 @@ Mono<Response<Void>> delete(

@Headers({"Content-Type: application/json"})
@Patch(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices"
+ "/{accountName}/assets/{assetName}/assetFilters/{filterName}")
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/assets/{assetName}/assetFilters/{filterName}")
@ExpectedResponses({200})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono<Response<AssetFilterInner>> update(
Expand Down Expand Up @@ -196,7 +191,7 @@ private Mono<PagedResponse<AssetFilterInner>> listSinglePageAsync(
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(
Expand Down Expand Up @@ -263,7 +258,7 @@ private Mono<PagedResponse<AssetFilterInner>> listSinglePageAsync(
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
Expand Down Expand Up @@ -410,7 +405,7 @@ private Mono<Response<AssetFilterInner>> getWithResponseAsync(
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(
Expand Down Expand Up @@ -473,7 +468,7 @@ private Mono<Response<AssetFilterInner>> getWithResponseAsync(
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
Expand Down Expand Up @@ -603,7 +598,7 @@ private Mono<Response<AssetFilterInner>> createOrUpdateWithResponseAsync(
} else {
parameters.validate();
}
final String apiVersion = "2022-08-01";
final String apiVersion = "2023-01-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -677,7 +672,7 @@ private Mono<Response<AssetFilterInner>> createOrUpdateWithResponseAsync(
} 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
Expand Down Expand Up @@ -818,7 +813,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
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(
Expand Down Expand Up @@ -880,7 +875,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
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
Expand Down Expand Up @@ -1007,7 +1002,7 @@ private Mono<Response<AssetFilterInner>> updateWithResponseAsync(
} else {
parameters.validate();
}
final String apiVersion = "2022-08-01";
final String apiVersion = "2023-01-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -1081,7 +1076,7 @@ private Mono<Response<AssetFilterInner>> updateWithResponseAsync(
} 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
Expand Down
Loading