diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md
index 78cf51775afa..a96bd3c4f6c6 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md
@@ -1,6 +1,8 @@
# Release History
-## 1.1.0-beta.2 (Unreleased)
+## 1.0.0-beta.1 (2022-11-03)
+
+- Azure Resource Manager RedisEnterprise client library for Java. This package contains Microsoft Azure SDK for RedisEnterprise Management SDK. REST API for managing Redis Enterprise resources in Azure. Package tag package-2022-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
### Features Added
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md
index da72586167c0..bfbcee29130c 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
com.azure.resourcemanagerazure-resourcemanager-redisenterprise
- 1.1.0-beta.1
+ 1.1.0-beta.2
```
[//]: # ({x-version-update-end})
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml
index dd12f1346dda..ad48611982ba 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml
@@ -39,7 +39,6 @@
UTF-8true
- true
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/RedisEnterpriseManager.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/RedisEnterpriseManager.java
index 5281eedfd232..aa5f0b5572b3 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/RedisEnterpriseManager.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/RedisEnterpriseManager.java
@@ -223,7 +223,7 @@ public RedisEnterpriseManager authenticate(TokenCredential credential, AzureProf
.append("-")
.append("com.azure.resourcemanager.redisenterprise")
.append("/")
- .append("1.1.0-beta.1");
+ .append("1.0.0-beta.1");
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
userAgentBuilder
.append(" (")
@@ -280,7 +280,11 @@ public RedisEnterpriseManager authenticate(TokenCredential credential, AzureProf
}
}
- /** @return Resource collection API of Operations. */
+ /**
+ * Gets the resource collection API of Operations.
+ *
+ * @return Resource collection API of Operations.
+ */
public Operations operations() {
if (this.operations == null) {
this.operations = new OperationsImpl(clientObject.getOperations(), this);
@@ -288,7 +292,11 @@ public Operations operations() {
return operations;
}
- /** @return Resource collection API of OperationsStatus. */
+ /**
+ * Gets the resource collection API of OperationsStatus.
+ *
+ * @return Resource collection API of OperationsStatus.
+ */
public OperationsStatus operationsStatus() {
if (this.operationsStatus == null) {
this.operationsStatus = new OperationsStatusImpl(clientObject.getOperationsStatus(), this);
@@ -296,7 +304,11 @@ public OperationsStatus operationsStatus() {
return operationsStatus;
}
- /** @return Resource collection API of RedisEnterprises. */
+ /**
+ * Gets the resource collection API of RedisEnterprises. It manages Cluster.
+ *
+ * @return Resource collection API of RedisEnterprises.
+ */
public RedisEnterprises redisEnterprises() {
if (this.redisEnterprises == null) {
this.redisEnterprises = new RedisEnterprisesImpl(clientObject.getRedisEnterprises(), this);
@@ -304,7 +316,11 @@ public RedisEnterprises redisEnterprises() {
return redisEnterprises;
}
- /** @return Resource collection API of Databases. */
+ /**
+ * Gets the resource collection API of Databases. It manages Database.
+ *
+ * @return Resource collection API of Databases.
+ */
public Databases databases() {
if (this.databases == null) {
this.databases = new DatabasesImpl(clientObject.getDatabases(), this);
@@ -312,7 +328,11 @@ public Databases databases() {
return databases;
}
- /** @return Resource collection API of PrivateEndpointConnections. */
+ /**
+ * Gets the resource collection API of PrivateEndpointConnections. It manages PrivateEndpointConnection.
+ *
+ * @return Resource collection API of PrivateEndpointConnections.
+ */
public PrivateEndpointConnections privateEndpointConnections() {
if (this.privateEndpointConnections == null) {
this.privateEndpointConnections =
@@ -321,7 +341,11 @@ public PrivateEndpointConnections privateEndpointConnections() {
return privateEndpointConnections;
}
- /** @return Resource collection API of PrivateLinkResources. */
+ /**
+ * Gets the resource collection API of PrivateLinkResources.
+ *
+ * @return Resource collection API of PrivateLinkResources.
+ */
public PrivateLinkResources privateLinkResources() {
if (this.privateLinkResources == null) {
this.privateLinkResources = new PrivateLinkResourcesImpl(clientObject.getPrivateLinkResources(), this);
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/DatabasesClient.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/DatabasesClient.java
index b891bda86a57..6fef1c360e38 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/DatabasesClient.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/DatabasesClient.java
@@ -184,13 +184,15 @@ DatabaseInner update(
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return information about a database in a RedisEnterprise cluster.
+ * @return information about a database in a RedisEnterprise cluster along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- DatabaseInner get(String resourceGroupName, String clusterName, String databaseName);
+ Response getWithResponse(
+ String resourceGroupName, String clusterName, String databaseName, Context context);
/**
* Gets information about a database in a RedisEnterprise cluster.
@@ -198,15 +200,13 @@ DatabaseInner update(
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return information about a database in a RedisEnterprise cluster along with {@link Response}.
+ * @return information about a database in a RedisEnterprise cluster.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(
- String resourceGroupName, String clusterName, String databaseName, Context context);
+ DatabaseInner get(String resourceGroupName, String clusterName, String databaseName);
/**
* Deletes a single database.
@@ -271,13 +271,15 @@ SyncPoller, Void> beginDelete(
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return access keys.
+ * @return access keys along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- AccessKeysInner listKeys(String resourceGroupName, String clusterName, String databaseName);
+ Response listKeysWithResponse(
+ String resourceGroupName, String clusterName, String databaseName, Context context);
/**
* Retrieves the access keys for the RedisEnterprise database.
@@ -285,15 +287,13 @@ SyncPoller, Void> beginDelete(
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return access keys along with {@link Response}.
+ * @return access keys.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response listKeysWithResponse(
- String resourceGroupName, String clusterName, String databaseName, Context context);
+ AccessKeysInner listKeys(String resourceGroupName, String clusterName, String databaseName);
/**
* Regenerates the RedisEnterprise database's access keys.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/OperationsStatusClient.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/OperationsStatusClient.java
index 6030d77066ad..e45462b06ebb 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/OperationsStatusClient.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/OperationsStatusClient.java
@@ -15,27 +15,27 @@ public interface OperationsStatusClient {
/**
* Gets the status of operation.
*
- * @param location The region the operation is in.
- * @param operationId The operation's unique identifier.
+ * @param location The name of Azure region.
+ * @param operationId The ID of an ongoing async operation.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the status of operation.
+ * @return the status of operation along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- OperationStatusInner get(String location, String operationId);
+ Response getWithResponse(String location, String operationId, Context context);
/**
* Gets the status of operation.
*
- * @param location The region the operation is in.
- * @param operationId The operation's unique identifier.
- * @param context The context to associate with this operation.
+ * @param location The name of Azure region.
+ * @param operationId The ID of an ongoing async operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the status of operation along with {@link Response}.
+ * @return the status of operation.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(String location, String operationId, Context context);
+ OperationStatusInner get(String location, String operationId);
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/PrivateEndpointConnectionsClient.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/PrivateEndpointConnectionsClient.java
index 490e4244a1ba..b54a00a48fc6 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/PrivateEndpointConnectionsClient.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/PrivateEndpointConnectionsClient.java
@@ -51,14 +51,16 @@ public interface PrivateEndpointConnectionsClient {
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the specified private endpoint connection associated with the RedisEnterprise cluster.
+ * @return the specified private endpoint connection associated with the RedisEnterprise cluster along with {@link
+ * Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- PrivateEndpointConnectionInner get(
- String resourceGroupName, String clusterName, String privateEndpointConnectionName);
+ Response getWithResponse(
+ String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context);
/**
* Gets the specified private endpoint connection associated with the RedisEnterprise cluster.
@@ -67,16 +69,14 @@ PrivateEndpointConnectionInner get(
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the specified private endpoint connection associated with the RedisEnterprise cluster along with {@link
- * Response}.
+ * @return the specified private endpoint connection associated with the RedisEnterprise cluster.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(
- String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context);
+ PrivateEndpointConnectionInner get(
+ String resourceGroupName, String clusterName, String privateEndpointConnectionName);
/**
* Updates the state of the specified private endpoint connection associated with the RedisEnterprise cluster.
@@ -169,12 +169,15 @@ PrivateEndpointConnectionInner put(
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+ * @return the {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName);
+ Response deleteWithResponse(
+ String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context);
/**
* Deletes the specified private endpoint connection associated with the RedisEnterprise cluster.
@@ -183,13 +186,10 @@ PrivateEndpointConnectionInner put(
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response deleteWithResponse(
- String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context);
+ void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName);
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/RedisEnterprisesClient.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/RedisEnterprisesClient.java
index 0e7491928737..3f8e4c243f48 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/RedisEnterprisesClient.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/RedisEnterprisesClient.java
@@ -193,28 +193,28 @@ SyncPoller, ClusterInner> beginUpdate(
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return information about a RedisEnterprise cluster.
+ * @return information about a RedisEnterprise cluster along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- ClusterInner getByResourceGroup(String resourceGroupName, String clusterName);
+ Response getByResourceGroupWithResponse(
+ String resourceGroupName, String clusterName, Context context);
/**
* Gets information about a RedisEnterprise cluster.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return information about a RedisEnterprise cluster along with {@link Response}.
+ * @return information about a RedisEnterprise cluster.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getByResourceGroupWithResponse(
- String resourceGroupName, String clusterName, Context context);
+ ClusterInner getByResourceGroup(String resourceGroupName, String clusterName);
/**
* Lists all RedisEnterprise clusters in a resource group.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/AccessKeysInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/AccessKeysInner.java
index b2b7e74f41c9..35d134e1b124 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/AccessKeysInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/AccessKeysInner.java
@@ -7,7 +7,11 @@
import com.azure.core.annotation.Immutable;
import com.fasterxml.jackson.annotation.JsonProperty;
-/** Access keys The secret access keys used for authenticating connections to redis. */
+/**
+ * Access keys
+ *
+ *
The secret access keys used for authenticating connections to redis.
+ */
@Immutable
public final class AccessKeysInner {
/*
@@ -22,6 +26,10 @@ public final class AccessKeysInner {
@JsonProperty(value = "secondaryKey", access = JsonProperty.Access.WRITE_ONLY)
private String secondaryKey;
+ /** Creates an instance of AccessKeysInner class. */
+ public AccessKeysInner() {
+ }
+
/**
* Get the primaryKey property: The current primary key that clients can use to authenticate.
*
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java
index 968b0cca7812..f50f7efbac9f 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java
@@ -31,11 +31,17 @@ public final class ClusterInner extends Resource {
private List zones;
/*
- * RedisEnterprise cluster properties Other properties of the cluster.
+ * RedisEnterprise cluster properties
+ *
+ * Other properties of the cluster.
*/
@JsonProperty(value = "properties")
private ClusterProperties innerProperties;
+ /** Creates an instance of ClusterInner class. */
+ public ClusterInner() {
+ }
+
/**
* Get the sku property: The SKU to create, which affects price, performance, and features.
*
@@ -77,7 +83,9 @@ public ClusterInner withZones(List zones) {
}
/**
- * Get the innerProperties property: RedisEnterprise cluster properties Other properties of the cluster.
+ * Get the innerProperties property: RedisEnterprise cluster properties
+ *
+ *
Other properties of the cluster.
*
* @return the innerProperties value.
*/
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java
index 431fa987f712..8bcd5d02077f 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java
@@ -12,8 +12,9 @@
import java.util.List;
/**
- * RedisEnterprise cluster properties Properties of RedisEnterprise clusters, as opposed to general resource properties
- * like location, tags.
+ * RedisEnterprise cluster properties
+ *
+ *
Properties of RedisEnterprise clusters, as opposed to general resource properties like location, tags.
*/
@Fluent
public final class ClusterProperties {
@@ -48,12 +49,15 @@ public final class ClusterProperties {
private String redisVersion;
/*
- * List of private endpoint connections associated with the specified
- * RedisEnterprise cluster
+ * List of private endpoint connections associated with the specified RedisEnterprise cluster
*/
@JsonProperty(value = "privateEndpointConnections", access = JsonProperty.Access.WRITE_ONLY)
private List privateEndpointConnections;
+ /** Creates an instance of ClusterProperties class. */
+ public ClusterProperties() {
+ }
+
/**
* Get the minimumTlsVersion property: The minimum TLS version for the cluster to support, e.g. '1.2'.
*
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java
index e9b8a3d0ae49..d4518c87af42 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java
@@ -21,13 +21,21 @@
@Fluent
public final class DatabaseInner extends ProxyResource {
/*
- * RedisEnterprise database properties Other properties of the database.
+ * RedisEnterprise database properties
+ *
+ * Other properties of the database.
*/
@JsonProperty(value = "properties")
private DatabaseProperties innerProperties;
+ /** Creates an instance of DatabaseInner class. */
+ public DatabaseInner() {
+ }
+
/**
- * Get the innerProperties property: RedisEnterprise database properties Other properties of the database.
+ * Get the innerProperties property: RedisEnterprise database properties
+ *
+ *
Other properties of the database.
*
* @return the innerProperties value.
*/
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseProperties.java
index 346b8be291f8..41e9bed19b12 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseProperties.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseProperties.java
@@ -17,21 +17,21 @@
import java.util.List;
/**
- * RedisEnterprise database properties Properties of RedisEnterprise databases, as opposed to general resource
- * properties like location, tags.
+ * RedisEnterprise database properties
+ *
+ *
Properties of RedisEnterprise databases, as opposed to general resource properties like location, tags.
*/
@Fluent
public final class DatabaseProperties {
/*
- * Specifies whether redis clients can connect using TLS-encrypted or
- * plaintext redis protocols. Default is TLS-encrypted.
+ * Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is
+ * TLS-encrypted.
*/
@JsonProperty(value = "clientProtocol")
private Protocol clientProtocol;
/*
- * TCP port of the database endpoint. Specified at create time. Defaults to
- * an available port.
+ * TCP port of the database endpoint. Specified at create time. Defaults to an available port.
*/
@JsonProperty(value = "port")
private Integer port;
@@ -67,19 +67,21 @@ public final class DatabaseProperties {
private Persistence persistence;
/*
- * Optional set of redis modules to enable in this database - modules can
- * only be added at creation time.
+ * Optional set of redis modules to enable in this database - modules can only be added at creation time.
*/
@JsonProperty(value = "modules")
private List modules;
/*
- * Optional set of properties to configure geo replication for this
- * database.
+ * Optional set of properties to configure geo replication for this database.
*/
@JsonProperty(value = "geoReplication")
private DatabasePropertiesGeoReplication geoReplication;
+ /** Creates an instance of DatabaseProperties class. */
+ public DatabaseProperties() {
+ }
+
/**
* Get the clientProtocol property: Specifies whether redis clients can connect using TLS-encrypted or plaintext
* redis protocols. Default is TLS-encrypted.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationInner.java
index b94d16ebc1d1..679f57b6c954 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationInner.java
@@ -10,20 +10,23 @@
import com.azure.resourcemanager.redisenterprise.models.Origin;
import com.fasterxml.jackson.annotation.JsonProperty;
-/** REST API Operation Details of a REST API operation, returned from the Resource Provider Operations API. */
+/**
+ * REST API Operation
+ *
+ *
Details of a REST API operation, returned from the Resource Provider Operations API.
+ */
@Fluent
public final class OperationInner {
/*
- * The name of the operation, as per Resource-Based Access Control (RBAC).
- * Examples: "Microsoft.Compute/virtualMachines/write",
- * "Microsoft.Compute/virtualMachines/capture/action"
+ * The name of the operation, as per Resource-Based Access Control (RBAC). Examples:
+ * "Microsoft.Compute/virtualMachines/write", "Microsoft.Compute/virtualMachines/capture/action"
*/
@JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
private String name;
/*
- * Whether the operation applies to data-plane. This is "true" for
- * data-plane operations and "false" for ARM/control-plane operations.
+ * Whether the operation applies to data-plane. This is "true" for data-plane operations and "false" for
+ * ARM/control-plane operations.
*/
@JsonProperty(value = "isDataAction", access = JsonProperty.Access.WRITE_ONLY)
private Boolean isDataAction;
@@ -35,19 +38,22 @@ public final class OperationInner {
private OperationDisplay display;
/*
- * The intended executor of the operation; as in Resource Based Access
- * Control (RBAC) and audit logs UX. Default value is "user,system"
+ * The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default
+ * value is "user,system"
*/
@JsonProperty(value = "origin", access = JsonProperty.Access.WRITE_ONLY)
private Origin origin;
/*
- * Enum. Indicates the action type. "Internal" refers to actions that are
- * for internal only APIs.
+ * Enum. Indicates the action type. "Internal" refers to actions that are for internal only APIs.
*/
@JsonProperty(value = "actionType", access = JsonProperty.Access.WRITE_ONLY)
private ActionType actionType;
+ /** Creates an instance of OperationInner class. */
+ public OperationInner() {
+ }
+
/**
* Get the name property: The name of the operation, as per Resource-Based Access Control (RBAC). Examples:
* "Microsoft.Compute/virtualMachines/write", "Microsoft.Compute/virtualMachines/capture/action".
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationStatusInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationStatusInner.java
index 242057dbaee6..0f2c8fa71b65 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationStatusInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/OperationStatusInner.java
@@ -42,11 +42,17 @@ public final class OperationStatusInner {
private String status;
/*
- * Error response Error response describing why the operation failed.
+ * Error response
+ *
+ * Error response describing why the operation failed.
*/
@JsonProperty(value = "error")
private ManagementError error;
+ /** Creates an instance of OperationStatusInner class. */
+ public OperationStatusInner() {
+ }
+
/**
* Get the id property: The operation's unique id.
*
@@ -148,7 +154,9 @@ public OperationStatusInner withStatus(String status) {
}
/**
- * Get the error property: Error response Error response describing why the operation failed.
+ * Get the error property: Error response
+ *
+ *
Error response describing why the operation failed.
*
* @return the error value.
*/
@@ -157,7 +165,9 @@ public ManagementError error() {
}
/**
- * Set the error property: Error response Error response describing why the operation failed.
+ * Set the error property: Error response
+ *
+ *
Error response describing why the operation failed.
*
* @param error the error value to set.
* @return the OperationStatusInner object itself.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionInner.java
index 08defe8fc702..fafbd4b3fcd1 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionInner.java
@@ -20,6 +20,10 @@ public final class PrivateEndpointConnectionInner extends ProxyResource {
@JsonProperty(value = "properties")
private PrivateEndpointConnectionProperties innerProperties;
+ /** Creates an instance of PrivateEndpointConnectionInner class. */
+ public PrivateEndpointConnectionInner() {
+ }
+
/**
* Get the innerProperties property: Resource properties.
*
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionProperties.java
index 932d6da61c07..4a0b49721c26 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionProperties.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateEndpointConnectionProperties.java
@@ -21,8 +21,7 @@ public final class PrivateEndpointConnectionProperties {
private PrivateEndpoint privateEndpoint;
/*
- * A collection of information about the state of the connection between
- * service consumer and provider.
+ * A collection of information about the state of the connection between service consumer and provider.
*/
@JsonProperty(value = "privateLinkServiceConnectionState", required = true)
private PrivateLinkServiceConnectionState privateLinkServiceConnectionState;
@@ -33,6 +32,10 @@ public final class PrivateEndpointConnectionProperties {
@JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
private PrivateEndpointConnectionProvisioningState provisioningState;
+ /** Creates an instance of PrivateEndpointConnectionProperties class. */
+ public PrivateEndpointConnectionProperties() {
+ }
+
/**
* Get the privateEndpoint property: The resource of private end point.
*
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceInner.java
index 6f78217b3091..3c02d5b854a0 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceInner.java
@@ -18,6 +18,10 @@ public final class PrivateLinkResourceInner extends ProxyResource {
@JsonProperty(value = "properties")
private PrivateLinkResourceProperties innerProperties;
+ /** Creates an instance of PrivateLinkResourceInner class. */
+ public PrivateLinkResourceInner() {
+ }
+
/**
* Get the innerProperties property: Resource properties.
*
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceProperties.java
index 802b87d2d897..5b134967b42d 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceProperties.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/PrivateLinkResourceProperties.java
@@ -29,6 +29,10 @@ public final class PrivateLinkResourceProperties {
@JsonProperty(value = "requiredZoneNames")
private List requiredZoneNames;
+ /** Creates an instance of PrivateLinkResourceProperties class. */
+ public PrivateLinkResourceProperties() {
+ }
+
/**
* Get the groupId property: The private link resource group id.
*
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java
index f862768b8cd4..51a3f6564ff1 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java
@@ -105,6 +105,10 @@ public String regionName() {
return this.location();
}
+ public String resourceGroupName() {
+ return resourceGroupName;
+ }
+
public ClusterInner innerModel() {
return this.innerObject;
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java
index b76e39308002..7ebf84c35d91 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java
@@ -83,6 +83,10 @@ public DatabasePropertiesGeoReplication geoReplication() {
return this.innerModel().geoReplication();
}
+ public String resourceGroupName() {
+ return resourceGroupName;
+ }
+
public DatabaseInner innerModel() {
return this.innerObject;
}
@@ -181,14 +185,14 @@ public Database refresh(Context context) {
return this;
}
- public AccessKeys listKeys() {
- return serviceManager.databases().listKeys(resourceGroupName, clusterName, databaseName);
- }
-
public Response listKeysWithResponse(Context context) {
return serviceManager.databases().listKeysWithResponse(resourceGroupName, clusterName, databaseName, context);
}
+ public AccessKeys listKeys() {
+ return serviceManager.databases().listKeys(resourceGroupName, clusterName, databaseName);
+ }
+
public AccessKeys regenerateKey(RegenerateKeyParameters parameters) {
return serviceManager.databases().regenerateKey(resourceGroupName, clusterName, databaseName, parameters);
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java
index 8388c3b650ca..787d1436b322 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java
@@ -1122,14 +1122,7 @@ private Mono> getWithResponseAsync(
@ServiceMethod(returns = ReturnType.SINGLE)
private Mono getAsync(String resourceGroupName, String clusterName, String databaseName) {
return getWithResponseAsync(resourceGroupName, clusterName, databaseName)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
@@ -1138,14 +1131,16 @@ private Mono getAsync(String resourceGroupName, String clusterNam
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return information about a database in a RedisEnterprise cluster.
+ * @return information about a database in a RedisEnterprise cluster along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public DatabaseInner get(String resourceGroupName, String clusterName, String databaseName) {
- return getAsync(resourceGroupName, clusterName, databaseName).block();
+ public Response getWithResponse(
+ String resourceGroupName, String clusterName, String databaseName, Context context) {
+ return getWithResponseAsync(resourceGroupName, clusterName, databaseName, context).block();
}
/**
@@ -1154,16 +1149,14 @@ public DatabaseInner get(String resourceGroupName, String clusterName, String da
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return information about a database in a RedisEnterprise cluster along with {@link Response}.
+ * @return information about a database in a RedisEnterprise cluster.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response getWithResponse(
- String resourceGroupName, String clusterName, String databaseName, Context context) {
- return getWithResponseAsync(resourceGroupName, clusterName, databaseName, context).block();
+ public DatabaseInner get(String resourceGroupName, String clusterName, String databaseName) {
+ return getWithResponse(resourceGroupName, clusterName, databaseName, Context.NONE).getValue();
}
/**
@@ -1535,14 +1528,7 @@ private Mono> listKeysWithResponseAsync(
@ServiceMethod(returns = ReturnType.SINGLE)
private Mono listKeysAsync(String resourceGroupName, String clusterName, String databaseName) {
return listKeysWithResponseAsync(resourceGroupName, clusterName, databaseName)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
@@ -1551,14 +1537,16 @@ private Mono listKeysAsync(String resourceGroupName, String clu
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return access keys.
+ * @return access keys along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public AccessKeysInner listKeys(String resourceGroupName, String clusterName, String databaseName) {
- return listKeysAsync(resourceGroupName, clusterName, databaseName).block();
+ public Response listKeysWithResponse(
+ String resourceGroupName, String clusterName, String databaseName, Context context) {
+ return listKeysWithResponseAsync(resourceGroupName, clusterName, databaseName, context).block();
}
/**
@@ -1567,16 +1555,14 @@ public AccessKeysInner listKeys(String resourceGroupName, String clusterName, St
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param clusterName The name of the RedisEnterprise cluster.
* @param databaseName The name of the database.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return access keys along with {@link Response}.
+ * @return access keys.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response listKeysWithResponse(
- String resourceGroupName, String clusterName, String databaseName, Context context) {
- return listKeysWithResponseAsync(resourceGroupName, clusterName, databaseName, context).block();
+ public AccessKeysInner listKeys(String resourceGroupName, String clusterName, String databaseName) {
+ return listKeysWithResponse(resourceGroupName, clusterName, databaseName, Context.NONE).getValue();
}
/**
@@ -2783,7 +2769,8 @@ public void forceUnlink(
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2819,7 +2806,8 @@ private Mono> listByClusterNextSinglePageAsync(Stri
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesImpl.java
index 998b30c4b50f..ab7c4c24f595 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesImpl.java
@@ -44,15 +44,6 @@ public PagedIterable listByCluster(String resourceGroupName, String cl
return Utils.mapPage(inner, inner1 -> new DatabaseImpl(inner1, this.manager()));
}
- public Database get(String resourceGroupName, String clusterName, String databaseName) {
- DatabaseInner inner = this.serviceClient().get(resourceGroupName, clusterName, databaseName);
- if (inner != null) {
- return new DatabaseImpl(inner, this.manager());
- } else {
- return null;
- }
- }
-
public Response getWithResponse(
String resourceGroupName, String clusterName, String databaseName, Context context) {
Response inner =
@@ -68,6 +59,15 @@ public Response getWithResponse(
}
}
+ public Database get(String resourceGroupName, String clusterName, String databaseName) {
+ DatabaseInner inner = this.serviceClient().get(resourceGroupName, clusterName, databaseName);
+ if (inner != null) {
+ return new DatabaseImpl(inner, this.manager());
+ } else {
+ return null;
+ }
+ }
+
public void delete(String resourceGroupName, String clusterName, String databaseName) {
this.serviceClient().delete(resourceGroupName, clusterName, databaseName);
}
@@ -76,15 +76,6 @@ public void delete(String resourceGroupName, String clusterName, String database
this.serviceClient().delete(resourceGroupName, clusterName, databaseName, context);
}
- public AccessKeys listKeys(String resourceGroupName, String clusterName, String databaseName) {
- AccessKeysInner inner = this.serviceClient().listKeys(resourceGroupName, clusterName, databaseName);
- if (inner != null) {
- return new AccessKeysImpl(inner, this.manager());
- } else {
- return null;
- }
- }
-
public Response listKeysWithResponse(
String resourceGroupName, String clusterName, String databaseName, Context context) {
Response inner =
@@ -100,6 +91,15 @@ public Response listKeysWithResponse(
}
}
+ public AccessKeys listKeys(String resourceGroupName, String clusterName, String databaseName) {
+ AccessKeysInner inner = this.serviceClient().listKeys(resourceGroupName, clusterName, databaseName);
+ if (inner != null) {
+ return new AccessKeysImpl(inner, this.manager());
+ } else {
+ return null;
+ }
+ }
+
public AccessKeys regenerateKey(
String resourceGroupName, String clusterName, String databaseName, RegenerateKeyParameters parameters) {
AccessKeysInner inner =
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java
index 0392645e823d..6cb054635a4a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java
@@ -202,7 +202,8 @@ public PagedIterable list(Context context) {
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -238,7 +239,8 @@ private Mono> listNextSinglePageAsync(String nextL
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java
index 81f66679c00c..832caef0f57c 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java
@@ -70,8 +70,8 @@ Mono> get(
/**
* Gets the status of operation.
*
- * @param location The region the operation is in.
- * @param operationId The operation's unique identifier.
+ * @param location The name of Azure region.
+ * @param operationId The ID of an ongoing async operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -116,8 +116,8 @@ private Mono> getWithResponseAsync(String locatio
/**
* Gets the status of operation.
*
- * @param location The region the operation is in.
- * @param operationId The operation's unique identifier.
+ * @param location The name of Azure region.
+ * @param operationId The ID of an ongoing async operation.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
@@ -161,8 +161,8 @@ private Mono> getWithResponseAsync(
/**
* Gets the status of operation.
*
- * @param location The region the operation is in.
- * @param operationId The operation's unique identifier.
+ * @param location The name of Azure region.
+ * @param operationId The ID of an ongoing async operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -170,45 +170,37 @@ private Mono> getWithResponseAsync(
*/
@ServiceMethod(returns = ReturnType.SINGLE)
private Mono getAsync(String location, String operationId) {
- return getWithResponseAsync(location, operationId)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ return getWithResponseAsync(location, operationId).flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
* Gets the status of operation.
*
- * @param location The region the operation is in.
- * @param operationId The operation's unique identifier.
+ * @param location The name of Azure region.
+ * @param operationId The ID of an ongoing async operation.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the status of operation.
+ * @return the status of operation along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public OperationStatusInner get(String location, String operationId) {
- return getAsync(location, operationId).block();
+ public Response getWithResponse(String location, String operationId, Context context) {
+ return getWithResponseAsync(location, operationId, context).block();
}
/**
* Gets the status of operation.
*
- * @param location The region the operation is in.
- * @param operationId The operation's unique identifier.
- * @param context The context to associate with this operation.
+ * @param location The name of Azure region.
+ * @param operationId The ID of an ongoing async operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the status of operation along with {@link Response}.
+ * @return the status of operation.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response getWithResponse(String location, String operationId, Context context) {
- return getWithResponseAsync(location, operationId, context).block();
+ public OperationStatusInner get(String location, String operationId) {
+ return getWithResponse(location, operationId, Context.NONE).getValue();
}
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusImpl.java
index 429725127207..6d44d30954f3 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusImpl.java
@@ -27,15 +27,6 @@ public OperationsStatusImpl(
this.serviceManager = serviceManager;
}
- public OperationStatus get(String location, String operationId) {
- OperationStatusInner inner = this.serviceClient().get(location, operationId);
- if (inner != null) {
- return new OperationStatusImpl(inner, this.manager());
- } else {
- return null;
- }
- }
-
public Response getWithResponse(String location, String operationId, Context context) {
Response inner = this.serviceClient().getWithResponse(location, operationId, context);
if (inner != null) {
@@ -49,6 +40,15 @@ public Response getWithResponse(String location, String operati
}
}
+ public OperationStatus get(String location, String operationId) {
+ OperationStatusInner inner = this.serviceClient().get(location, operationId);
+ if (inner != null) {
+ return new OperationStatusImpl(inner, this.manager());
+ } else {
+ return null;
+ }
+ }
+
private OperationsStatusClient serviceClient() {
return this.innerClient;
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionImpl.java
index 6eeba93d56c2..2e13c02d6463 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionImpl.java
@@ -41,6 +41,10 @@ public PrivateEndpointConnectionProvisioningState provisioningState() {
return this.innerModel().provisioningState();
}
+ public String resourceGroupName() {
+ return resourceGroupName;
+ }
+
public PrivateEndpointConnectionInner innerModel() {
return this.innerObject;
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java
index 352c3d86e140..3eba476e8565 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -434,14 +434,7 @@ private Mono> getWithResponseAsync(
private Mono getAsync(
String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
return getWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
@@ -451,15 +444,17 @@ private Mono getAsync(
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the specified private endpoint connection associated with the RedisEnterprise cluster.
+ * @return the specified private endpoint connection associated with the RedisEnterprise cluster along with {@link
+ * Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public PrivateEndpointConnectionInner get(
- String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
- return getAsync(resourceGroupName, clusterName, privateEndpointConnectionName).block();
+ public Response getWithResponse(
+ String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context) {
+ return getWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
}
/**
@@ -469,17 +464,15 @@ public PrivateEndpointConnectionInner get(
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the specified private endpoint connection associated with the RedisEnterprise cluster along with {@link
- * Response}.
+ * @return the specified private endpoint connection associated with the RedisEnterprise cluster.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response getWithResponse(
- String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context) {
- return getWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
+ public PrivateEndpointConnectionInner get(
+ String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
+ return getWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, Context.NONE).getValue();
}
/**
@@ -952,7 +945,7 @@ private Mono> deleteWithResponseAsync(
@ServiceMethod(returns = ReturnType.SINGLE)
private Mono deleteAsync(String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
return deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName)
- .flatMap((Response res) -> Mono.empty());
+ .flatMap(ignored -> Mono.empty());
}
/**
@@ -962,13 +955,16 @@ private Mono deleteAsync(String resourceGroupName, String clusterName, Str
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+ * @return the {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
- deleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName).block();
+ public Response deleteWithResponse(
+ String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context) {
+ return deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
}
/**
@@ -978,15 +974,12 @@ public void delete(String resourceGroupName, String clusterName, String privateE
* @param clusterName The name of the RedisEnterprise cluster.
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
* resource.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response deleteWithResponse(
- String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context) {
- return deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
+ public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
+ deleteWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, Context.NONE);
}
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsImpl.java
index af538f19e8e0..a34e9a42241d 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsImpl.java
@@ -40,17 +40,6 @@ public PagedIterable list(
return Utils.mapPage(inner, inner1 -> new PrivateEndpointConnectionImpl(inner1, this.manager()));
}
- public PrivateEndpointConnection get(
- String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
- PrivateEndpointConnectionInner inner =
- this.serviceClient().get(resourceGroupName, clusterName, privateEndpointConnectionName);
- if (inner != null) {
- return new PrivateEndpointConnectionImpl(inner, this.manager());
- } else {
- return null;
- }
- }
-
public Response getWithResponse(
String resourceGroupName, String clusterName, String privateEndpointConnectionName, Context context) {
Response inner =
@@ -68,8 +57,15 @@ public Response getWithResponse(
}
}
- public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
- this.serviceClient().delete(resourceGroupName, clusterName, privateEndpointConnectionName);
+ public PrivateEndpointConnection get(
+ String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
+ PrivateEndpointConnectionInner inner =
+ this.serviceClient().get(resourceGroupName, clusterName, privateEndpointConnectionName);
+ if (inner != null) {
+ return new PrivateEndpointConnectionImpl(inner, this.manager());
+ } else {
+ return null;
+ }
}
public Response deleteWithResponse(
@@ -79,6 +75,10 @@ public Response deleteWithResponse(
.deleteWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, context);
}
+ public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
+ this.serviceClient().delete(resourceGroupName, clusterName, privateEndpointConnectionName);
+ }
+
public PrivateEndpointConnection getById(String id) {
String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
if (resourceGroupName == null) {
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientBuilder.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientBuilder.java
index 7fe27e7033bb..998d6c966e8c 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientBuilder.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientBuilder.java
@@ -119,27 +119,26 @@ public RedisEnterpriseManagementClientBuilder serializerAdapter(SerializerAdapte
* @return an instance of RedisEnterpriseManagementClientImpl.
*/
public RedisEnterpriseManagementClientImpl buildClient() {
- if (pipeline == null) {
- this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
- }
- if (endpoint == null) {
- this.endpoint = "https://management.azure.com";
- }
- if (environment == null) {
- this.environment = AzureEnvironment.AZURE;
- }
- if (pipeline == null) {
- this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
- }
- if (defaultPollInterval == null) {
- this.defaultPollInterval = Duration.ofSeconds(30);
- }
- if (serializerAdapter == null) {
- this.serializerAdapter = SerializerFactory.createDefaultManagementSerializerAdapter();
- }
+ String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
+ AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
+ HttpPipeline localPipeline =
+ (pipeline != null)
+ ? pipeline
+ : new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
+ Duration localDefaultPollInterval =
+ (defaultPollInterval != null) ? defaultPollInterval : Duration.ofSeconds(30);
+ SerializerAdapter localSerializerAdapter =
+ (serializerAdapter != null)
+ ? serializerAdapter
+ : SerializerFactory.createDefaultManagementSerializerAdapter();
RedisEnterpriseManagementClientImpl client =
new RedisEnterpriseManagementClientImpl(
- pipeline, serializerAdapter, defaultPollInterval, environment, subscriptionId, endpoint);
+ localPipeline,
+ localSerializerAdapter,
+ localDefaultPollInterval,
+ localEnvironment,
+ subscriptionId,
+ localEndpoint);
return client;
}
}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java
index 82d012c2c708..17e0d43776cc 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java
@@ -15,6 +15,7 @@
import com.azure.core.management.polling.PollResult;
import com.azure.core.management.polling.PollerFactory;
import com.azure.core.util.Context;
+import com.azure.core.util.CoreUtils;
import com.azure.core.util.logging.ClientLogger;
import com.azure.core.util.polling.AsyncPollResponse;
import com.azure.core.util.polling.LongRunningOperationStatus;
@@ -34,7 +35,6 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
-import java.util.Map;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -232,10 +232,7 @@ public Context getContext() {
* @return the merged context.
*/
public Context mergeContext(Context context) {
- for (Map.Entry