diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml index 7c4b7f83b48e..565c01c73cb5 100755 --- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml +++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml @@ -1951,6 +1951,10 @@ + + + + diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/FunctionApp.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/FunctionApp.java index 3c98f2c7e3d3..11f868807689 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/FunctionApp.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/FunctionApp.java @@ -9,8 +9,8 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountSkuType; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountSkuType; import java.util.Map; import reactor.core.publisher.Mono; @@ -314,7 +314,7 @@ interface WithStorageAccount { * @return the next stage of the definition */ @Deprecated - WithCreate withNewStorageAccount(String name, com.azure.management.storage.SkuName sku); + WithCreate withNewStorageAccount(String name, com.azure.management.storage.models.SkuName sku); /** * Creates a new storage account to use for the function app. @@ -654,7 +654,7 @@ interface WithStorageAccount { * @return the next stage of the function app update */ @Deprecated - Update withNewStorageAccount(String name, com.azure.management.storage.SkuName sku); + Update withNewStorageAccount(String name, com.azure.management.storage.models.SkuName sku); /** * Creates a new storage account to use for the function app. diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceManager.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceManager.java index b1740679a36b..2f9a0b5aa091 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceManager.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceManager.java @@ -21,7 +21,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.HttpPipelineProvider; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; /** Entry point to Azure storage resource management. */ public final class AppServiceManager extends Manager { diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java index b794874f54b5..79a6f9cf2222 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java @@ -38,9 +38,9 @@ import com.azure.management.appservice.models.SiteLogsConfigInner; import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Indexable; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountKey; -import com.azure.management.storage.StorageAccountSkuType; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountKey; +import com.azure.management.storage.models.StorageAccountSkuType; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.File; import java.io.IOException; @@ -297,7 +297,7 @@ private FunctionAppImpl autoSetAlwaysOn(PricingTier pricingTier) { } @Override - public FunctionAppImpl withNewStorageAccount(String name, com.azure.management.storage.SkuName sku) { + public FunctionAppImpl withNewStorageAccount(String name, com.azure.management.storage.models.SkuName sku) { StorageAccount.DefinitionStages.WithGroup storageDefine = manager().storageManager().storageAccounts().define(name).withRegion(regionName()); if (super.creatableGroup != null && isInCreateMode()) { @@ -639,7 +639,7 @@ public Flux createAsync() { if (currentStorageAccount == null && storageAccountToSet == null && storageAccountCreatable == null) { withNewStorageAccount( this.manager().sdkContext().randomResourceName(name(), 20), - com.azure.management.storage.SkuName.STANDARD_GRS); + com.azure.management.storage.models.SkuName.STANDARD_GRS); } } return super.createAsync(); diff --git a/sdk/appservice/mgmt/src/test/java/com/azure/management/appservice/FunctionAppsTests.java b/sdk/appservice/mgmt/src/test/java/com/azure/management/appservice/FunctionAppsTests.java index 67512f0b957f..8ece1e7fa2c5 100644 --- a/sdk/appservice/mgmt/src/test/java/com/azure/management/appservice/FunctionAppsTests.java +++ b/sdk/appservice/mgmt/src/test/java/com/azure/management/appservice/FunctionAppsTests.java @@ -10,9 +10,9 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountSkuType; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountSkuType; +import com.azure.management.storage.StorageManager; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/Disk.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/Disk.java index cc0a5f0f9d97..4440ca96e3ca 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/Disk.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/Disk.java @@ -13,7 +13,7 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.Set; import reactor.core.publisher.Mono; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachine.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachine.java index f3bd615d0975..d0c35170caf9 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachine.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachine.java @@ -20,7 +20,7 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachineScaleSet.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachineScaleSet.java index c7166028274f..a28c97daaef3 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachineScaleSet.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/VirtualMachineScaleSet.java @@ -24,7 +24,7 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import reactor.core.publisher.Mono; import java.io.IOException; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ComputeManager.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ComputeManager.java index 45d577f67af8..e489f70e144c 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ComputeManager.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ComputeManager.java @@ -28,7 +28,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.HttpPipelineProvider; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; /** Entry point to Azure compute resource management. */ public final class ComputeManager extends Manager { diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DiskImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DiskImpl.java index dff07ef9ca07..eb4ff991faa9 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DiskImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DiskImpl.java @@ -19,7 +19,7 @@ import com.azure.management.resources.fluentcore.arm.ResourceUtils; import com.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.azure.management.resources.fluentcore.utils.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/UnmanagedDataDiskImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/UnmanagedDataDiskImpl.java index 510a650f3bf4..e91c26be2c2b 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/UnmanagedDataDiskImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/UnmanagedDataDiskImpl.java @@ -12,7 +12,7 @@ import com.azure.management.compute.VirtualMachineUnmanagedDataDisk; import com.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; import com.azure.management.resources.fluentcore.utils.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java index ee4258b7f845..1eb2c9d76e20 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java @@ -73,8 +73,8 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.utils.ResourceNamer; import com.azure.management.resources.fluentcore.utils.Utils; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.StorageManager; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java index 0b1c64a721e1..1cb6aaff54c6 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java @@ -77,8 +77,8 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.utils.ResourceNamer; import com.azure.management.resources.fluentcore.utils.Utils; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.StorageManager; import reactor.core.Exceptions; import reactor.core.publisher.Mono; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java index 5cdf5afa502b..52c3d0714508 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java @@ -19,7 +19,7 @@ import com.azure.management.graphrbac.implementation.GraphRbacManager; import com.azure.management.network.implementation.NetworkManager; import com.azure.management.resources.fluentcore.arm.collection.implementation.TopLevelModifiableResourcesImpl; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; import java.util.ArrayList; import java.util.List; import reactor.core.publisher.Mono; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java index 671427cc1b1f..0c0918ec11a9 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachinesImpl.java @@ -20,7 +20,7 @@ import com.azure.management.graphrbac.implementation.GraphRbacManager; import com.azure.management.network.implementation.NetworkManager; import com.azure.management.resources.fluentcore.arm.collection.implementation.TopLevelModifiableResourcesImpl; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.ArrayList; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/ComputeManagementTest.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/ComputeManagementTest.java index 0f3f5d8008ab..8c0c3b3aadf0 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/ComputeManagementTest.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/ComputeManagementTest.java @@ -19,7 +19,7 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.implementation.ResourceManager; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import java.io.IOException; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineBootDiagnosticsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineBootDiagnosticsTests.java index ccb657b2b0d6..eb4475695766 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineBootDiagnosticsTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineBootDiagnosticsTests.java @@ -7,7 +7,7 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java index d7def390e163..effafde80c91 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineCustomImageOperationsTest.java @@ -9,7 +9,7 @@ import com.azure.management.resources.core.TestUtilities; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.io.IOException; import java.util.Map; import org.junit.jupiter.api.Assertions; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineExtensionOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineExtensionOperationsTests.java index 2047c0ac48e4..9b4807132a4d 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineExtensionOperationsTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineExtensionOperationsTests.java @@ -7,7 +7,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.InputStream; import java.util.ArrayList; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedServiceIdentityOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedServiceIdentityOperationsTests.java index 1185fe306974..073a1b9471cb 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedServiceIdentityOperationsTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedServiceIdentityOperationsTests.java @@ -12,7 +12,7 @@ import com.azure.management.resources.fluentcore.dag.TaskGroup; import com.azure.management.resources.fluentcore.model.Indexable; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java index cad6db130b66..2ff63e377552 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineOperationsTests.java @@ -19,8 +19,8 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.CreatedResources; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.SkuName; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineRelatedResourcesDeletionTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineRelatedResourcesDeletionTests.java index b8004d04257c..2364ce48a493 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineRelatedResourcesDeletionTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineRelatedResourcesDeletionTests.java @@ -15,7 +15,7 @@ import com.azure.management.resources.fluentcore.arm.models.Resource; import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetBootDiagnosticsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetBootDiagnosticsTests.java index 20264d702754..269b3e853f31 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetBootDiagnosticsTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetBootDiagnosticsTests.java @@ -12,7 +12,7 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Assertions; diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java index 7cfee8b490bb..21b68426dbcf 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineScaleSetOperationsTests.java @@ -32,8 +32,8 @@ import com.azure.management.resources.fluentcore.arm.AvailabilityZoneId; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountKey; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountKey; import com.microsoft.azure.storage.CloudStorageAccount; import com.microsoft.azure.storage.blob.CloudBlobClient; import com.microsoft.azure.storage.blob.CloudBlobContainer; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Registry.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Registry.java index 0894777775d5..7787e264845e 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Registry.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Registry.java @@ -12,7 +12,7 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.time.OffsetDateTime; import java.util.Collection; import reactor.core.publisher.Mono; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/ContainerRegistryManager.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/ContainerRegistryManager.java index cf277d45e0ff..f100dd024215 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/ContainerRegistryManager.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/ContainerRegistryManager.java @@ -17,7 +17,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.HttpPipelineProvider; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; /** Entry point to Azure container registry management. */ public final class ContainerRegistryManager diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java index 5cd90baa498e..8bae7563cee5 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistriesImpl.java @@ -18,7 +18,7 @@ import com.azure.management.containerregistry.models.RegistryUsageListResultInner; import com.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; import com.azure.management.resources.fluentcore.utils.PagedConverter; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java index 0a3f8b7ac1ca..9fe46803c506 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryImpl.java @@ -20,8 +20,8 @@ import com.azure.management.resources.fluentcore.arm.ResourceUtils; import com.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.azure.management.resources.fluentcore.model.Creatable; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.StorageManager; import java.time.OffsetDateTime; import java.util.Collection; import reactor.core.publisher.Mono; diff --git a/sdk/management/azure/src/main/java/com/azure/management/Azure.java b/sdk/management/azure/src/main/java/com/azure/management/Azure.java index e8176c49c600..407e623de5f7 100644 --- a/sdk/management/azure/src/main/java/com/azure/management/Azure.java +++ b/sdk/management/azure/src/main/java/com/azure/management/Azure.java @@ -89,13 +89,13 @@ import com.azure.management.resources.implementation.ResourceManager; import com.azure.management.sql.SqlServers; import com.azure.management.sql.implementation.SqlServerManager; -import com.azure.management.storage.BlobContainers; -import com.azure.management.storage.BlobServices; -import com.azure.management.storage.ManagementPolicies; -import com.azure.management.storage.StorageAccounts; -import com.azure.management.storage.StorageSkus; -import com.azure.management.storage.Usages; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.models.BlobContainers; +import com.azure.management.storage.models.BlobServices; +import com.azure.management.storage.models.ManagementPolicies; +import com.azure.management.storage.models.StorageAccounts; +import com.azure.management.storage.models.StorageSkus; +import com.azure.management.storage.models.Usages; +import com.azure.management.storage.StorageManager; import java.util.Objects; diff --git a/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java b/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java index 022e093978b9..e554fa4fb7bc 100644 --- a/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java +++ b/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java @@ -43,8 +43,8 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.SkuName; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java b/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java index daeb936f1dff..8b4d1f7b9355 100644 --- a/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java +++ b/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java @@ -18,8 +18,8 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.CreatedResources; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccounts; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccounts; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Assertions; diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java b/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java index 35829c30e941..64a8534ade3b 100644 --- a/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java +++ b/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java @@ -11,8 +11,8 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.arm.models.Resource; import com.azure.management.resources.fluentcore.model.Creatable; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccounts; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccounts; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Assertions; diff --git a/sdk/management/azure/src/test/java/com/azure/management/VirtualNetworkGatewayTests.java b/sdk/management/azure/src/test/java/com/azure/management/VirtualNetworkGatewayTests.java index 106d135d3c94..808d29d207b8 100644 --- a/sdk/management/azure/src/test/java/com/azure/management/VirtualNetworkGatewayTests.java +++ b/sdk/management/azure/src/test/java/com/azure/management/VirtualNetworkGatewayTests.java @@ -13,7 +13,7 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/sdk/management/gulpfile.js b/sdk/management/gulpfile.js index d363414edea1..3653f75e101d 100644 --- a/sdk/management/gulpfile.js +++ b/sdk/management/gulpfile.js @@ -126,7 +126,7 @@ function codegen(project, cb) { cmd = autoRestExe + ' ' + readmeFile + ' --java ' + ' --azure-arm ' + - ' --track1-naming --generate-client-as-impl --implementation-subpackage=models --sync-methods=all --required-parameter-client-methods --add-context-parameter --context-client-method-parameter --client-side-validations --client-logger ' + + ' --track1-naming --implementation-subpackage=fluent --sync-methods=all --required-parameter-client-methods --add-context-parameter --context-client-method-parameter --client-side-validations --client-logger ' + generator + ` --java.namespace=${mappings[project].package} ` + ` --java.output-folder=${outDir} ` + diff --git a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxFunctionAppSourceControl.java b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxFunctionAppSourceControl.java index 0ebed0d9708c..bfbcb8881533 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxFunctionAppSourceControl.java +++ b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxFunctionAppSourceControl.java @@ -14,7 +14,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccountSkuType; +import com.azure.management.storage.models.StorageAccountSkuType; import com.azure.core.http.policy.HttpLogDetailLevel; import org.apache.commons.lang.time.StopWatch; diff --git a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java index c78f0926ad49..58218140b2df 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java +++ b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java @@ -16,7 +16,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.storage.blob.BlobClient; import com.azure.storage.blob.BlobContainerClient; diff --git a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppStorageAccountConnection.java b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppStorageAccountConnection.java index 496a4e538b78..ae6fae7ee8dc 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppStorageAccountConnection.java +++ b/sdk/management/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppStorageAccountConnection.java @@ -17,7 +17,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.storage.blob.BlobClient; import com.azure.storage.blob.BlobContainerClient; diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java index 5a2dc2c2b27f..3441d7ed6338 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java +++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java @@ -18,7 +18,7 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.CreatedResources; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import org.apache.commons.lang.time.StopWatch; import java.util.ArrayList; diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java index 12537204b4fc..2a5043bc7ac4 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java +++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java @@ -19,7 +19,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.List; diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java index 86b4f33bfc1c..7c55ec813977 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java +++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java @@ -16,7 +16,7 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.List; diff --git a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachinesInParallel.java b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachinesInParallel.java index e9e4749ef953..032cf1a0eda6 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachinesInParallel.java +++ b/sdk/management/samples/src/main/java/com/azure/management/compute/samples/ManageVirtualMachinesInParallel.java @@ -16,7 +16,7 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.Collection; diff --git a/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/QueryMetricsAndActivityLogs.java b/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/QueryMetricsAndActivityLogs.java index 11d991e2ba40..2eb4b8fb1ad5 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/QueryMetricsAndActivityLogs.java +++ b/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/QueryMetricsAndActivityLogs.java @@ -21,9 +21,9 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.AccessTier; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountKey; +import com.azure.management.storage.models.AccessTier; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountKey; import com.azure.storage.blob.BlobClient; import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.BlobContainerClientBuilder; diff --git a/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java b/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java index bf883402be0a..a07dca0d033e 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java +++ b/sdk/management/samples/src/main/java/com/azure/management/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java @@ -16,8 +16,8 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.AccessTier; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.AccessTier; +import com.azure.management.storage.models.StorageAccount; import java.time.OffsetDateTime; diff --git a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageApplicationGateway.java b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageApplicationGateway.java index 942a68e1190c..05068f5f590d 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageApplicationGateway.java +++ b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageApplicationGateway.java @@ -21,7 +21,7 @@ import com.azure.management.resources.fluentcore.model.CreatedResources; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import org.apache.commons.lang.time.StopWatch; import java.io.File; diff --git a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageNetworkWatcher.java b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageNetworkWatcher.java index 148310757699..6315c2685033 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageNetworkWatcher.java +++ b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageNetworkWatcher.java @@ -28,7 +28,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import com.azure.storage.blob.BlobClient; import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.BlobServiceClient; diff --git a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java index c7320334dce9..15b3ce9a1e4a 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java +++ b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java @@ -19,7 +19,7 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import org.apache.commons.lang.time.StopWatch; import java.util.ArrayList; diff --git a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVpnGatewayVNet2VNetConnection.java b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVpnGatewayVNet2VNetConnection.java index 8d7b281f03cb..641118b0f8cc 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVpnGatewayVNet2VNetConnection.java +++ b/sdk/management/samples/src/main/java/com/azure/management/network/samples/ManageVpnGatewayVNet2VNetConnection.java @@ -23,7 +23,7 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.BlobServiceClient; import com.azure.storage.blob.BlobServiceClientBuilder; diff --git a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/ManageResource.java b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/ManageResource.java index 274da6f17fab..68cf5b5de431 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/ManageResource.java +++ b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/ManageResource.java @@ -10,8 +10,8 @@ import com.azure.management.Azure; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.SkuName; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.StorageAccount; /** * Azure Resource sample for managing resources - diff --git a/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java b/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java index 0c6dcdb5d142..24117e7f5192 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java +++ b/sdk/management/samples/src/main/java/com/azure/management/samples/Utils.java @@ -151,10 +151,10 @@ import com.azure.management.sql.SqlServerKey; import com.azure.management.sql.SqlSubscriptionUsageMetric; import com.azure.management.sql.SqlVirtualNetworkRule; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountEncryptionStatus; -import com.azure.management.storage.StorageAccountKey; -import com.azure.management.storage.StorageService; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountEncryptionStatus; +import com.azure.management.storage.models.StorageAccountKey; +import com.azure.management.storage.models.StorageService; import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import reactor.core.publisher.Flux; diff --git a/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlImportExportDatabase.java b/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlImportExportDatabase.java index ae83f5894cf3..f1b650f27599 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlImportExportDatabase.java +++ b/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlImportExportDatabase.java @@ -16,7 +16,7 @@ import com.azure.management.sql.SampleName; import com.azure.management.sql.SqlDatabase; import com.azure.management.sql.SqlServer; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; /** * Azure SQL sample for managing import/export SQL Database - diff --git a/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlServerSecurityAlertPolicy.java b/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlServerSecurityAlertPolicy.java index c12cfdd9d487..af87b2e9effa 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlServerSecurityAlertPolicy.java +++ b/sdk/management/samples/src/main/java/com/azure/management/sql/samples/ManageSqlServerSecurityAlertPolicy.java @@ -15,7 +15,7 @@ import com.azure.management.sql.SqlDatabaseStandardServiceObjective; import com.azure.management.sql.SqlServer; import com.azure.management.sql.SqlServerSecurityAlertPolicy; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; /** * Azure SQL sample for managing SQL Server Security Alert Policy diff --git a/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccount.java b/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccount.java index ea8d9c298b69..26146f0b9164 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccount.java +++ b/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccount.java @@ -13,11 +13,11 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountEncryptionStatus; -import com.azure.management.storage.StorageAccountKey; -import com.azure.management.storage.StorageAccounts; -import com.azure.management.storage.StorageService; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountEncryptionStatus; +import com.azure.management.storage.models.StorageAccountKey; +import com.azure.management.storage.models.StorageAccounts; +import com.azure.management.storage.models.StorageService; import java.util.List; import java.util.Map; diff --git a/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountAsync.java b/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountAsync.java index b4378633e516..fdd45d4a78db 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountAsync.java +++ b/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountAsync.java @@ -12,8 +12,8 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccounts; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccounts; import reactor.core.publisher.Flux; /** diff --git a/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountNetworkRules.java b/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountNetworkRules.java index 385250321a77..6b1ca4222598 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountNetworkRules.java +++ b/sdk/management/samples/src/main/java/com/azure/management/storage/samples/ManageStorageAccountNetworkRules.java @@ -17,7 +17,7 @@ import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.samples.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; /** * Azure Storage sample for managing storage account network rules - diff --git a/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/AlertsTests.java b/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/AlertsTests.java index d10da4d45c72..75529cfa730f 100644 --- a/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/AlertsTests.java +++ b/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/AlertsTests.java @@ -10,7 +10,7 @@ import com.azure.management.resources.core.TestUtilities; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.time.Duration; import java.time.OffsetDateTime; import java.util.Arrays; diff --git a/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/MonitorManagementTest.java b/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/MonitorManagementTest.java index 51ed7b232caa..cf155c522735 100644 --- a/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/MonitorManagementTest.java +++ b/sdk/monitor/mgmt/src/test/java/com/azure/management/monitor/MonitorManagementTest.java @@ -11,7 +11,7 @@ import com.azure.management.resources.core.TestBase; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.implementation.ResourceManager; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; /** The base for Monitor manager tests. */ public class MonitorManagementTest extends TestBase { diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabase.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabase.java index 65fede1a8570..88261032f17d 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabase.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabase.java @@ -15,7 +15,7 @@ import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; import com.azure.management.sql.models.DatabaseInner; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.time.OffsetDateTime; import java.util.List; import java.util.Map; diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseExportRequest.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseExportRequest.java index 1caba94f04b8..649a31c57724 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseExportRequest.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseExportRequest.java @@ -7,7 +7,7 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Executable; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; /** An immutable client-side representation of an Azure SQL Database export operation request. */ @Fluent diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseImportRequest.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseImportRequest.java index 5db486df6b83..a762802e4bdc 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseImportRequest.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseImportRequest.java @@ -6,7 +6,7 @@ import com.azure.management.resources.fluentcore.arm.models.HasParent; import com.azure.management.resources.fluentcore.model.Executable; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; /** An immutable client-side representation of an Azure SQL Database import operation request. */ @Fluent diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseOperations.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseOperations.java index 097ad4c32cde..d98ef9a24211 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseOperations.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/SqlDatabaseOperations.java @@ -6,7 +6,7 @@ import com.azure.management.resources.fluentcore.arm.models.Resource; import com.azure.management.resources.fluentcore.collection.SupportsCreating; import com.azure.management.resources.fluentcore.model.Creatable; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.time.OffsetDateTime; /** A representation of the Azure SQL Database operations. */ diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseExportRequestImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseExportRequestImpl.java index 974fc0447a22..11e9214d018d 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseExportRequestImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseExportRequestImpl.java @@ -13,7 +13,7 @@ import com.azure.management.sql.SqlDatabaseExportRequest; import com.azure.management.sql.SqlDatabaseImportExportResponse; import com.azure.management.sql.StorageKeyType; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import com.azure.storage.blob.BlobServiceClient; import com.azure.storage.blob.BlobServiceClientBuilder; import com.azure.storage.blob.implementation.models.StorageErrorException; diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java index 4af229793edb..9d4723b7e9bf 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseForElasticPoolImpl.java @@ -8,7 +8,7 @@ import com.azure.management.sql.SampleName; import com.azure.management.sql.SqlDatabase; import com.azure.management.sql.SqlElasticPoolOperations; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.time.OffsetDateTime; import java.util.Objects; diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java index 844c64947a16..08dd64d6015e 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImpl.java @@ -52,7 +52,7 @@ import com.azure.management.sql.models.RestorePointInner; import com.azure.management.sql.models.ServiceTierAdvisorInner; import com.azure.management.sql.models.TransparentDataEncryptionInner; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Collections; diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportRequestImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportRequestImpl.java index 9b51d30b0791..4f9340966a57 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportRequestImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportRequestImpl.java @@ -11,7 +11,7 @@ import com.azure.management.sql.SqlDatabaseImportExportResponse; import com.azure.management.sql.SqlDatabaseImportRequest; import com.azure.management.sql.StorageKeyType; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.Objects; import reactor.core.publisher.Mono; diff --git a/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java b/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java index 0fc36a881248..45d0dedb6402 100644 --- a/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java +++ b/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerOperationsTests.java @@ -11,7 +11,7 @@ import com.azure.management.resources.fluentcore.model.Indexable; import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.resources.fluentcore.utils.Utils; -import com.azure.management.storage.StorageAccount; +import com.azure.management.storage.models.StorageAccount; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerTest.java b/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerTest.java index 8053cb7ed271..d83092bc0a58 100644 --- a/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerTest.java +++ b/sdk/sql/mgmt/src/test/java/com/azure/management/sql/SqlServerTest.java @@ -9,7 +9,7 @@ import com.azure.management.resources.fluentcore.utils.SdkContext; import com.azure.management.resources.implementation.ResourceManager; import com.azure.management.sql.implementation.SqlServerManager; -import com.azure.management.storage.implementation.StorageManager; +import com.azure.management.storage.StorageManager; public abstract class SqlServerTest extends TestBase { protected ResourceManager resourceManager; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManagementClient.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManagementClient.java new file mode 100644 index 000000000000..deea31dd108f --- /dev/null +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManagementClient.java @@ -0,0 +1,340 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.management.storage; + +import com.azure.core.annotation.ServiceClient; +import com.azure.core.http.HttpPipeline; +import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.CookiePolicy; +import com.azure.core.http.policy.RetryPolicy; +import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.management.AzureEnvironment; +import com.azure.core.util.logging.ClientLogger; +import com.azure.management.AzureServiceClient; +import com.azure.management.storage.fluent.BlobContainersClient; +import com.azure.management.storage.fluent.BlobServicesClient; +import com.azure.management.storage.fluent.EncryptionScopesClient; +import com.azure.management.storage.fluent.FileServicesClient; +import com.azure.management.storage.fluent.FileSharesClient; +import com.azure.management.storage.fluent.ManagementPoliciesClient; +import com.azure.management.storage.fluent.ObjectReplicationPoliciesOperationsClient; +import com.azure.management.storage.fluent.OperationsClient; +import com.azure.management.storage.fluent.PrivateEndpointConnectionsClient; +import com.azure.management.storage.fluent.PrivateLinkResourcesClient; +import com.azure.management.storage.fluent.QueueServicesClient; +import com.azure.management.storage.fluent.QueuesClient; +import com.azure.management.storage.fluent.SkusClient; +import com.azure.management.storage.fluent.StorageAccountsClient; +import com.azure.management.storage.fluent.TableServicesClient; +import com.azure.management.storage.fluent.TablesClient; +import com.azure.management.storage.fluent.UsagesClient; + +/** Initializes a new instance of the StorageManagementClient type. */ +@ServiceClient(builder = StorageManagementClientBuilder.class) +public final class StorageManagementClient extends AzureServiceClient { + private final ClientLogger logger = new ClientLogger(StorageManagementClient.class); + + /** The ID of the target subscription. */ + private final String subscriptionId; + + /** + * Gets The ID of the target subscription. + * + * @return the subscriptionId value. + */ + public String getSubscriptionId() { + return this.subscriptionId; + } + + /** server parameter. */ + private final String endpoint; + + /** + * Gets server parameter. + * + * @return the endpoint value. + */ + public String getEndpoint() { + return this.endpoint; + } + + /** Api Version. */ + private final String apiVersion; + + /** + * Gets Api Version. + * + * @return the apiVersion value. + */ + public String getApiVersion() { + return this.apiVersion; + } + + /** The HTTP pipeline to send requests through. */ + private final HttpPipeline httpPipeline; + + /** + * Gets The HTTP pipeline to send requests through. + * + * @return the httpPipeline value. + */ + public HttpPipeline getHttpPipeline() { + return this.httpPipeline; + } + + /** The OperationsClient object to access its operations. */ + private final OperationsClient operations; + + /** + * Gets the OperationsClient object to access its operations. + * + * @return the OperationsClient object. + */ + public OperationsClient getOperations() { + return this.operations; + } + + /** The SkusClient object to access its operations. */ + private final SkusClient skus; + + /** + * Gets the SkusClient object to access its operations. + * + * @return the SkusClient object. + */ + public SkusClient getSkus() { + return this.skus; + } + + /** The StorageAccountsClient object to access its operations. */ + private final StorageAccountsClient storageAccounts; + + /** + * Gets the StorageAccountsClient object to access its operations. + * + * @return the StorageAccountsClient object. + */ + public StorageAccountsClient getStorageAccounts() { + return this.storageAccounts; + } + + /** The UsagesClient object to access its operations. */ + private final UsagesClient usages; + + /** + * Gets the UsagesClient object to access its operations. + * + * @return the UsagesClient object. + */ + public UsagesClient getUsages() { + return this.usages; + } + + /** The ManagementPoliciesClient object to access its operations. */ + private final ManagementPoliciesClient managementPolicies; + + /** + * Gets the ManagementPoliciesClient object to access its operations. + * + * @return the ManagementPoliciesClient object. + */ + public ManagementPoliciesClient getManagementPolicies() { + return this.managementPolicies; + } + + /** The PrivateEndpointConnectionsClient object to access its operations. */ + private final PrivateEndpointConnectionsClient privateEndpointConnections; + + /** + * Gets the PrivateEndpointConnectionsClient object to access its operations. + * + * @return the PrivateEndpointConnectionsClient object. + */ + public PrivateEndpointConnectionsClient getPrivateEndpointConnections() { + return this.privateEndpointConnections; + } + + /** The PrivateLinkResourcesClient object to access its operations. */ + private final PrivateLinkResourcesClient privateLinkResources; + + /** + * Gets the PrivateLinkResourcesClient object to access its operations. + * + * @return the PrivateLinkResourcesClient object. + */ + public PrivateLinkResourcesClient getPrivateLinkResources() { + return this.privateLinkResources; + } + + /** The ObjectReplicationPoliciesOperationsClient object to access its operations. */ + private final ObjectReplicationPoliciesOperationsClient objectReplicationPoliciesOperations; + + /** + * Gets the ObjectReplicationPoliciesOperationsClient object to access its operations. + * + * @return the ObjectReplicationPoliciesOperationsClient object. + */ + public ObjectReplicationPoliciesOperationsClient getObjectReplicationPoliciesOperations() { + return this.objectReplicationPoliciesOperations; + } + + /** The EncryptionScopesClient object to access its operations. */ + private final EncryptionScopesClient encryptionScopes; + + /** + * Gets the EncryptionScopesClient object to access its operations. + * + * @return the EncryptionScopesClient object. + */ + public EncryptionScopesClient getEncryptionScopes() { + return this.encryptionScopes; + } + + /** The BlobServicesClient object to access its operations. */ + private final BlobServicesClient blobServices; + + /** + * Gets the BlobServicesClient object to access its operations. + * + * @return the BlobServicesClient object. + */ + public BlobServicesClient getBlobServices() { + return this.blobServices; + } + + /** The BlobContainersClient object to access its operations. */ + private final BlobContainersClient blobContainers; + + /** + * Gets the BlobContainersClient object to access its operations. + * + * @return the BlobContainersClient object. + */ + public BlobContainersClient getBlobContainers() { + return this.blobContainers; + } + + /** The FileServicesClient object to access its operations. */ + private final FileServicesClient fileServices; + + /** + * Gets the FileServicesClient object to access its operations. + * + * @return the FileServicesClient object. + */ + public FileServicesClient getFileServices() { + return this.fileServices; + } + + /** The FileSharesClient object to access its operations. */ + private final FileSharesClient fileShares; + + /** + * Gets the FileSharesClient object to access its operations. + * + * @return the FileSharesClient object. + */ + public FileSharesClient getFileShares() { + return this.fileShares; + } + + /** The QueueServicesClient object to access its operations. */ + private final QueueServicesClient queueServices; + + /** + * Gets the QueueServicesClient object to access its operations. + * + * @return the QueueServicesClient object. + */ + public QueueServicesClient getQueueServices() { + return this.queueServices; + } + + /** The QueuesClient object to access its operations. */ + private final QueuesClient queues; + + /** + * Gets the QueuesClient object to access its operations. + * + * @return the QueuesClient object. + */ + public QueuesClient getQueues() { + return this.queues; + } + + /** The TableServicesClient object to access its operations. */ + private final TableServicesClient tableServices; + + /** + * Gets the TableServicesClient object to access its operations. + * + * @return the TableServicesClient object. + */ + public TableServicesClient getTableServices() { + return this.tableServices; + } + + /** The TablesClient object to access its operations. */ + private final TablesClient tables; + + /** + * Gets the TablesClient object to access its operations. + * + * @return the TablesClient object. + */ + public TablesClient getTables() { + return this.tables; + } + + /** Initializes an instance of StorageManagementClient client. */ + StorageManagementClient(String subscriptionId, String endpoint) { + this( + new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()).build(), + AzureEnvironment.AZURE, + subscriptionId, + endpoint); + } + + /** + * Initializes an instance of StorageManagementClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + */ + StorageManagementClient(HttpPipeline httpPipeline, String subscriptionId, String endpoint) { + this(httpPipeline, AzureEnvironment.AZURE, subscriptionId, endpoint); + } + + /** + * Initializes an instance of StorageManagementClient client. + * + * @param httpPipeline The HTTP pipeline to send requests through. + * @param environment The Azure environment. + */ + StorageManagementClient( + HttpPipeline httpPipeline, AzureEnvironment environment, String subscriptionId, String endpoint) { + super(httpPipeline, environment); + this.httpPipeline = httpPipeline; + this.subscriptionId = subscriptionId; + this.endpoint = endpoint; + this.apiVersion = "2019-06-01"; + this.operations = new OperationsClient(this); + this.skus = new SkusClient(this); + this.storageAccounts = new StorageAccountsClient(this); + this.usages = new UsagesClient(this); + this.managementPolicies = new ManagementPoliciesClient(this); + this.privateEndpointConnections = new PrivateEndpointConnectionsClient(this); + this.privateLinkResources = new PrivateLinkResourcesClient(this); + this.objectReplicationPoliciesOperations = new ObjectReplicationPoliciesOperationsClient(this); + this.encryptionScopes = new EncryptionScopesClient(this); + this.blobServices = new BlobServicesClient(this); + this.blobContainers = new BlobContainersClient(this); + this.fileServices = new FileServicesClient(this); + this.fileShares = new FileSharesClient(this); + this.queueServices = new QueueServicesClient(this); + this.queues = new QueuesClient(this); + this.tableServices = new TableServicesClient(this); + this.tables = new TablesClient(this); + } +} diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageManagementClientBuilder.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManagementClientBuilder.java similarity index 66% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageManagementClientBuilder.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManagementClientBuilder.java index 77bdba28d936..598b1c0ae314 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageManagementClientBuilder.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManagementClientBuilder.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.http.HttpPipeline; @@ -12,8 +12,8 @@ import com.azure.core.http.policy.UserAgentPolicy; import com.azure.core.management.AzureEnvironment; -/** A builder for creating a new instance of the StorageManagementClientImpl type. */ -@ServiceClientBuilder(serviceClients = {StorageManagementClientImpl.class}) +/** A builder for creating a new instance of the StorageManagementClient type. */ +@ServiceClientBuilder(serviceClients = {StorageManagementClient.class}) public final class StorageManagementClientBuilder { /* * The ID of the target subscription. @@ -34,32 +34,16 @@ public StorageManagementClientBuilder subscriptionId(String subscriptionId) { /* * server parameter */ - private String host; + private String endpoint; /** * Sets server parameter. * - * @param host the host value. + * @param endpoint the endpoint value. * @return the StorageManagementClientBuilder. */ - public StorageManagementClientBuilder host(String host) { - this.host = host; - return this; - } - - /* - * Api Version - */ - private String apiVersion; - - /** - * Sets Api Version. - * - * @param apiVersion the apiVersion value. - * @return the StorageManagementClientBuilder. - */ - public StorageManagementClientBuilder apiVersion(String apiVersion) { - this.apiVersion = apiVersion; + public StorageManagementClientBuilder endpoint(String endpoint) { + this.endpoint = endpoint; return this; } @@ -96,16 +80,13 @@ public StorageManagementClientBuilder pipeline(HttpPipeline pipeline) { } /** - * Builds an instance of StorageManagementClientImpl with the provided parameters. + * Builds an instance of StorageManagementClient with the provided parameters. * - * @return an instance of StorageManagementClientImpl. + * @return an instance of StorageManagementClient. */ - public StorageManagementClientImpl buildClient() { - if (host == null) { - this.host = "https://management.azure.com"; - } - if (apiVersion == null) { - this.apiVersion = "2019-06-01"; + public StorageManagementClient buildClient() { + if (endpoint == null) { + this.endpoint = "https://management.azure.com"; } if (environment == null) { this.environment = AzureEnvironment.AZURE; @@ -116,10 +97,7 @@ public StorageManagementClientImpl buildClient() { .policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()) .build(); } - StorageManagementClientImpl client = new StorageManagementClientImpl(pipeline, environment); - client.setSubscriptionId(this.subscriptionId); - client.setHost(this.host); - client.setApiVersion(this.apiVersion); + StorageManagementClient client = new StorageManagementClient(pipeline, environment, subscriptionId, endpoint); return client; } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageManager.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManager.java similarity index 85% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageManager.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManager.java index 9ccf2f0e27a6..a0b8843e3467 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageManager.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageManager.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage.implementation; +package com.azure.management.storage; import com.azure.core.credential.TokenCredential; import com.azure.core.http.HttpPipeline; @@ -11,17 +11,21 @@ import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.fluentcore.utils.HttpPipelineProvider; import com.azure.management.resources.fluentcore.utils.SdkContext; -import com.azure.management.storage.BlobContainers; -import com.azure.management.storage.BlobServices; -import com.azure.management.storage.ManagementPolicies; -import com.azure.management.storage.StorageAccounts; -import com.azure.management.storage.StorageSkus; -import com.azure.management.storage.Usages; -import com.azure.management.storage.models.StorageManagementClientBuilder; -import com.azure.management.storage.models.StorageManagementClientImpl; +import com.azure.management.storage.implementation.BlobContainersImpl; +import com.azure.management.storage.implementation.BlobServicesImpl; +import com.azure.management.storage.implementation.ManagementPoliciesImpl; +import com.azure.management.storage.implementation.StorageAccountsImpl; +import com.azure.management.storage.implementation.StorageSkusImpl; +import com.azure.management.storage.implementation.UsagesImpl; +import com.azure.management.storage.models.BlobContainers; +import com.azure.management.storage.models.BlobServices; +import com.azure.management.storage.models.ManagementPolicies; +import com.azure.management.storage.models.StorageAccounts; +import com.azure.management.storage.models.StorageSkus; +import com.azure.management.storage.models.Usages; /** Entry point to Azure storage resource management. */ -public final class StorageManager extends Manager { +public final class StorageManager extends Manager { // Collections private StorageAccounts storageAccounts; private Usages storageUsages; @@ -98,7 +102,7 @@ private StorageManager(HttpPipeline httpPipeline, AzureProfile profile, SdkConte profile, new StorageManagementClientBuilder() .pipeline(httpPipeline) - .host(profile.environment().getResourceManagerEndpoint()) + .endpoint(profile.environment().getResourceManagerEndpoint()) .subscriptionId(profile.subscriptionId()) .buildClient(), sdkContext); diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/BlobContainersClient.java similarity index 71% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/BlobContainersClient.java index f719dd88efac..20db21a12914 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/BlobContainersClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.Delete; @@ -27,31 +27,43 @@ import com.azure.core.http.rest.PagedResponseBase; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.LeaseContainerRequest; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.BlobContainerInner; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; +import com.azure.management.storage.fluent.inner.LeaseContainerResponseInner; +import com.azure.management.storage.fluent.inner.LegalHoldInner; +import com.azure.management.storage.fluent.inner.ListContainerItemInner; +import com.azure.management.storage.fluent.inner.ListContainerItemsInner; +import com.azure.management.storage.models.BlobContainersCreateOrUpdateImmutabilityPolicyResponse; +import com.azure.management.storage.models.BlobContainersDeleteImmutabilityPolicyResponse; +import com.azure.management.storage.models.BlobContainersExtendImmutabilityPolicyResponse; +import com.azure.management.storage.models.BlobContainersGetImmutabilityPolicyResponse; +import com.azure.management.storage.models.BlobContainersLockImmutabilityPolicyResponse; +import com.azure.management.storage.models.LeaseContainerRequest; +import com.azure.management.storage.models.ListSharesExpand; import java.util.List; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in BlobContainers. */ -public final class BlobContainersInner { - private final ClientLogger logger = new ClientLogger(BlobContainersInner.class); +public final class BlobContainersClient { + private final ClientLogger logger = new ClientLogger(BlobContainersClient.class); /** The proxy service used to perform REST calls. */ private final BlobContainersService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of BlobContainersInner. + * Initializes an instance of BlobContainersClient. * * @param client the instance of the service client containing this operation class. */ - BlobContainersInner(StorageManagementClientImpl client) { + public BlobContainersClient(StorageManagementClient client) { this.service = RestProxy.create(BlobContainersService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -70,14 +82,15 @@ private interface BlobContainersService { + "/storageAccounts/{accountName}/blobServices/default/containers") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, @QueryParam("$maxpagesize") String maxpagesize, @QueryParam("$filter") String filter, + @QueryParam("$include") ListSharesExpand include, Context context); @Headers({"Accept: application/json", "Content-Type: application/json"}) @@ -86,8 +99,8 @@ Mono> list( + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> create( - @HostParam("$host") String host, + Mono> create( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -102,8 +115,8 @@ Mono> create( + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> update( - @HostParam("$host") String host, + Mono> update( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -118,8 +131,8 @@ Mono> update( + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -134,7 +147,7 @@ Mono> get( @ExpectedResponses({200, 204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -148,8 +161,8 @@ Mono> delete( + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/setLegalHold") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> setLegalHold( - @HostParam("$host") String host, + Mono> setLegalHold( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -164,8 +177,8 @@ Mono> setLegalHold( + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/clearLegalHold") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> clearLegalHold( - @HostParam("$host") String host, + Mono> clearLegalHold( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -177,12 +190,12 @@ Mono> clearLegalHold( @Headers({"Accept: application/json", "Content-Type: application/json"}) @Put( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage" - + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}" - + "/immutabilityPolicies/{immutabilityPolicyName}") + + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies" + + "/{immutabilityPolicyName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) Mono createOrUpdateImmutabilityPolicy( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -196,12 +209,12 @@ Mono createOrUpdateImmut @Headers({"Accept: application/json", "Content-Type: application/json"}) @Get( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage" - + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}" - + "/immutabilityPolicies/{immutabilityPolicyName}") + + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies" + + "/{immutabilityPolicyName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) Mono getImmutabilityPolicy( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -214,12 +227,12 @@ Mono getImmutabilityPolicy( @Headers({"Accept: application/json", "Content-Type: application/json"}) @Delete( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage" - + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}" - + "/immutabilityPolicies/{immutabilityPolicyName}") + + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies" + + "/{immutabilityPolicyName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) Mono deleteImmutabilityPolicy( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -232,12 +245,12 @@ Mono deleteImmutabilityPolicy( @Headers({"Accept: application/json", "Content-Type: application/json"}) @Post( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage" - + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}" - + "/immutabilityPolicies/default/lock") + + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies" + + "/default/lock") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) Mono lockImmutabilityPolicy( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -249,12 +262,12 @@ Mono lockImmutabilityPolicy( @Headers({"Accept: application/json", "Content-Type: application/json"}) @Post( "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage" - + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}" - + "/immutabilityPolicies/default/extend") + + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies" + + "/default/extend") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) Mono extendImmutabilityPolicy( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -270,8 +283,8 @@ Mono extendImmutabilityPolicy( + "/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/lease") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> lease( - @HostParam("$host") String host, + Mono> lease( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("containerName") String containerName, @@ -284,7 +297,7 @@ Mono> lease( @Get("{nextLink}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listNext( + Mono> listNext( @PathParam(value = "nextLink", encoded = true) String nextLink, Context context); } @@ -298,6 +311,7 @@ Mono> listNext( * must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param maxpagesize Optional. Specified maximum number of containers that can be included in the list. * @param filter Optional. When specified, only container names starting with the filter will be listed. + * @param include Optional, used to include the properties for soft deleted blob containers. * @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. @@ -305,10 +319,12 @@ Mono> listNext( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( - String resourceGroupName, String accountName, String maxpagesize, String filter) { - if (this.client.getHost() == null) { + String resourceGroupName, String accountName, String maxpagesize, String filter, ListSharesExpand include) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -328,13 +344,14 @@ public Mono> listSinglePageAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), this.client.getSubscriptionId(), maxpagesize, filter, + include, context)) .>map( res -> @@ -358,6 +375,7 @@ public Mono> listSinglePageAsync( * must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param maxpagesize Optional. Specified maximum number of containers that can be included in the list. * @param filter Optional. When specified, only container names starting with the filter will be listed. + * @param include Optional, used to include the properties for soft deleted blob containers. * @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. @@ -366,10 +384,17 @@ public Mono> listSinglePageAsync( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( - String resourceGroupName, String accountName, String maxpagesize, String filter, Context context) { - if (this.client.getHost() == null) { + String resourceGroupName, + String accountName, + String maxpagesize, + String filter, + ListSharesExpand include, + Context context) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -386,13 +411,14 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), this.client.getSubscriptionId(), maxpagesize, filter, + include, context) .map( res -> @@ -415,6 +441,7 @@ public Mono> listSinglePageAsync( * must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param maxpagesize Optional. Specified maximum number of containers that can be included in the list. * @param filter Optional. When specified, only container names starting with the filter will be listed. + * @param include Optional, used to include the properties for soft deleted blob containers. * @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. @@ -422,9 +449,9 @@ public Mono> listSinglePageAsync( */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listAsync( - String resourceGroupName, String accountName, String maxpagesize, String filter) { + String resourceGroupName, String accountName, String maxpagesize, String filter, ListSharesExpand include) { return new PagedFlux<>( - () -> listSinglePageAsync(resourceGroupName, accountName, maxpagesize, filter), + () -> listSinglePageAsync(resourceGroupName, accountName, maxpagesize, filter, include), nextLink -> listNextSinglePageAsync(nextLink)); } @@ -438,6 +465,7 @@ public PagedFlux listAsync( * must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param maxpagesize Optional. Specified maximum number of containers that can be included in the list. * @param filter Optional. When specified, only container names starting with the filter will be listed. + * @param include Optional, used to include the properties for soft deleted blob containers. * @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. @@ -446,9 +474,14 @@ public PagedFlux listAsync( */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listAsync( - String resourceGroupName, String accountName, String maxpagesize, String filter, Context context) { + String resourceGroupName, + String accountName, + String maxpagesize, + String filter, + ListSharesExpand include, + Context context) { return new PagedFlux<>( - () -> listSinglePageAsync(resourceGroupName, accountName, maxpagesize, filter, context), + () -> listSinglePageAsync(resourceGroupName, accountName, maxpagesize, filter, include, context), nextLink -> listNextSinglePageAsync(nextLink)); } @@ -469,9 +502,10 @@ public PagedFlux listAsync( public PagedFlux listAsync(String resourceGroupName, String accountName) { final String maxpagesize = null; final String filter = null; + final ListSharesExpand include = null; final Context context = null; return new PagedFlux<>( - () -> listSinglePageAsync(resourceGroupName, accountName, maxpagesize, filter), + () -> listSinglePageAsync(resourceGroupName, accountName, maxpagesize, filter, include), nextLink -> listNextSinglePageAsync(nextLink)); } @@ -485,6 +519,30 @@ public PagedFlux listAsync(String resourceGroupName, Str * must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param maxpagesize Optional. Specified maximum number of containers that can be included in the list. * @param filter Optional. When specified, only container names starting with the filter will be listed. + * @param include Optional, used to include the properties for soft deleted blob containers. + * @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 response schema. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, String accountName, String maxpagesize, String filter, ListSharesExpand include) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter, include)); + } + + /** + * Lists all containers and does not support a prefix like data plane. Also SRP today does not return continuation + * token. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param maxpagesize Optional. Specified maximum number of containers that can be included in the list. + * @param filter Optional. When specified, only container names starting with the filter will be listed. + * @param include Optional, used to include the properties for soft deleted blob containers. + * @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. @@ -492,8 +550,13 @@ public PagedFlux listAsync(String resourceGroupName, Str */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable list( - String resourceGroupName, String accountName, String maxpagesize, String filter) { - return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter)); + String resourceGroupName, + String accountName, + String maxpagesize, + String filter, + ListSharesExpand include, + Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter, include, context)); } /** @@ -513,8 +576,9 @@ public PagedIterable list( public PagedIterable list(String resourceGroupName, String accountName) { final String maxpagesize = null; final String filter = null; + final ListSharesExpand include = null; final Context context = null; - return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter)); + return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter, include)); } /** @@ -535,11 +599,13 @@ public PagedIterable list(String resourceGroupName, Stri * @return properties of the blob container, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String containerName, BlobContainerInner blobContainer) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -567,7 +633,7 @@ public Mono> createWithResponseAsync( context -> service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -597,15 +663,17 @@ public Mono> createWithResponseAsync( * @return properties of the blob container, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String containerName, BlobContainerInner blobContainer, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -630,7 +698,7 @@ public Mono> createWithResponseAsync( } return service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -662,7 +730,43 @@ public Mono createAsync( String resourceGroupName, String accountName, String containerName, BlobContainerInner blobContainer) { return createWithResponseAsync(resourceGroupName, accountName, containerName, blobContainer) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Creates a new container under the specified account as described by request body. The container resource includes + * metadata and properties for that container. It does not include a list of the blobs contained by the container. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param blobContainer Properties of the blob container, including Id, resource name, resource type, Etag. + * @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 properties of the blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createAsync( + String resourceGroupName, + String accountName, + String containerName, + BlobContainerInner blobContainer, + Context context) { + return createWithResponseAsync(resourceGroupName, accountName, containerName, blobContainer, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -694,6 +798,34 @@ public BlobContainerInner create( return createAsync(resourceGroupName, accountName, containerName, blobContainer).block(); } + /** + * Creates a new container under the specified account as described by request body. The container resource includes + * metadata and properties for that container. It does not include a list of the blobs contained by the container. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param blobContainer Properties of the blob container, including Id, resource name, resource type, Etag. + * @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 properties of the blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobContainerInner create( + String resourceGroupName, + String accountName, + String containerName, + BlobContainerInner blobContainer, + Context context) { + return createAsync(resourceGroupName, accountName, containerName, blobContainer, context).block(); + } + /** * Updates container properties as specified in request body. Properties not mentioned in the request will be * unchanged. Update fails if the specified container doesn't already exist. @@ -712,11 +844,13 @@ public BlobContainerInner create( * @return properties of the blob container, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String containerName, BlobContainerInner blobContainer) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -744,7 +878,7 @@ public Mono> updateWithResponseAsync( context -> service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -774,15 +908,17 @@ public Mono> updateWithResponseAsync( * @return properties of the blob container, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String containerName, BlobContainerInner blobContainer, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -807,7 +943,7 @@ public Mono> updateWithResponseAsync( } return service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -839,7 +975,43 @@ public Mono updateAsync( String resourceGroupName, String accountName, String containerName, BlobContainerInner blobContainer) { return updateWithResponseAsync(resourceGroupName, accountName, containerName, blobContainer) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Updates container properties as specified in request body. Properties not mentioned in the request will be + * unchanged. Update fails if the specified container doesn't already exist. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param blobContainer Properties of the blob container, including Id, resource name, resource type, Etag. + * @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 properties of the blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono updateAsync( + String resourceGroupName, + String accountName, + String containerName, + BlobContainerInner blobContainer, + Context context) { + return updateWithResponseAsync(resourceGroupName, accountName, containerName, blobContainer, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -871,6 +1043,34 @@ public BlobContainerInner update( return updateAsync(resourceGroupName, accountName, containerName, blobContainer).block(); } + /** + * Updates container properties as specified in request body. Properties not mentioned in the request will be + * unchanged. Update fails if the specified container doesn't already exist. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param blobContainer Properties of the blob container, including Id, resource name, resource type, Etag. + * @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 properties of the blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobContainerInner update( + String resourceGroupName, + String accountName, + String containerName, + BlobContainerInner blobContainer, + Context context) { + return updateAsync(resourceGroupName, accountName, containerName, blobContainer, context).block(); + } + /** * Gets properties of a specified container. * @@ -887,11 +1087,13 @@ public BlobContainerInner update( * @return properties of a specified container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String containerName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -914,7 +1116,7 @@ public Mono> getWithResponseAsync( context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -941,11 +1143,13 @@ public Mono> getWithResponseAsync( * @return properties of a specified container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String containerName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -965,7 +1169,7 @@ public Mono> getWithResponseAsync( } return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -993,7 +1197,37 @@ public Mono> getWithResponseAsync( public Mono getAsync(String resourceGroupName, String accountName, String containerName) { return getWithResponseAsync(resourceGroupName, accountName, containerName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets properties of a specified container. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @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 properties of a specified container. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync( + String resourceGroupName, String accountName, String containerName, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, containerName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1022,6 +1256,27 @@ public BlobContainerInner get(String resourceGroupName, String accountName, Stri return getAsync(resourceGroupName, accountName, containerName).block(); } + /** + * Gets properties of a specified container. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @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 properties of a specified container. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobContainerInner get(String resourceGroupName, String accountName, String containerName, Context context) { + return getAsync(resourceGroupName, accountName, containerName, context).block(); + } + /** * Deletes specified container under its account. * @@ -1040,9 +1295,11 @@ public BlobContainerInner get(String resourceGroupName, String accountName, Stri @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String containerName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1065,7 +1322,7 @@ public Mono> deleteWithResponseAsync( context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1094,9 +1351,11 @@ public Mono> deleteWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String containerName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1116,7 +1375,7 @@ public Mono> deleteWithResponseAsync( } return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1146,6 +1405,28 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri .flatMap((Response res) -> Mono.empty()); } + /** + * Deletes specified container under its account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync(String resourceGroupName, String accountName, String containerName, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, containerName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes specified container under its account. * @@ -1165,6 +1446,26 @@ public void delete(String resourceGroupName, String accountName, String containe deleteAsync(resourceGroupName, accountName, containerName).block(); } + /** + * Deletes specified container under its account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete(String resourceGroupName, String accountName, String containerName, Context context) { + deleteAsync(resourceGroupName, accountName, containerName, context).block(); + } + /** * Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold follows an append * pattern and does not clear out the existing tags that are not specified in the request. @@ -1183,12 +1484,14 @@ public void delete(String resourceGroupName, String accountName, String containe * @return the LegalHold property of a blob container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setLegalHoldWithResponseAsync( + public Mono> setLegalHoldWithResponseAsync( String resourceGroupName, String accountName, String containerName, List tags) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); - } + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } if (resourceGroupName == null) { return Mono .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.")); @@ -1215,7 +1518,7 @@ public Mono> setLegalHoldWithResponseAsync( context -> service .setLegalHold( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1245,11 +1548,13 @@ public Mono> setLegalHoldWithResponseAsync( * @return the LegalHold property of a blob container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setLegalHoldWithResponseAsync( + public Mono> setLegalHoldWithResponseAsync( String resourceGroupName, String accountName, String containerName, List tags, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1274,7 +1579,7 @@ public Mono> setLegalHoldWithResponseAsync( legalHold.withTags(tags); return service .setLegalHold( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1306,7 +1611,39 @@ public Mono setLegalHoldAsync( String resourceGroupName, String accountName, String containerName, List tags) { return setLegalHoldWithResponseAsync(resourceGroupName, accountName, containerName, tags) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold follows an append + * pattern and does not clear out the existing tags that are not specified in the request. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param tags Each tag should be 3 to 23 alphanumeric characters and is normalized to lower case at SRP. + * @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 LegalHold property of a blob container. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono setLegalHoldAsync( + String resourceGroupName, String accountName, String containerName, List tags, Context context) { + return setLegalHoldWithResponseAsync(resourceGroupName, accountName, containerName, tags, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1338,6 +1675,30 @@ public LegalHoldInner setLegalHold( return setLegalHoldAsync(resourceGroupName, accountName, containerName, tags).block(); } + /** + * Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold follows an append + * pattern and does not clear out the existing tags that are not specified in the request. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param tags Each tag should be 3 to 23 alphanumeric characters and is normalized to lower case at SRP. + * @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 LegalHold property of a blob container. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public LegalHoldInner setLegalHold( + String resourceGroupName, String accountName, String containerName, List tags, Context context) { + return setLegalHoldAsync(resourceGroupName, accountName, containerName, tags, context).block(); + } + /** * Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent operation. ClearLegalHold * clears out only the specified tags in the request. @@ -1356,11 +1717,13 @@ public LegalHoldInner setLegalHold( * @return the LegalHold property of a blob container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> clearLegalHoldWithResponseAsync( + public Mono> clearLegalHoldWithResponseAsync( String resourceGroupName, String accountName, String containerName, List tags) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1388,7 +1751,7 @@ public Mono> clearLegalHoldWithResponseAsync( context -> service .clearLegalHold( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1418,11 +1781,13 @@ public Mono> clearLegalHoldWithResponseAsync( * @return the LegalHold property of a blob container. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> clearLegalHoldWithResponseAsync( + public Mono> clearLegalHoldWithResponseAsync( String resourceGroupName, String accountName, String containerName, List tags, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1447,7 +1812,7 @@ public Mono> clearLegalHoldWithResponseAsync( legalHold.withTags(tags); return service .clearLegalHold( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1479,7 +1844,39 @@ public Mono clearLegalHoldAsync( String resourceGroupName, String accountName, String containerName, List tags) { return clearLegalHoldWithResponseAsync(resourceGroupName, accountName, containerName, tags) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent operation. ClearLegalHold + * clears out only the specified tags in the request. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param tags Each tag should be 3 to 23 alphanumeric characters and is normalized to lower case at SRP. + * @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 LegalHold property of a blob container. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono clearLegalHoldAsync( + String resourceGroupName, String accountName, String containerName, List tags, Context context) { + return clearLegalHoldWithResponseAsync(resourceGroupName, accountName, containerName, tags, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1511,6 +1908,30 @@ public LegalHoldInner clearLegalHold( return clearLegalHoldAsync(resourceGroupName, accountName, containerName, tags).block(); } + /** + * Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent operation. ClearLegalHold + * clears out only the specified tags in the request. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param tags Each tag should be 3 to 23 alphanumeric characters and is normalized to lower case at SRP. + * @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 LegalHold property of a blob container. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public LegalHoldInner clearLegalHold( + String resourceGroupName, String accountName, String containerName, List tags, Context context) { + return clearLegalHoldAsync(resourceGroupName, accountName, containerName, tags, context).block(); + } + /** * Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but not required for * this operation. @@ -1545,9 +1966,11 @@ public LegalHoldInner clearLegalHold( String ifMatch, Integer immutabilityPeriodSinceCreationInDays, Boolean allowProtectedAppendWrites) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1578,7 +2001,7 @@ public LegalHoldInner clearLegalHold( context -> service .createOrUpdateImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1627,9 +2050,11 @@ public LegalHoldInner clearLegalHold( Integer immutabilityPeriodSinceCreationInDays, Boolean allowProtectedAppendWrites, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1657,7 +2082,7 @@ public LegalHoldInner clearLegalHold( ImmutabilityPolicyInner parameters = parametersInternal; return service .createOrUpdateImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1719,6 +2144,59 @@ public Mono createOrUpdateImmutabilityPolicyAsync( }); } + /** + * Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but not required for + * this operation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @param immutabilityPeriodSinceCreationInDays The immutability period for the blobs in the container since the + * policy creation, in days. + * @param allowProtectedAppendWrites This property can only be changed for unlocked time-based retention policies. + * When enabled, new blocks can be written to an append blob while maintaining immutability protection and + * compliance. Only new blocks can be added and any existing blocks cannot be modified or deleted. This property + * cannot be changed with ExtendImmutabilityPolicy API. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createOrUpdateImmutabilityPolicyAsync( + String resourceGroupName, + String accountName, + String containerName, + String ifMatch, + Integer immutabilityPeriodSinceCreationInDays, + Boolean allowProtectedAppendWrites, + Context context) { + return createOrUpdateImmutabilityPolicyWithResponseAsync( + resourceGroupName, + accountName, + containerName, + ifMatch, + immutabilityPeriodSinceCreationInDays, + allowProtectedAppendWrites, + context) + .flatMap( + (BlobContainersCreateOrUpdateImmutabilityPolicyResponse res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + /** * Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but not required for * this operation. @@ -1762,6 +2240,52 @@ public ImmutabilityPolicyInner createOrUpdateImmutabilityPolicy( .block(); } + /** + * Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but not required for + * this operation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @param immutabilityPeriodSinceCreationInDays The immutability period for the blobs in the container since the + * policy creation, in days. + * @param allowProtectedAppendWrites This property can only be changed for unlocked time-based retention policies. + * When enabled, new blocks can be written to an append blob while maintaining immutability protection and + * compliance. Only new blocks can be added and any existing blocks cannot be modified or deleted. This property + * cannot be changed with ExtendImmutabilityPolicy API. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ImmutabilityPolicyInner createOrUpdateImmutabilityPolicy( + String resourceGroupName, + String accountName, + String containerName, + String ifMatch, + Integer immutabilityPeriodSinceCreationInDays, + Boolean allowProtectedAppendWrites, + Context context) { + return createOrUpdateImmutabilityPolicyAsync( + resourceGroupName, + accountName, + containerName, + ifMatch, + immutabilityPeriodSinceCreationInDays, + allowProtectedAppendWrites, + context) + .block(); + } + /** * Gets the existing immutability policy along with the corresponding ETag in response headers and body. * @@ -1783,9 +2307,11 @@ public ImmutabilityPolicyInner createOrUpdateImmutabilityPolicy( @ServiceMethod(returns = ReturnType.SINGLE) public Mono getImmutabilityPolicyWithResponseAsync( String resourceGroupName, String accountName, String containerName, String ifMatch) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1809,7 +2335,7 @@ public Mono getImmutabilityPolicyWi context -> service .getImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1843,9 +2369,11 @@ public Mono getImmutabilityPolicyWi @ServiceMethod(returns = ReturnType.SINGLE) public Mono getImmutabilityPolicyWithResponseAsync( String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1866,7 +2394,7 @@ public Mono getImmutabilityPolicyWi final String immutabilityPolicyName = "default"; return service .getImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -1909,6 +2437,39 @@ public Mono getImmutabilityPolicyAsync( }); } + /** + * Gets the existing immutability policy along with the corresponding ETag in response headers and body. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @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 existing immutability policy along with the corresponding ETag in response headers and body. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getImmutabilityPolicyAsync( + String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { + return getImmutabilityPolicyWithResponseAsync(resourceGroupName, accountName, containerName, ifMatch, context) + .flatMap( + (BlobContainersGetImmutabilityPolicyResponse res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + /** * Gets the existing immutability policy along with the corresponding ETag in response headers and body. * @@ -1964,6 +2525,31 @@ public ImmutabilityPolicyInner getImmutabilityPolicy( return getImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, ifMatch).block(); } + /** + * Gets the existing immutability policy along with the corresponding ETag in response headers and body. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @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 existing immutability policy along with the corresponding ETag in response headers and body. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ImmutabilityPolicyInner getImmutabilityPolicy( + String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { + return getImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, ifMatch, context).block(); + } + /** * Gets the existing immutability policy along with the corresponding ETag in response headers and body. * @@ -2010,9 +2596,11 @@ public ImmutabilityPolicyInner getImmutabilityPolicy( @ServiceMethod(returns = ReturnType.SINGLE) public Mono deleteImmutabilityPolicyWithResponseAsync( String resourceGroupName, String accountName, String containerName, String ifMatch) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2039,7 +2627,7 @@ public Mono deleteImmutabilityPo context -> service .deleteImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2075,9 +2663,11 @@ public Mono deleteImmutabilityPo @ServiceMethod(returns = ReturnType.SINGLE) public Mono deleteImmutabilityPolicyWithResponseAsync( String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2101,7 +2691,7 @@ public Mono deleteImmutabilityPo final String immutabilityPolicyName = "default"; return service .deleteImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2146,6 +2736,42 @@ public Mono deleteImmutabilityPolicyAsync( }); } + /** + * Aborts an unlocked immutability policy. The response of delete has immutabilityPeriodSinceCreationInDays set to + * 0. ETag in If-Match is required for this operation. Deleting a locked immutability policy is not allowed, only + * way is to delete the container after deleting all blobs inside the container. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteImmutabilityPolicyAsync( + String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { + return deleteImmutabilityPolicyWithResponseAsync( + resourceGroupName, accountName, containerName, ifMatch, context) + .flatMap( + (BlobContainersDeleteImmutabilityPolicyResponse res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + /** * Aborts an unlocked immutability policy. The response of delete has immutabilityPeriodSinceCreationInDays set to * 0. ETag in If-Match is required for this operation. Deleting a locked immutability policy is not allowed, only @@ -2172,6 +2798,33 @@ public ImmutabilityPolicyInner deleteImmutabilityPolicy( return deleteImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, ifMatch).block(); } + /** + * Aborts an unlocked immutability policy. The response of delete has immutabilityPeriodSinceCreationInDays set to + * 0. ETag in If-Match is required for this operation. Deleting a locked immutability policy is not allowed, only + * way is to delete the container after deleting all blobs inside the container. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ImmutabilityPolicyInner deleteImmutabilityPolicy( + String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { + return deleteImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, ifMatch, context).block(); + } + /** * Sets the ImmutabilityPolicy to Locked state. The only action allowed on a Locked policy is * ExtendImmutabilityPolicy action. ETag in If-Match is required for this operation. @@ -2194,9 +2847,11 @@ public ImmutabilityPolicyInner deleteImmutabilityPolicy( @ServiceMethod(returns = ReturnType.SINGLE) public Mono lockImmutabilityPolicyWithResponseAsync( String resourceGroupName, String accountName, String containerName, String ifMatch) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2222,7 +2877,7 @@ public Mono lockImmutabilityPolicy context -> service .lockImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2256,9 +2911,11 @@ public Mono lockImmutabilityPolicy @ServiceMethod(returns = ReturnType.SINGLE) public Mono lockImmutabilityPolicyWithResponseAsync( String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2281,7 +2938,7 @@ public Mono lockImmutabilityPolicy } return service .lockImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2324,6 +2981,40 @@ public Mono lockImmutabilityPolicyAsync( }); } + /** + * Sets the ImmutabilityPolicy to Locked state. The only action allowed on a Locked policy is + * ExtendImmutabilityPolicy action. ETag in If-Match is required for this operation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono lockImmutabilityPolicyAsync( + String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { + return lockImmutabilityPolicyWithResponseAsync(resourceGroupName, accountName, containerName, ifMatch, context) + .flatMap( + (BlobContainersLockImmutabilityPolicyResponse res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + /** * Sets the ImmutabilityPolicy to Locked state. The only action allowed on a Locked policy is * ExtendImmutabilityPolicy action. ETag in If-Match is required for this operation. @@ -2349,6 +3040,32 @@ public ImmutabilityPolicyInner lockImmutabilityPolicy( return lockImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, ifMatch).block(); } + /** + * Sets the ImmutabilityPolicy to Locked state. The only action allowed on a Locked policy is + * ExtendImmutabilityPolicy action. ETag in If-Match is required for this operation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ImmutabilityPolicyInner lockImmutabilityPolicy( + String resourceGroupName, String accountName, String containerName, String ifMatch, Context context) { + return lockImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, ifMatch, context).block(); + } + /** * Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only action allowed on a * Locked policy will be this action. ETag in If-Match is required for this operation. @@ -2382,9 +3099,11 @@ public Mono extendImmutabilityPo String ifMatch, Integer immutabilityPeriodSinceCreationInDays, Boolean allowProtectedAppendWrites) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2417,7 +3136,7 @@ public Mono extendImmutabilityPo context -> service .extendImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2464,9 +3183,11 @@ public Mono extendImmutabilityPo Integer immutabilityPeriodSinceCreationInDays, Boolean allowProtectedAppendWrites, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2496,7 +3217,7 @@ public Mono extendImmutabilityPo ImmutabilityPolicyInner parameters = parametersInternal; return service .extendImmutabilityPolicy( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2557,6 +3278,59 @@ public Mono extendImmutabilityPolicyAsync( }); } + /** + * Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only action allowed on a + * Locked policy will be this action. ETag in If-Match is required for this operation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @param immutabilityPeriodSinceCreationInDays The immutability period for the blobs in the container since the + * policy creation, in days. + * @param allowProtectedAppendWrites This property can only be changed for unlocked time-based retention policies. + * When enabled, new blocks can be written to an append blob while maintaining immutability protection and + * compliance. Only new blocks can be added and any existing blocks cannot be modified or deleted. This property + * cannot be changed with ExtendImmutabilityPolicy API. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono extendImmutabilityPolicyAsync( + String resourceGroupName, + String accountName, + String containerName, + String ifMatch, + Integer immutabilityPeriodSinceCreationInDays, + Boolean allowProtectedAppendWrites, + Context context) { + return extendImmutabilityPolicyWithResponseAsync( + resourceGroupName, + accountName, + containerName, + ifMatch, + immutabilityPeriodSinceCreationInDays, + allowProtectedAppendWrites, + context) + .flatMap( + (BlobContainersExtendImmutabilityPolicyResponse res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + /** * Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only action allowed on a * Locked policy will be this action. ETag in If-Match is required for this operation. @@ -2600,6 +3374,52 @@ public ImmutabilityPolicyInner extendImmutabilityPolicy( .block(); } + /** + * Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only action allowed on a + * Locked policy will be this action. ETag in If-Match is required for this operation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used + * to apply the operation only if the immutability policy already exists. If omitted, this operation will always + * be applied. + * @param immutabilityPeriodSinceCreationInDays The immutability period for the blobs in the container since the + * policy creation, in days. + * @param allowProtectedAppendWrites This property can only be changed for unlocked time-based retention policies. + * When enabled, new blocks can be written to an append blob while maintaining immutability protection and + * compliance. Only new blocks can be added and any existing blocks cannot be modified or deleted. This property + * cannot be changed with ExtendImmutabilityPolicy API. + * @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 ImmutabilityPolicy property of a blob container, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ImmutabilityPolicyInner extendImmutabilityPolicy( + String resourceGroupName, + String accountName, + String containerName, + String ifMatch, + Integer immutabilityPeriodSinceCreationInDays, + Boolean allowProtectedAppendWrites, + Context context) { + return extendImmutabilityPolicyAsync( + resourceGroupName, + accountName, + containerName, + ifMatch, + immutabilityPeriodSinceCreationInDays, + allowProtectedAppendWrites, + context) + .block(); + } + /** * The Lease Container operation establishes and manages a lock on a container for delete operations. The lock * duration can be 15 to 60 seconds, or can be infinite. @@ -2618,11 +3438,13 @@ public ImmutabilityPolicyInner extendImmutabilityPolicy( * @return lease Container response schema. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> leaseWithResponseAsync( + public Mono> leaseWithResponseAsync( String resourceGroupName, String accountName, String containerName, LeaseContainerRequest parameters) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2648,7 +3470,7 @@ public Mono> leaseWithResponseAsync( context -> service .lease( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2678,15 +3500,17 @@ public Mono> leaseWithResponseAsync( * @return lease Container response schema. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> leaseWithResponseAsync( + public Mono> leaseWithResponseAsync( String resourceGroupName, String accountName, String containerName, LeaseContainerRequest parameters, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2709,7 +3533,7 @@ public Mono> leaseWithResponseAsync( } return service .lease( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, containerName, @@ -2741,7 +3565,43 @@ public Mono leaseAsync( String resourceGroupName, String accountName, String containerName, LeaseContainerRequest parameters) { return leaseWithResponseAsync(resourceGroupName, accountName, containerName, parameters) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * The Lease Container operation establishes and manages a lock on a container for delete operations. The lock + * duration can be 15 to 60 seconds, or can be infinite. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param parameters Lease Container request schema. + * @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 lease Container response schema. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono leaseAsync( + String resourceGroupName, + String accountName, + String containerName, + LeaseContainerRequest parameters, + Context context) { + return leaseWithResponseAsync(resourceGroupName, accountName, containerName, parameters, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -2773,7 +3633,7 @@ public Mono leaseAsync( final Context context = null; return leaseWithResponseAsync(resourceGroupName, accountName, containerName, parameters) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -2805,6 +3665,34 @@ public LeaseContainerResponseInner lease( return leaseAsync(resourceGroupName, accountName, containerName, parameters).block(); } + /** + * The Lease Container operation establishes and manages a lock on a container for delete operations. The lock + * duration can be 15 to 60 seconds, or can be infinite. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param containerName The name of the blob container within the specified storage account. Blob container names + * must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every + * dash (-) character must be immediately preceded and followed by a letter or number. + * @param parameters Lease Container request schema. + * @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 lease Container response schema. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public LeaseContainerResponseInner lease( + String resourceGroupName, + String accountName, + String containerName, + LeaseContainerRequest parameters, + Context context) { + return leaseAsync(resourceGroupName, accountName, containerName, parameters, context).block(); + } + /** * The Lease Container operation establishes and manages a lock on a container for delete operations. The lock * duration can be 15 to 60 seconds, or can be infinite. diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServicesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/BlobServicesClient.java similarity index 72% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServicesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/BlobServicesClient.java index 5af453bf6645..5a1545169b3f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServicesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/BlobServicesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -21,30 +21,33 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.PagedResponseBase; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.BlobServiceItemsInner; +import com.azure.management.storage.fluent.inner.BlobServicePropertiesInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in BlobServices. */ -public final class BlobServicesInner { - private final ClientLogger logger = new ClientLogger(BlobServicesInner.class); +public final class BlobServicesClient { + private final ClientLogger logger = new ClientLogger(BlobServicesClient.class); /** The proxy service used to perform REST calls. */ private final BlobServicesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of BlobServicesInner. + * Initializes an instance of BlobServicesClient. * * @param client the instance of the service client containing this operation class. */ - BlobServicesInner(StorageManagementClientImpl client) { + public BlobServicesClient(StorageManagementClient client) { this.service = RestProxy.create(BlobServicesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -63,8 +66,8 @@ private interface BlobServicesService { + "/storageAccounts/{accountName}/blobServices") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -77,8 +80,8 @@ Mono> list( + "/storageAccounts/{accountName}/blobServices/{BlobServicesName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> setServiceProperties( - @HostParam("$host") String host, + Mono> setServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -93,8 +96,8 @@ Mono> setServiceProperties( + "/storageAccounts/{accountName}/blobServices/{BlobServicesName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getServiceProperties( - @HostParam("$host") String host, + Mono> getServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -118,9 +121,11 @@ Mono> getServiceProperties( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -140,7 +145,7 @@ public Mono> listSinglePageAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -169,9 +174,11 @@ public Mono> listSinglePageAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -188,7 +195,7 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -253,6 +260,25 @@ public PagedIterable list(String resourceGroupName, return new PagedIterable<>(listAsync(resourceGroupName, accountName)); } + /** + * List blob services of storage account. It returns a collection of one object named default. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, String accountName, Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, context)); + } + /** * Sets the properties of a storage account’s Blob service, including properties for Storage Analytics and CORS * (Cross-Origin Resource Sharing) rules. @@ -268,11 +294,13 @@ public PagedIterable list(String resourceGroupName, * @return the properties of a storage account’s Blob service. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, BlobServicePropertiesInner parameters) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -298,7 +326,7 @@ public Mono> setServicePropertiesWith context -> service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -325,11 +353,13 @@ public Mono> setServicePropertiesWith * @return the properties of a storage account’s Blob service. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, BlobServicePropertiesInner parameters, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -352,7 +382,7 @@ public Mono> setServicePropertiesWith final String blobServicesName = "default"; return service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -381,7 +411,36 @@ public Mono setServicePropertiesAsync( String resourceGroupName, String accountName, BlobServicePropertiesInner parameters) { return setServicePropertiesWithResponseAsync(resourceGroupName, accountName, parameters) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Sets the properties of a storage account’s Blob service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The properties of a storage account’s Blob service. + * @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 properties of a storage account’s Blob service. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono setServicePropertiesAsync( + String resourceGroupName, String accountName, BlobServicePropertiesInner parameters, Context context) { + return setServicePropertiesWithResponseAsync(resourceGroupName, accountName, parameters, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -410,6 +469,27 @@ public BlobServicePropertiesInner setServiceProperties( return setServicePropertiesAsync(resourceGroupName, accountName, parameters).block(); } + /** + * Sets the properties of a storage account’s Blob service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The properties of a storage account’s Blob service. + * @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 properties of a storage account’s Blob service. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobServicePropertiesInner setServiceProperties( + String resourceGroupName, String accountName, BlobServicePropertiesInner parameters, Context context) { + return setServicePropertiesAsync(resourceGroupName, accountName, parameters, context).block(); + } + /** * Gets the properties of a storage account’s Blob service, including properties for Storage Analytics and CORS * (Cross-Origin Resource Sharing) rules. @@ -425,11 +505,13 @@ public BlobServicePropertiesInner setServiceProperties( * (Cross-Origin Resource Sharing) rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -450,7 +532,7 @@ public Mono> getServicePropertiesWith context -> service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -476,11 +558,13 @@ public Mono> getServicePropertiesWith * (Cross-Origin Resource Sharing) rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -498,7 +582,7 @@ public Mono> getServicePropertiesWith final String blobServicesName = "default"; return service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -525,7 +609,36 @@ public Mono> getServicePropertiesWith public Mono getServicePropertiesAsync(String resourceGroupName, String accountName) { return getServicePropertiesWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the properties of a storage account’s Blob service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of a storage account’s Blob service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getServicePropertiesAsync( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -552,4 +665,25 @@ public Mono getServicePropertiesAsync(String resourc public BlobServicePropertiesInner getServiceProperties(String resourceGroupName, String accountName) { return getServicePropertiesAsync(resourceGroupName, accountName).block(); } + + /** + * Gets the properties of a storage account’s Blob service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of a storage account’s Blob service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobServicePropertiesInner getServiceProperties( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesAsync(resourceGroupName, accountName, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/EncryptionScopesClient.java similarity index 73% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/EncryptionScopesClient.java index 2f60ba023665..3de295104b36 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/EncryptionScopesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -22,30 +22,33 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.PagedResponseBase; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.EncryptionScopeInner; +import com.azure.management.storage.fluent.inner.EncryptionScopeListResultInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in EncryptionScopes. */ -public final class EncryptionScopesInner { - private final ClientLogger logger = new ClientLogger(EncryptionScopesInner.class); +public final class EncryptionScopesClient { + private final ClientLogger logger = new ClientLogger(EncryptionScopesClient.class); /** The proxy service used to perform REST calls. */ private final EncryptionScopesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of EncryptionScopesInner. + * Initializes an instance of EncryptionScopesClient. * * @param client the instance of the service client containing this operation class. */ - EncryptionScopesInner(StorageManagementClientImpl client) { + public EncryptionScopesClient(StorageManagementClient client) { this.service = RestProxy.create(EncryptionScopesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -64,8 +67,8 @@ private interface EncryptionScopesService { + "/storageAccounts/{accountName}/encryptionScopes/{encryptionScopeName}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> put( - @HostParam("$host") String host, + Mono> put( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -80,8 +83,8 @@ Mono> put( + "/storageAccounts/{accountName}/encryptionScopes/{encryptionScopeName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> patch( - @HostParam("$host") String host, + Mono> patch( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -96,8 +99,8 @@ Mono> patch( + "/storageAccounts/{accountName}/encryptionScopes/{encryptionScopeName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -111,8 +114,8 @@ Mono> get( + "/storageAccounts/{accountName}/encryptionScopes") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -123,7 +126,7 @@ Mono> list( @Get("{nextLink}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listNext( + Mono> listNext( @PathParam(value = "nextLink", encoded = true) String nextLink, Context context); } @@ -146,14 +149,16 @@ Mono> listNext( * @return the Encryption Scope resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putWithResponseAsync( + public Mono> putWithResponseAsync( String resourceGroupName, String accountName, String encryptionScopeName, EncryptionScopeInner encryptionScope) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -183,7 +188,7 @@ public Mono> putWithResponseAsync( context -> service .put( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -214,15 +219,17 @@ public Mono> putWithResponseAsync( * @return the Encryption Scope resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putWithResponseAsync( + public Mono> putWithResponseAsync( String resourceGroupName, String accountName, String encryptionScopeName, EncryptionScopeInner encryptionScope, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -249,7 +256,7 @@ public Mono> putWithResponseAsync( } return service .put( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -285,7 +292,44 @@ public Mono putAsync( EncryptionScopeInner encryptionScope) { return putWithResponseAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Synchronously creates or updates an encryption scope under the specified storage account. If an encryption scope + * is already created and a subsequent request is issued with different properties, the encryption scope properties + * will be updated per the specified request. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param encryptionScopeName The name of the encryption scope within the specified storage account. Encryption + * scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) + * only. Every dash (-) character must be immediately preceded and followed by a letter or number. + * @param encryptionScope The Encryption Scope 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 Encryption Scope resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putAsync( + String resourceGroupName, + String accountName, + String encryptionScopeName, + EncryptionScopeInner encryptionScope, + Context context) { + return putWithResponseAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -321,6 +365,35 @@ public EncryptionScopeInner put( return putAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope).block(); } + /** + * Synchronously creates or updates an encryption scope under the specified storage account. If an encryption scope + * is already created and a subsequent request is issued with different properties, the encryption scope properties + * will be updated per the specified request. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param encryptionScopeName The name of the encryption scope within the specified storage account. Encryption + * scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) + * only. Every dash (-) character must be immediately preceded and followed by a letter or number. + * @param encryptionScope The Encryption Scope 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 Encryption Scope resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public EncryptionScopeInner put( + String resourceGroupName, + String accountName, + String encryptionScopeName, + EncryptionScopeInner encryptionScope, + Context context) { + return putAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope, context).block(); + } + /** * Update encryption scope properties as specified in the request body. Update fails if the specified encryption * scope does not already exist. @@ -339,14 +412,16 @@ public EncryptionScopeInner put( * @return the Encryption Scope resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> patchWithResponseAsync( + public Mono> patchWithResponseAsync( String resourceGroupName, String accountName, String encryptionScopeName, EncryptionScopeInner encryptionScope) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -376,7 +451,7 @@ public Mono> patchWithResponseAsync( context -> service .patch( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -406,15 +481,17 @@ public Mono> patchWithResponseAsync( * @return the Encryption Scope resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> patchWithResponseAsync( + public Mono> patchWithResponseAsync( String resourceGroupName, String accountName, String encryptionScopeName, EncryptionScopeInner encryptionScope, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -441,7 +518,7 @@ public Mono> patchWithResponseAsync( } return service .patch( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -476,7 +553,43 @@ public Mono patchAsync( EncryptionScopeInner encryptionScope) { return patchWithResponseAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Update encryption scope properties as specified in the request body. Update fails if the specified encryption + * scope does not already exist. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param encryptionScopeName The name of the encryption scope within the specified storage account. Encryption + * scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) + * only. Every dash (-) character must be immediately preceded and followed by a letter or number. + * @param encryptionScope The Encryption Scope 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 Encryption Scope resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono patchAsync( + String resourceGroupName, + String accountName, + String encryptionScopeName, + EncryptionScopeInner encryptionScope, + Context context) { + return patchWithResponseAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -511,6 +624,34 @@ public EncryptionScopeInner patch( return patchAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope).block(); } + /** + * Update encryption scope properties as specified in the request body. Update fails if the specified encryption + * scope does not already exist. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param encryptionScopeName The name of the encryption scope within the specified storage account. Encryption + * scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) + * only. Every dash (-) character must be immediately preceded and followed by a letter or number. + * @param encryptionScope The Encryption Scope 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 Encryption Scope resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public EncryptionScopeInner patch( + String resourceGroupName, + String accountName, + String encryptionScopeName, + EncryptionScopeInner encryptionScope, + Context context) { + return patchAsync(resourceGroupName, accountName, encryptionScopeName, encryptionScope, context).block(); + } + /** * Returns the properties for the specified encryption scope. * @@ -527,11 +668,13 @@ public EncryptionScopeInner patch( * @return the Encryption Scope resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String encryptionScopeName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -555,7 +698,7 @@ public Mono> getWithResponseAsync( context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -582,11 +725,13 @@ public Mono> getWithResponseAsync( * @return the Encryption Scope resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String encryptionScopeName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -607,7 +752,7 @@ public Mono> getWithResponseAsync( } return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -636,7 +781,37 @@ public Mono getAsync( String resourceGroupName, String accountName, String encryptionScopeName) { return getWithResponseAsync(resourceGroupName, accountName, encryptionScopeName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Returns the properties for the specified encryption scope. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param encryptionScopeName The name of the encryption scope within the specified storage account. Encryption + * scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) + * only. Every dash (-) character must be immediately preceded and followed by a letter or number. + * @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 Encryption Scope resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync( + String resourceGroupName, String accountName, String encryptionScopeName, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, encryptionScopeName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -665,6 +840,28 @@ public EncryptionScopeInner get(String resourceGroupName, String accountName, St return getAsync(resourceGroupName, accountName, encryptionScopeName).block(); } + /** + * Returns the properties for the specified encryption scope. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param encryptionScopeName The name of the encryption scope within the specified storage account. Encryption + * scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) + * only. Every dash (-) character must be immediately preceded and followed by a letter or number. + * @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 Encryption Scope resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public EncryptionScopeInner get( + String resourceGroupName, String accountName, String encryptionScopeName, Context context) { + return getAsync(resourceGroupName, accountName, encryptionScopeName, context).block(); + } + /** * Lists all the encryption scopes available under the specified storage account. * @@ -680,9 +877,11 @@ public EncryptionScopeInner get(String resourceGroupName, String accountName, St */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync(String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -702,7 +901,7 @@ public Mono> listSinglePageAsync(String reso context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -737,9 +936,11 @@ public Mono> listSinglePageAsync(String reso @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -756,7 +957,7 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -831,6 +1032,25 @@ public PagedIterable list(String resourceGroupName, String return new PagedIterable<>(listAsync(resourceGroupName, accountName)); } + /** + * Lists all the encryption scopes available under the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 list of encryption scopes requested, and if paging is required, a URL to the next page of encryption + * scopes. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list(String resourceGroupName, String accountName, Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, context)); + } + /** * Get the next page of items. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServicesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/FileServicesClient.java similarity index 68% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServicesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/FileServicesClient.java index 7d165fca031e..606d94aaa551 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServicesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/FileServicesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -17,32 +17,35 @@ import com.azure.core.annotation.ServiceInterface; import com.azure.core.annotation.ServiceMethod; import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.CorsRules; -import com.azure.management.storage.DeleteRetentionPolicy; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.FileServiceItemsInner; +import com.azure.management.storage.fluent.inner.FileServicePropertiesInner; +import com.azure.management.storage.models.CorsRules; +import com.azure.management.storage.models.DeleteRetentionPolicy; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in FileServices. */ -public final class FileServicesInner { - private final ClientLogger logger = new ClientLogger(FileServicesInner.class); +public final class FileServicesClient { + private final ClientLogger logger = new ClientLogger(FileServicesClient.class); /** The proxy service used to perform REST calls. */ private final FileServicesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of FileServicesInner. + * Initializes an instance of FileServicesClient. * * @param client the instance of the service client containing this operation class. */ - FileServicesInner(StorageManagementClientImpl client) { + public FileServicesClient(StorageManagementClient client) { this.service = RestProxy.create(FileServicesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -61,8 +64,8 @@ private interface FileServicesService { + "/storageAccounts/{accountName}/fileServices") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -75,8 +78,8 @@ Mono> list( + "/storageAccounts/{accountName}/fileServices/{FileServicesName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> setServiceProperties( - @HostParam("$host") String host, + Mono> setServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -91,8 +94,8 @@ Mono> setServiceProperties( + "/storageAccounts/{accountName}/fileServices/{FileServicesName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getServiceProperties( - @HostParam("$host") String host, + Mono> getServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -114,11 +117,12 @@ Mono> getServiceProperties( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listWithResponseAsync( - String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + public Mono> listWithResponseAsync(String resourceGroupName, String accountName) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -138,7 +142,7 @@ public Mono> listWithResponseAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -161,11 +165,13 @@ public Mono> listWithResponseAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listWithResponseAsync( + public Mono> listWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -182,7 +188,7 @@ public Mono> listWithResponseAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -206,7 +212,33 @@ public Mono> listWithResponseAsync( public Mono listAsync(String resourceGroupName, String accountName) { return listWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * List all file services in storage accounts. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono listAsync(String resourceGroupName, String accountName, Context context) { + return listWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -232,6 +264,24 @@ public FileServiceItemsInner list(String resourceGroupName, String accountName) return listAsync(resourceGroupName, accountName).block(); } + /** + * List all file services in storage accounts. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public FileServiceItemsInner list(String resourceGroupName, String accountName, Context context) { + return listAsync(resourceGroupName, accountName, context).block(); + } + /** * Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. * @@ -247,14 +297,16 @@ public FileServiceItemsInner list(String resourceGroupName, String accountName) * @return the properties of File services in storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, CorsRules cors, DeleteRetentionPolicy shareDeleteRetentionPolicy) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -284,7 +336,7 @@ public Mono> setServicePropertiesWith context -> service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -311,15 +363,17 @@ public Mono> setServicePropertiesWith * @return the properties of File services in storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, CorsRules cors, DeleteRetentionPolicy shareDeleteRetentionPolicy, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -346,7 +400,7 @@ public Mono> setServicePropertiesWith parameters.withShareDeleteRetentionPolicy(shareDeleteRetentionPolicy); return service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -378,7 +432,41 @@ public Mono setServicePropertiesAsync( DeleteRetentionPolicy shareDeleteRetentionPolicy) { return setServicePropertiesWithResponseAsync(resourceGroupName, accountName, cors, shareDeleteRetentionPolicy) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param cors Sets the CORS rules. You can include up to five CorsRule elements in the request. + * @param shareDeleteRetentionPolicy The service properties for soft delete. + * @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 properties of File services in storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono setServicePropertiesAsync( + String resourceGroupName, + String accountName, + CorsRules cors, + DeleteRetentionPolicy shareDeleteRetentionPolicy, + Context context) { + return setServicePropertiesWithResponseAsync( + resourceGroupName, accountName, cors, shareDeleteRetentionPolicy, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -410,6 +498,32 @@ public FileServicePropertiesInner setServiceProperties( return setServicePropertiesAsync(resourceGroupName, accountName, cors, shareDeleteRetentionPolicy).block(); } + /** + * Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param cors Sets the CORS rules. You can include up to five CorsRule elements in the request. + * @param shareDeleteRetentionPolicy The service properties for soft delete. + * @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 properties of File services in storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public FileServicePropertiesInner setServiceProperties( + String resourceGroupName, + String accountName, + CorsRules cors, + DeleteRetentionPolicy shareDeleteRetentionPolicy, + Context context) { + return setServicePropertiesAsync(resourceGroupName, accountName, cors, shareDeleteRetentionPolicy, context) + .block(); + } + /** * Gets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. * @@ -424,11 +538,13 @@ public FileServicePropertiesInner setServiceProperties( * rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -449,7 +565,7 @@ public Mono> getServicePropertiesWith context -> service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -474,11 +590,13 @@ public Mono> getServicePropertiesWith * rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -496,7 +614,7 @@ public Mono> getServicePropertiesWith final String fileServicesName = "default"; return service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -522,7 +640,35 @@ public Mono> getServicePropertiesWith public Mono getServicePropertiesAsync(String resourceGroupName, String accountName) { return getServicePropertiesWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) + * rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getServicePropertiesAsync( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -548,4 +694,24 @@ public Mono getServicePropertiesAsync(String resourc public FileServicePropertiesInner getServiceProperties(String resourceGroupName, String accountName) { return getServicePropertiesAsync(resourceGroupName, accountName).block(); } + + /** + * Gets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) + * rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public FileServicePropertiesInner getServiceProperties( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesAsync(resourceGroupName, accountName, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileSharesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/FileSharesClient.java similarity index 74% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileSharesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/FileSharesClient.java index 1ca1b5d82e76..39eea5df4e32 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileSharesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/FileSharesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.Delete; @@ -26,32 +26,35 @@ import com.azure.core.http.rest.PagedResponseBase; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.DeletedShare; -import com.azure.management.storage.GetShareExpand; -import com.azure.management.storage.ListSharesExpand; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.FileShareInner; +import com.azure.management.storage.fluent.inner.FileShareItemInner; +import com.azure.management.storage.fluent.inner.FileShareItemsInner; +import com.azure.management.storage.models.DeletedShare; +import com.azure.management.storage.models.GetShareExpand; +import com.azure.management.storage.models.ListSharesExpand; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in FileShares. */ -public final class FileSharesInner { - private final ClientLogger logger = new ClientLogger(FileSharesInner.class); +public final class FileSharesClient { + private final ClientLogger logger = new ClientLogger(FileSharesClient.class); /** The proxy service used to perform REST calls. */ private final FileSharesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of FileSharesInner. + * Initializes an instance of FileSharesClient. * * @param client the instance of the service client containing this operation class. */ - FileSharesInner(StorageManagementClientImpl client) { + public FileSharesClient(StorageManagementClient client) { this.service = RestProxy.create(FileSharesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -70,8 +73,8 @@ private interface FileSharesService { + "/storageAccounts/{accountName}/fileServices/default/shares") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -87,8 +90,8 @@ Mono> list( + "/storageAccounts/{accountName}/fileServices/default/shares/{shareName}") @ExpectedResponses({200, 201}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> create( - @HostParam("$host") String host, + Mono> create( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("shareName") String shareName, @@ -103,8 +106,8 @@ Mono> create( + "/storageAccounts/{accountName}/fileServices/default/shares/{shareName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> update( - @HostParam("$host") String host, + Mono> update( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("shareName") String shareName, @@ -119,8 +122,8 @@ Mono> update( + "/storageAccounts/{accountName}/fileServices/default/shares/{shareName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("shareName") String shareName, @@ -136,7 +139,7 @@ Mono> get( @ExpectedResponses({200, 204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("shareName") String shareName, @@ -151,7 +154,7 @@ Mono> delete( @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> restore( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @PathParam("shareName") String shareName, @@ -164,7 +167,7 @@ Mono> restore( @Get("{nextLink}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listNext( + Mono> listNext( @PathParam(value = "nextLink", encoded = true) String nextLink, Context context); } @@ -186,9 +189,11 @@ Mono> listNext( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, String maxpagesize, String filter, ListSharesExpand expand) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -208,7 +213,7 @@ public Mono> listSinglePageAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -253,9 +258,11 @@ public Mono> listSinglePageAsync( String filter, ListSharesExpand expand, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -272,7 +279,7 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -388,6 +395,33 @@ public PagedIterable list( return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter, expand)); } + /** + * Lists all shares. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param maxpagesize Optional. Specified maximum number of shares that can be included in the list. + * @param filter Optional. When specified, only share names starting with the filter will be listed. + * @param expand Optional, used to expand the properties within share's properties. + * @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 response schema. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, + String accountName, + String maxpagesize, + String filter, + ListSharesExpand expand, + Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter, expand, context)); + } + /** * Lists all shares. * @@ -427,11 +461,13 @@ public PagedIterable list(String resourceGroupName, String a * @return properties of the file share, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String shareName, FileShareInner fileShare) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -459,7 +495,7 @@ public Mono> createWithResponseAsync( context -> service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -489,11 +525,13 @@ public Mono> createWithResponseAsync( * @return properties of the file share, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String shareName, FileShareInner fileShare, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -518,7 +556,7 @@ public Mono> createWithResponseAsync( } return service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -550,7 +588,39 @@ public Mono createAsync( String resourceGroupName, String accountName, String shareName, FileShareInner fileShare) { return createWithResponseAsync(resourceGroupName, accountName, shareName, fileShare) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Creates a new share under the specified account as described by request body. The share resource includes + * metadata and properties for that share. It does not include a list of the files contained by the share. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param fileShare Properties of the file share, including Id, resource name, resource type, Etag. + * @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 properties of the file share, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createAsync( + String resourceGroupName, String accountName, String shareName, FileShareInner fileShare, Context context) { + return createWithResponseAsync(resourceGroupName, accountName, shareName, fileShare, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -582,6 +652,30 @@ public FileShareInner create( return createAsync(resourceGroupName, accountName, shareName, fileShare).block(); } + /** + * Creates a new share under the specified account as described by request body. The share resource includes + * metadata and properties for that share. It does not include a list of the files contained by the share. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param fileShare Properties of the file share, including Id, resource name, resource type, Etag. + * @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 properties of the file share, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public FileShareInner create( + String resourceGroupName, String accountName, String shareName, FileShareInner fileShare, Context context) { + return createAsync(resourceGroupName, accountName, shareName, fileShare, context).block(); + } + /** * Updates share properties as specified in request body. Properties not mentioned in the request will not be * changed. Update fails if the specified share does not already exist. @@ -600,11 +694,13 @@ public FileShareInner create( * @return properties of the file share, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String shareName, FileShareInner fileShare) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -632,7 +728,7 @@ public Mono> updateWithResponseAsync( context -> service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -662,11 +758,13 @@ public Mono> updateWithResponseAsync( * @return properties of the file share, including Id, resource name, resource type, Etag. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String shareName, FileShareInner fileShare, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -691,7 +789,7 @@ public Mono> updateWithResponseAsync( } return service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -723,7 +821,39 @@ public Mono updateAsync( String resourceGroupName, String accountName, String shareName, FileShareInner fileShare) { return updateWithResponseAsync(resourceGroupName, accountName, shareName, fileShare) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Updates share properties as specified in request body. Properties not mentioned in the request will not be + * changed. Update fails if the specified share does not already exist. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param fileShare Properties of the file share, including Id, resource name, resource type, Etag. + * @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 properties of the file share, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono updateAsync( + String resourceGroupName, String accountName, String shareName, FileShareInner fileShare, Context context) { + return updateWithResponseAsync(resourceGroupName, accountName, shareName, fileShare, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -755,6 +885,30 @@ public FileShareInner update( return updateAsync(resourceGroupName, accountName, shareName, fileShare).block(); } + /** + * Updates share properties as specified in request body. Properties not mentioned in the request will not be + * changed. Update fails if the specified share does not already exist. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param fileShare Properties of the file share, including Id, resource name, resource type, Etag. + * @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 properties of the file share, including Id, resource name, resource type, Etag. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public FileShareInner update( + String resourceGroupName, String accountName, String shareName, FileShareInner fileShare, Context context) { + return updateAsync(resourceGroupName, accountName, shareName, fileShare, context).block(); + } + /** * Gets properties of a specified share. * @@ -772,11 +926,13 @@ public FileShareInner update( * @return properties of a specified share. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String shareName, GetShareExpand expand) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -799,7 +955,7 @@ public Mono> getWithResponseAsync( context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -828,11 +984,13 @@ public Mono> getWithResponseAsync( * @return properties of a specified share. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String shareName, GetShareExpand expand, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -852,7 +1010,7 @@ public Mono> getWithResponseAsync( } return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -883,7 +1041,38 @@ public Mono getAsync( String resourceGroupName, String accountName, String shareName, GetShareExpand expand) { return getWithResponseAsync(resourceGroupName, accountName, shareName, expand) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets properties of a specified share. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param expand Optional, used to expand the properties within share's properties. + * @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 properties of a specified share. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync( + String resourceGroupName, String accountName, String shareName, GetShareExpand expand, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, shareName, expand, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -913,7 +1102,7 @@ public Mono getAsync(String resourceGroupName, String accountNam final Context context = null; return getWithResponseAsync(resourceGroupName, accountName, shareName, expand) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -943,6 +1132,29 @@ public FileShareInner get(String resourceGroupName, String accountName, String s return getAsync(resourceGroupName, accountName, shareName, expand).block(); } + /** + * Gets properties of a specified share. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param expand Optional, used to expand the properties within share's properties. + * @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 properties of a specified share. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public FileShareInner get( + String resourceGroupName, String accountName, String shareName, GetShareExpand expand, Context context) { + return getAsync(resourceGroupName, accountName, shareName, expand, context).block(); + } + /** * Gets properties of a specified share. * @@ -983,9 +1195,11 @@ public FileShareInner get(String resourceGroupName, String accountName, String s @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String shareName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1008,7 +1222,7 @@ public Mono> deleteWithResponseAsync( context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -1037,9 +1251,11 @@ public Mono> deleteWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String shareName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1059,7 +1275,7 @@ public Mono> deleteWithResponseAsync( } return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -1089,6 +1305,28 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri .flatMap((Response res) -> Mono.empty()); } + /** + * Deletes specified share under its account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync(String resourceGroupName, String accountName, String shareName, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, shareName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes specified share under its account. * @@ -1108,6 +1346,26 @@ public void delete(String resourceGroupName, String accountName, String shareNam deleteAsync(resourceGroupName, accountName, shareName).block(); } + /** + * Deletes specified share under its account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete(String resourceGroupName, String accountName, String shareName, Context context) { + deleteAsync(resourceGroupName, accountName, shareName, context).block(); + } + /** * Restore a file share within a valid retention days if share soft delete is enabled. * @@ -1132,9 +1390,11 @@ public Mono> restoreWithResponseAsync( String shareName, String deletedShareName, String deletedShareVersion) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1168,7 +1428,7 @@ public Mono> restoreWithResponseAsync( context -> service .restore( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -1205,9 +1465,11 @@ public Mono> restoreWithResponseAsync( String deletedShareName, String deletedShareVersion, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1238,7 +1500,7 @@ public Mono> restoreWithResponseAsync( deletedShare.withDeletedShareVersion(deletedShareVersion); return service .restore( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, shareName, @@ -1277,6 +1539,37 @@ public Mono restoreAsync( .flatMap((Response res) -> Mono.empty()); } + /** + * Restore a file share within a valid retention days if share soft delete is enabled. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param deletedShareName Required. Identify the name of the deleted share that will be restored. + * @param deletedShareVersion Required. Identify the version of the deleted share that will be restored. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono restoreAsync( + String resourceGroupName, + String accountName, + String shareName, + String deletedShareName, + String deletedShareVersion, + Context context) { + return restoreWithResponseAsync( + resourceGroupName, accountName, shareName, deletedShareName, deletedShareVersion, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Restore a file share within a valid retention days if share soft delete is enabled. * @@ -1303,6 +1596,34 @@ public void restore( restoreAsync(resourceGroupName, accountName, shareName, deletedShareName, deletedShareVersion).block(); } + /** + * Restore a file share within a valid retention days if share soft delete is enabled. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param shareName The name of the file share within the specified storage account. File share names must be + * between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) + * character must be immediately preceded and followed by a letter or number. + * @param deletedShareName Required. Identify the name of the deleted share that will be restored. + * @param deletedShareVersion Required. Identify the version of the deleted share that will be restored. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void restore( + String resourceGroupName, + String accountName, + String shareName, + String deletedShareName, + String deletedShareVersion, + Context context) { + restoreAsync(resourceGroupName, accountName, shareName, deletedShareName, deletedShareVersion, context).block(); + } + /** * Get the next page of items. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPoliciesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/ManagementPoliciesClient.java similarity index 70% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPoliciesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/ManagementPoliciesClient.java index e8755343f17d..070c6c5bf561 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPoliciesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/ManagementPoliciesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.Delete; @@ -20,31 +20,32 @@ import com.azure.core.annotation.UnexpectedResponseExceptionType; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; import com.azure.management.resources.fluentcore.collection.InnerSupportsDelete; -import com.azure.management.storage.ManagementPolicySchema; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.ManagementPolicyInner; +import com.azure.management.storage.models.ManagementPolicySchema; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in ManagementPolicies. */ -public final class ManagementPoliciesInner implements InnerSupportsDelete { - private final ClientLogger logger = new ClientLogger(ManagementPoliciesInner.class); +public final class ManagementPoliciesClient implements InnerSupportsDelete { + private final ClientLogger logger = new ClientLogger(ManagementPoliciesClient.class); /** The proxy service used to perform REST calls. */ private final ManagementPoliciesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of ManagementPoliciesInner. + * Initializes an instance of ManagementPoliciesClient. * * @param client the instance of the service client containing this operation class. */ - ManagementPoliciesInner(StorageManagementClientImpl client) { + public ManagementPoliciesClient(StorageManagementClient client) { this.service = RestProxy.create(ManagementPoliciesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -63,8 +64,8 @@ private interface ManagementPoliciesService { + "/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -78,8 +79,8 @@ Mono> get( + "/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( - @HostParam("$host") String host, + Mono> createOrUpdate( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -95,7 +96,7 @@ Mono> createOrUpdate( @ExpectedResponses({200, 204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -117,11 +118,12 @@ Mono> delete( * @return the managementpolicy associated with the specified storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( - String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + public Mono> getWithResponseAsync(String resourceGroupName, String accountName) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -142,7 +144,7 @@ public Mono> getWithResponseAsync( context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -166,11 +168,13 @@ public Mono> getWithResponseAsync( * @return the managementpolicy associated with the specified storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -188,7 +192,7 @@ public Mono> getWithResponseAsync( final String managementPolicyName = "default"; return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -213,7 +217,33 @@ public Mono> getWithResponseAsync( public Mono getAsync(String resourceGroupName, String accountName) { return getWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the managementpolicy associated with the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 managementpolicy associated with the specified storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync(String resourceGroupName, String accountName, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -239,6 +269,24 @@ public ManagementPolicyInner get(String resourceGroupName, String accountName) { return getAsync(resourceGroupName, accountName).block(); } + /** + * Gets the managementpolicy associated with the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 managementpolicy associated with the specified storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ManagementPolicyInner get(String resourceGroupName, String accountName, Context context) { + return getAsync(resourceGroupName, accountName, context).block(); + } + /** * Sets the managementpolicy to the specified storage account. * @@ -254,11 +302,13 @@ public ManagementPolicyInner get(String resourceGroupName, String accountName) { * @return the Get Storage Account ManagementPolicies operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createOrUpdateWithResponseAsync( + public Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String accountName, ManagementPolicySchema policy) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -284,7 +334,7 @@ public Mono> createOrUpdateWithResponseAsy context -> service .createOrUpdate( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -311,11 +361,13 @@ public Mono> createOrUpdateWithResponseAsy * @return the Get Storage Account ManagementPolicies operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createOrUpdateWithResponseAsync( + public Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String accountName, ManagementPolicySchema policy, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -338,7 +390,7 @@ public Mono> createOrUpdateWithResponseAsy properties.withPolicy(policy); return service .createOrUpdate( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -367,7 +419,36 @@ public Mono createOrUpdateAsync( String resourceGroupName, String accountName, ManagementPolicySchema policy) { return createOrUpdateWithResponseAsync(resourceGroupName, accountName, policy) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Sets the managementpolicy to the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param policy The Storage Account ManagementPolicies Rules. See more details in: + * https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts. + * @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 Get Storage Account ManagementPolicies operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createOrUpdateAsync( + String resourceGroupName, String accountName, ManagementPolicySchema policy, Context context) { + return createOrUpdateWithResponseAsync(resourceGroupName, accountName, policy, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -396,6 +477,27 @@ public ManagementPolicyInner createOrUpdate( return createOrUpdateAsync(resourceGroupName, accountName, policy).block(); } + /** + * Sets the managementpolicy to the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param policy The Storage Account ManagementPolicies Rules. See more details in: + * https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts. + * @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 Get Storage Account ManagementPolicies operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ManagementPolicyInner createOrUpdate( + String resourceGroupName, String accountName, ManagementPolicySchema policy, Context context) { + return createOrUpdateAsync(resourceGroupName, accountName, policy, context).block(); + } + /** * Deletes the managementpolicy associated with the specified storage account. * @@ -410,9 +512,11 @@ public ManagementPolicyInner createOrUpdate( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync(String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -433,7 +537,7 @@ public Mono> deleteWithResponseAsync(String resourceGroupName, St context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -458,9 +562,11 @@ public Mono> deleteWithResponseAsync(String resourceGroupName, St */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync(String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -478,7 +584,7 @@ public Mono> deleteWithResponseAsync(String resourceGroupName, St final String managementPolicyName = "default"; return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -504,6 +610,25 @@ public Mono deleteAsync(String resourceGroupName, String accountName) { return deleteWithResponseAsync(resourceGroupName, accountName).flatMap((Response res) -> Mono.empty()); } + /** + * Deletes the managementpolicy associated with the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync(String resourceGroupName, String accountName, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes the managementpolicy associated with the specified storage account. * @@ -519,4 +644,21 @@ public Mono deleteAsync(String resourceGroupName, String accountName) { public void delete(String resourceGroupName, String accountName) { deleteAsync(resourceGroupName, accountName).block(); } + + /** + * Deletes the managementpolicy associated with the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete(String resourceGroupName, String accountName, Context context) { + deleteAsync(resourceGroupName, accountName, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPoliciesOperationsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/ObjectReplicationPoliciesOperationsClient.java similarity index 73% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPoliciesOperationsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/ObjectReplicationPoliciesOperationsClient.java index 3cf9bcb0b8e0..1497e30abce5 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPoliciesOperationsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/ObjectReplicationPoliciesOperationsClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.Delete; @@ -24,29 +24,31 @@ import com.azure.core.http.rest.PagedResponseBase; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.ObjectReplicationPoliciesInner; +import com.azure.management.storage.fluent.inner.ObjectReplicationPolicyInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in ObjectReplicationPoliciesOperations. */ -public final class ObjectReplicationPoliciesOperationsInner { - private final ClientLogger logger = new ClientLogger(ObjectReplicationPoliciesOperationsInner.class); +public final class ObjectReplicationPoliciesOperationsClient { + private final ClientLogger logger = new ClientLogger(ObjectReplicationPoliciesOperationsClient.class); /** The proxy service used to perform REST calls. */ private final ObjectReplicationPoliciesOperationsService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of ObjectReplicationPoliciesOperationsInner. + * Initializes an instance of ObjectReplicationPoliciesOperationsClient. * * @param client the instance of the service client containing this operation class. */ - ObjectReplicationPoliciesOperationsInner(StorageManagementClientImpl client) { + public ObjectReplicationPoliciesOperationsClient(StorageManagementClient client) { this.service = RestProxy .create( @@ -69,8 +71,8 @@ private interface ObjectReplicationPoliciesOperationsService { + "/storageAccounts/{accountName}/objectReplicationPolicies") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -83,8 +85,8 @@ Mono> list( + "/storageAccounts/{accountName}/objectReplicationPolicies/{objectReplicationPolicyId}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -98,8 +100,8 @@ Mono> get( + "/storageAccounts/{accountName}/objectReplicationPolicies/{objectReplicationPolicyId}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> createOrUpdate( - @HostParam("$host") String host, + Mono> createOrUpdate( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -115,7 +117,7 @@ Mono> createOrUpdate( @ExpectedResponses({200, 204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -139,9 +141,11 @@ Mono> delete( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -161,7 +165,7 @@ public Mono> listSinglePageAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -190,9 +194,11 @@ public Mono> listSinglePageAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -209,7 +215,7 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -274,6 +280,25 @@ public PagedIterable list(String resourceGroupName return new PagedIterable<>(listAsync(resourceGroupName, accountName)); } + /** + * List the object replication policies associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 list storage account object replication policies. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, String accountName, Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, context)); + } + /** * Get the object replication policy of the storage account by policy ID. * @@ -288,11 +313,13 @@ public PagedIterable list(String resourceGroupName * @return the object replication policy of the storage account by policy ID. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String objectReplicationPolicyId) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -318,7 +345,7 @@ public Mono> getWithResponseAsync( context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -343,11 +370,13 @@ public Mono> getWithResponseAsync( * @return the object replication policy of the storage account by policy ID. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String objectReplicationPolicyId, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -370,7 +399,7 @@ public Mono> getWithResponseAsync( } return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -397,7 +426,35 @@ public Mono getAsync( String resourceGroupName, String accountName, String objectReplicationPolicyId) { return getWithResponseAsync(resourceGroupName, accountName, objectReplicationPolicyId) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Get the object replication policy of the storage account by policy ID. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param objectReplicationPolicyId The ID of object replication policy or 'default' if the policy ID is unknown. + * @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 object replication policy of the storage account by policy ID. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync( + String resourceGroupName, String accountName, String objectReplicationPolicyId, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, objectReplicationPolicyId, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -425,6 +482,26 @@ public ObjectReplicationPolicyInner get( return getAsync(resourceGroupName, accountName, objectReplicationPolicyId).block(); } + /** + * Get the object replication policy of the storage account by policy ID. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param objectReplicationPolicyId The ID of object replication policy or 'default' if the policy ID is unknown. + * @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 object replication policy of the storage account by policy ID. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ObjectReplicationPolicyInner get( + String resourceGroupName, String accountName, String objectReplicationPolicyId, Context context) { + return getAsync(resourceGroupName, accountName, objectReplicationPolicyId, context).block(); + } + /** * Create or update the object replication policy of the storage account. * @@ -441,14 +518,16 @@ public ObjectReplicationPolicyInner get( * @return the replication policy between two storage accounts. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createOrUpdateWithResponseAsync( + public Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String accountName, String objectReplicationPolicyId, ObjectReplicationPolicyInner properties) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -479,7 +558,7 @@ public Mono> createOrUpdateWithResp context -> service .createOrUpdate( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -507,15 +586,17 @@ public Mono> createOrUpdateWithResp * @return the replication policy between two storage accounts. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createOrUpdateWithResponseAsync( + public Mono> createOrUpdateWithResponseAsync( String resourceGroupName, String accountName, String objectReplicationPolicyId, ObjectReplicationPolicyInner properties, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -543,7 +624,7 @@ public Mono> createOrUpdateWithResp } return service .createOrUpdate( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -576,7 +657,42 @@ public Mono createOrUpdateAsync( ObjectReplicationPolicyInner properties) { return createOrUpdateWithResponseAsync(resourceGroupName, accountName, objectReplicationPolicyId, properties) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Create or update the object replication policy of the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param objectReplicationPolicyId The ID of object replication policy or 'default' if the policy ID is unknown. + * @param properties The replication policy between two storage accounts. Multiple rules can be defined in one + * policy. + * @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 replication policy between two storage accounts. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createOrUpdateAsync( + String resourceGroupName, + String accountName, + String objectReplicationPolicyId, + ObjectReplicationPolicyInner properties, + Context context) { + return createOrUpdateWithResponseAsync( + resourceGroupName, accountName, objectReplicationPolicyId, properties, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -609,6 +725,33 @@ public ObjectReplicationPolicyInner createOrUpdate( return createOrUpdateAsync(resourceGroupName, accountName, objectReplicationPolicyId, properties).block(); } + /** + * Create or update the object replication policy of the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param objectReplicationPolicyId The ID of object replication policy or 'default' if the policy ID is unknown. + * @param properties The replication policy between two storage accounts. Multiple rules can be defined in one + * policy. + * @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 replication policy between two storage accounts. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ObjectReplicationPolicyInner createOrUpdate( + String resourceGroupName, + String accountName, + String objectReplicationPolicyId, + ObjectReplicationPolicyInner properties, + Context context) { + return createOrUpdateAsync(resourceGroupName, accountName, objectReplicationPolicyId, properties, context) + .block(); + } + /** * Deletes the object replication policy associated with the specified storage account. * @@ -625,9 +768,11 @@ public ObjectReplicationPolicyInner createOrUpdate( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String objectReplicationPolicyId) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -653,7 +798,7 @@ public Mono> deleteWithResponseAsync( context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -680,9 +825,11 @@ public Mono> deleteWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String objectReplicationPolicyId, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -705,7 +852,7 @@ public Mono> deleteWithResponseAsync( } return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -733,6 +880,27 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri .flatMap((Response res) -> Mono.empty()); } + /** + * Deletes the object replication policy associated with the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param objectReplicationPolicyId The ID of object replication policy or 'default' if the policy ID is unknown. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync( + String resourceGroupName, String accountName, String objectReplicationPolicyId, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, objectReplicationPolicyId, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes the object replication policy associated with the specified storage account. * @@ -749,4 +917,23 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri public void delete(String resourceGroupName, String accountName, String objectReplicationPolicyId) { deleteAsync(resourceGroupName, accountName, objectReplicationPolicyId).block(); } + + /** + * Deletes the object replication policy associated with the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param objectReplicationPolicyId The ID of object replication policy or 'default' if the policy ID is unknown. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete( + String resourceGroupName, String accountName, String objectReplicationPolicyId, Context context) { + deleteAsync(resourceGroupName, accountName, objectReplicationPolicyId, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/OperationsClient.java similarity index 74% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/OperationsClient.java index 342b1f355c00..c3e67aae4abd 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/OperationsClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; @@ -18,30 +18,33 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.PagedResponseBase; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.OperationInner; +import com.azure.management.storage.fluent.inner.OperationListResultInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in Operations. */ -public final class OperationsInner { - private final ClientLogger logger = new ClientLogger(OperationsInner.class); +public final class OperationsClient { + private final ClientLogger logger = new ClientLogger(OperationsClient.class); /** The proxy service used to perform REST calls. */ private final OperationsService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of OperationsInner. + * Initializes an instance of OperationsClient. * * @param client the instance of the service client containing this operation class. */ - OperationsInner(StorageManagementClientImpl client) { + public OperationsClient(StorageManagementClient client) { this.service = RestProxy.create(OperationsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -58,8 +61,8 @@ private interface OperationsService { @Get("/providers/Microsoft.Storage/operations") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, @QueryParam("api-version") String apiVersion, Context context); + Mono> list( + @HostParam("$host") String endpoint, @QueryParam("api-version") String apiVersion, Context context); } /** @@ -71,12 +74,14 @@ Mono> list( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync() { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } return FluxUtil - .withContext(context -> service.list(this.client.getHost(), this.client.getApiVersion(), context)) + .withContext(context -> service.list(this.client.getEndpoint(), this.client.getApiVersion(), context)) .>map( res -> new PagedResponseBase<>( @@ -95,12 +100,14 @@ public Mono> listSinglePageAsync() { */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync(Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } return service - .list(this.client.getHost(), this.client.getApiVersion(), context) + .list(this.client.getEndpoint(), this.client.getApiVersion(), context) .map( res -> new PagedResponseBase<>( @@ -144,4 +151,18 @@ public PagedFlux listAsync(Context context) { public PagedIterable list() { return new PagedIterable<>(listAsync()); } + + /** + * Lists all of the available Storage Rest API operations. + * + * @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 result of the request to list Storage operations. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list(Context context) { + return new PagedIterable<>(listAsync(context)); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/PrivateEndpointConnectionsClient.java similarity index 72% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/PrivateEndpointConnectionsClient.java index 881d52403d1f..e8d461f739f8 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/PrivateEndpointConnectionsClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.Delete; @@ -24,31 +24,33 @@ import com.azure.core.http.rest.PagedResponseBase; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.PrivateEndpoint; -import com.azure.management.storage.PrivateLinkServiceConnectionState; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.PrivateEndpointConnectionInner; +import com.azure.management.storage.fluent.inner.PrivateEndpointConnectionListResultInner; +import com.azure.management.storage.models.PrivateEndpoint; +import com.azure.management.storage.models.PrivateLinkServiceConnectionState; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in PrivateEndpointConnections. */ -public final class PrivateEndpointConnectionsInner { - private final ClientLogger logger = new ClientLogger(PrivateEndpointConnectionsInner.class); +public final class PrivateEndpointConnectionsClient { + private final ClientLogger logger = new ClientLogger(PrivateEndpointConnectionsClient.class); /** The proxy service used to perform REST calls. */ private final PrivateEndpointConnectionsService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of PrivateEndpointConnectionsInner. + * Initializes an instance of PrivateEndpointConnectionsClient. * * @param client the instance of the service client containing this operation class. */ - PrivateEndpointConnectionsInner(StorageManagementClientImpl client) { + public PrivateEndpointConnectionsClient(StorageManagementClient client) { this.service = RestProxy .create( @@ -69,8 +71,8 @@ private interface PrivateEndpointConnectionsService { + "/storageAccounts/{accountName}/privateEndpointConnections") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -83,8 +85,8 @@ Mono> list( + "/storageAccounts/{accountName}/privateEndpointConnections/{privateEndpointConnectionName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -98,8 +100,8 @@ Mono> get( + "/storageAccounts/{accountName}/privateEndpointConnections/{privateEndpointConnectionName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> put( - @HostParam("$host") String host, + Mono> put( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -115,7 +117,7 @@ Mono> put( @ExpectedResponses({200, 204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -139,9 +141,11 @@ Mono> delete( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -161,7 +165,7 @@ public Mono> listSinglePageAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -190,9 +194,11 @@ public Mono> listSinglePageAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -209,7 +215,7 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -274,6 +280,25 @@ public PagedIterable list(String resourceGroupNa return new PagedIterable<>(listAsync(resourceGroupName, accountName)); } + /** + * List all the private endpoint connections associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 list of private endpoint connection associated with the specified storage account. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, String accountName, Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, context)); + } + /** * Gets the specified private endpoint connection associated with the storage account. * @@ -289,11 +314,13 @@ public PagedIterable list(String resourceGroupNa * @return the specified private endpoint connection associated with the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String privateEndpointConnectionName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -319,7 +346,7 @@ public Mono> getWithResponseAsync context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -345,11 +372,13 @@ public Mono> getWithResponseAsync * @return the specified private endpoint connection associated with the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String privateEndpointConnectionName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -372,7 +401,7 @@ public Mono> getWithResponseAsync } return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -400,7 +429,36 @@ public Mono getAsync( String resourceGroupName, String accountName, String privateEndpointConnectionName) { return getWithResponseAsync(resourceGroupName, accountName, privateEndpointConnectionName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the specified private endpoint connection associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync( + String resourceGroupName, String accountName, String privateEndpointConnectionName, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, privateEndpointConnectionName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -429,6 +487,27 @@ public PrivateEndpointConnectionInner get( return getAsync(resourceGroupName, accountName, privateEndpointConnectionName).block(); } + /** + * Gets the specified private endpoint connection associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PrivateEndpointConnectionInner get( + String resourceGroupName, String accountName, String privateEndpointConnectionName, Context context) { + return getAsync(resourceGroupName, accountName, privateEndpointConnectionName, context).block(); + } + /** * Update the state of specified private endpoint connection associated with the storage account. * @@ -447,15 +526,17 @@ public PrivateEndpointConnectionInner get( * @return the Private Endpoint Connection resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putWithResponseAsync( + public Mono> putWithResponseAsync( String resourceGroupName, String accountName, String privateEndpointConnectionName, PrivateEndpoint privateEndpoint, PrivateLinkServiceConnectionState privateLinkServiceConnectionState) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -490,7 +571,7 @@ public Mono> putWithResponseAsync context -> service .put( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -520,16 +601,18 @@ public Mono> putWithResponseAsync * @return the Private Endpoint Connection resource. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> putWithResponseAsync( + public Mono> putWithResponseAsync( String resourceGroupName, String accountName, String privateEndpointConnectionName, PrivateEndpoint privateEndpoint, PrivateLinkServiceConnectionState privateLinkServiceConnectionState, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -561,7 +644,7 @@ public Mono> putWithResponseAsync properties.withPrivateLinkServiceConnectionState(privateLinkServiceConnectionState); return service .put( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -602,7 +685,50 @@ public Mono putAsync( privateEndpoint, privateLinkServiceConnectionState) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Update the state of specified private endpoint connection associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure + * resource. + * @param privateEndpoint The Private Endpoint resource. + * @param privateLinkServiceConnectionState A collection of information about the state of the connection between + * service consumer and provider. + * @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 Private Endpoint Connection resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono putAsync( + String resourceGroupName, + String accountName, + String privateEndpointConnectionName, + PrivateEndpoint privateEndpoint, + PrivateLinkServiceConnectionState privateLinkServiceConnectionState, + Context context) { + return putWithResponseAsync( + resourceGroupName, + accountName, + privateEndpointConnectionName, + privateEndpoint, + privateLinkServiceConnectionState, + context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -644,6 +770,42 @@ public PrivateEndpointConnectionInner put( .block(); } + /** + * Update the state of specified private endpoint connection associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure + * resource. + * @param privateEndpoint The Private Endpoint resource. + * @param privateLinkServiceConnectionState A collection of information about the state of the connection between + * service consumer and provider. + * @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 Private Endpoint Connection resource. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PrivateEndpointConnectionInner put( + String resourceGroupName, + String accountName, + String privateEndpointConnectionName, + PrivateEndpoint privateEndpoint, + PrivateLinkServiceConnectionState privateLinkServiceConnectionState, + Context context) { + return putAsync( + resourceGroupName, + accountName, + privateEndpointConnectionName, + privateEndpoint, + privateLinkServiceConnectionState, + context) + .block(); + } + /** * Deletes the specified private endpoint connection associated with the storage account. * @@ -661,9 +823,11 @@ public PrivateEndpointConnectionInner put( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String privateEndpointConnectionName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -689,7 +853,7 @@ public Mono> deleteWithResponseAsync( context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -717,9 +881,11 @@ public Mono> deleteWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String privateEndpointConnectionName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -742,7 +908,7 @@ public Mono> deleteWithResponseAsync( } return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -771,6 +937,28 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri .flatMap((Response res) -> Mono.empty()); } + /** + * Deletes the specified private endpoint connection associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync( + String resourceGroupName, String accountName, String privateEndpointConnectionName, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, privateEndpointConnectionName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes the specified private endpoint connection associated with the storage account. * @@ -788,4 +976,24 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri public void delete(String resourceGroupName, String accountName, String privateEndpointConnectionName) { deleteAsync(resourceGroupName, accountName, privateEndpointConnectionName).block(); } + + /** + * Deletes the specified private endpoint connection associated with the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete( + String resourceGroupName, String accountName, String privateEndpointConnectionName, Context context) { + deleteAsync(resourceGroupName, accountName, privateEndpointConnectionName, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResourcesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/PrivateLinkResourcesClient.java similarity index 68% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResourcesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/PrivateLinkResourcesClient.java index 3147fbe5e9f8..c8996f89daf5 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResourcesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/PrivateLinkResourcesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; @@ -15,30 +15,32 @@ import com.azure.core.annotation.ServiceInterface; import com.azure.core.annotation.ServiceMethod; import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.PrivateLinkResourceListResultInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in PrivateLinkResources. */ -public final class PrivateLinkResourcesInner { - private final ClientLogger logger = new ClientLogger(PrivateLinkResourcesInner.class); +public final class PrivateLinkResourcesClient { + private final ClientLogger logger = new ClientLogger(PrivateLinkResourcesClient.class); /** The proxy service used to perform REST calls. */ private final PrivateLinkResourcesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of PrivateLinkResourcesInner. + * Initializes an instance of PrivateLinkResourcesClient. * * @param client the instance of the service client containing this operation class. */ - PrivateLinkResourcesInner(StorageManagementClientImpl client) { + public PrivateLinkResourcesClient(StorageManagementClient client) { this.service = RestProxy .create(PrivateLinkResourcesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); @@ -58,8 +60,8 @@ private interface PrivateLinkResourcesService { + "/storageAccounts/{accountName}/privateLinkResources") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listByStorageAccount( - @HostParam("$host") String host, + Mono> listByStorageAccount( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -80,11 +82,13 @@ Mono> listByStorageAccount( * @return the private link resources that need to be created for a storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listByStorageAccountWithResponseAsync( + public Mono> listByStorageAccountWithResponseAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -104,7 +108,7 @@ public Mono> listByStorageAcc context -> service .listByStorageAccount( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -127,11 +131,13 @@ public Mono> listByStorageAcc * @return the private link resources that need to be created for a storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listByStorageAccountWithResponseAsync( + public Mono> listByStorageAccountWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -148,7 +154,7 @@ public Mono> listByStorageAcc } return service .listByStorageAccount( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -173,7 +179,34 @@ public Mono listByStorageAccountAsync( String resourceGroupName, String accountName) { return listByStorageAccountWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the private link resources that need to be created for a storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 private link resources that need to be created for a storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono listByStorageAccountAsync( + String resourceGroupName, String accountName, Context context) { + return listByStorageAccountWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -198,4 +231,23 @@ public Mono listByStorageAccountAsync( public PrivateLinkResourceListResultInner listByStorageAccount(String resourceGroupName, String accountName) { return listByStorageAccountAsync(resourceGroupName, accountName).block(); } + + /** + * Gets the private link resources that need to be created for a storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 private link resources that need to be created for a storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PrivateLinkResourceListResultInner listByStorageAccount( + String resourceGroupName, String accountName, Context context) { + return listByStorageAccountAsync(resourceGroupName, accountName, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueueServicesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/QueueServicesClient.java similarity index 68% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueueServicesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/QueueServicesClient.java index c399cb9ee2e6..7d5c376e2d5e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueueServicesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/QueueServicesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -17,31 +17,34 @@ import com.azure.core.annotation.ServiceInterface; import com.azure.core.annotation.ServiceMethod; import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.CorsRules; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.ListQueueServicesInner; +import com.azure.management.storage.fluent.inner.QueueServicePropertiesInner; +import com.azure.management.storage.models.CorsRules; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in QueueServices. */ -public final class QueueServicesInner { - private final ClientLogger logger = new ClientLogger(QueueServicesInner.class); +public final class QueueServicesClient { + private final ClientLogger logger = new ClientLogger(QueueServicesClient.class); /** The proxy service used to perform REST calls. */ private final QueueServicesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of QueueServicesInner. + * Initializes an instance of QueueServicesClient. * * @param client the instance of the service client containing this operation class. */ - QueueServicesInner(StorageManagementClientImpl client) { + public QueueServicesClient(StorageManagementClient client) { this.service = RestProxy.create(QueueServicesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -60,8 +63,8 @@ private interface QueueServicesService { + "/storageAccounts/{accountName}/queueServices") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -74,8 +77,8 @@ Mono> list( + "/storageAccounts/{accountName}/queueServices/{queueServiceName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> setServiceProperties( - @HostParam("$host") String host, + Mono> setServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -90,8 +93,8 @@ Mono> setServiceProperties( + "/storageAccounts/{accountName}/queueServices/{queueServiceName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getServiceProperties( - @HostParam("$host") String host, + Mono> getServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -113,11 +116,12 @@ Mono> getServiceProperties( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listWithResponseAsync( - String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + public Mono> listWithResponseAsync(String resourceGroupName, String accountName) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -137,7 +141,7 @@ public Mono> listWithResponseAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -160,11 +164,13 @@ public Mono> listWithResponseAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listWithResponseAsync( + public Mono> listWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -181,7 +187,7 @@ public Mono> listWithResponseAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -205,7 +211,33 @@ public Mono> listWithResponseAsync( public Mono listAsync(String resourceGroupName, String accountName) { return listWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * List all queue services for the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono listAsync(String resourceGroupName, String accountName, Context context) { + return listWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -231,6 +263,24 @@ public ListQueueServicesInner list(String resourceGroupName, String accountName) return listAsync(resourceGroupName, accountName).block(); } + /** + * List all queue services for the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ListQueueServicesInner list(String resourceGroupName, String accountName, Context context) { + return listAsync(resourceGroupName, accountName, context).block(); + } + /** * Sets the properties of a storage account’s Queue service, including properties for Storage Analytics and CORS * (Cross-Origin Resource Sharing) rules. @@ -246,11 +296,13 @@ public ListQueueServicesInner list(String resourceGroupName, String accountName) * @return the properties of a storage account’s Queue service. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, CorsRules cors) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -276,7 +328,7 @@ public Mono> setServicePropertiesWit context -> service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -303,11 +355,13 @@ public Mono> setServicePropertiesWit * @return the properties of a storage account’s Queue service. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, CorsRules cors, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -330,7 +384,7 @@ public Mono> setServicePropertiesWit parameters.withCors(cors); return service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -359,7 +413,36 @@ public Mono setServicePropertiesAsync( String resourceGroupName, String accountName, CorsRules cors) { return setServicePropertiesWithResponseAsync(resourceGroupName, accountName, cors) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Sets the properties of a storage account’s Queue service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param cors Sets the CORS rules. You can include up to five CorsRule elements in the request. + * @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 properties of a storage account’s Queue service. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono setServicePropertiesAsync( + String resourceGroupName, String accountName, CorsRules cors, Context context) { + return setServicePropertiesWithResponseAsync(resourceGroupName, accountName, cors, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -388,6 +471,27 @@ public QueueServicePropertiesInner setServiceProperties( return setServicePropertiesAsync(resourceGroupName, accountName, cors).block(); } + /** + * Sets the properties of a storage account’s Queue service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param cors Sets the CORS rules. You can include up to five CorsRule elements in the request. + * @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 properties of a storage account’s Queue service. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public QueueServicePropertiesInner setServiceProperties( + String resourceGroupName, String accountName, CorsRules cors, Context context) { + return setServicePropertiesAsync(resourceGroupName, accountName, cors, context).block(); + } + /** * Gets the properties of a storage account’s Queue service, including properties for Storage Analytics and CORS * (Cross-Origin Resource Sharing) rules. @@ -403,11 +507,13 @@ public QueueServicePropertiesInner setServiceProperties( * (Cross-Origin Resource Sharing) rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -428,7 +534,7 @@ public Mono> getServicePropertiesWit context -> service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -454,11 +560,13 @@ public Mono> getServicePropertiesWit * (Cross-Origin Resource Sharing) rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -476,7 +584,7 @@ public Mono> getServicePropertiesWit final String queueServiceName = "default"; return service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -503,7 +611,36 @@ public Mono> getServicePropertiesWit public Mono getServicePropertiesAsync(String resourceGroupName, String accountName) { return getServicePropertiesWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the properties of a storage account’s Queue service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of a storage account’s Queue service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getServicePropertiesAsync( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -530,4 +667,25 @@ public Mono getServicePropertiesAsync(String resour public QueueServicePropertiesInner getServiceProperties(String resourceGroupName, String accountName) { return getServicePropertiesAsync(resourceGroupName, accountName).block(); } + + /** + * Gets the properties of a storage account’s Queue service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of a storage account’s Queue service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public QueueServicePropertiesInner getServiceProperties( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesAsync(resourceGroupName, accountName, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueuesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/QueuesClient.java similarity index 74% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueuesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/QueuesClient.java index b5445e23a9be..49b3308452f9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueuesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/QueuesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.Delete; @@ -25,30 +25,33 @@ import com.azure.core.http.rest.PagedResponseBase; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.ListQueueInner; +import com.azure.management.storage.fluent.inner.ListQueueResourceInner; +import com.azure.management.storage.fluent.inner.StorageQueueInner; import java.util.Map; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in Queues. */ -public final class QueuesInner { - private final ClientLogger logger = new ClientLogger(QueuesInner.class); +public final class QueuesClient { + private final ClientLogger logger = new ClientLogger(QueuesClient.class); /** The proxy service used to perform REST calls. */ private final QueuesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of QueuesInner. + * Initializes an instance of QueuesClient. * * @param client the instance of the service client containing this operation class. */ - QueuesInner(StorageManagementClientImpl client) { + public QueuesClient(StorageManagementClient client) { this.service = RestProxy.create(QueuesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; } @@ -66,8 +69,8 @@ private interface QueuesService { + "/storageAccounts/{accountName}/queueServices/default/queues/{queueName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> create( - @HostParam("$host") String host, + Mono> create( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -82,8 +85,8 @@ Mono> create( + "/storageAccounts/{accountName}/queueServices/default/queues/{queueName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> update( - @HostParam("$host") String host, + Mono> update( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -98,8 +101,8 @@ Mono> update( + "/storageAccounts/{accountName}/queueServices/default/queues/{queueName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -114,7 +117,7 @@ Mono> get( @ExpectedResponses({204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -128,8 +131,8 @@ Mono> delete( + "/storageAccounts/{accountName}/queueServices/default/queues") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -142,7 +145,7 @@ Mono> list( @Get("{nextLink}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listNext( + Mono> listNext( @PathParam(value = "nextLink", encoded = true) String nextLink, Context context); } @@ -163,11 +166,13 @@ Mono> listNext( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String queueName, Map metadata) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -192,7 +197,7 @@ public Mono> createWithResponseAsync( context -> service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -221,11 +226,13 @@ public Mono> createWithResponseAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String queueName, Map metadata, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -247,7 +254,7 @@ public Mono> createWithResponseAsync( queue.withMetadata(metadata); return service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -278,7 +285,38 @@ public Mono createAsync( String resourceGroupName, String accountName, String queueName, Map metadata) { return createWithResponseAsync(resourceGroupName, accountName, queueName, metadata) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Creates a new queue with the specified queue name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @param metadata A name-value pair that represents queue metadata. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createAsync( + String resourceGroupName, String accountName, String queueName, Map metadata, Context context) { + return createWithResponseAsync(resourceGroupName, accountName, queueName, metadata, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -309,6 +347,29 @@ public StorageQueueInner create( return createAsync(resourceGroupName, accountName, queueName, metadata).block(); } + /** + * Creates a new queue with the specified queue name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @param metadata A name-value pair that represents queue metadata. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageQueueInner create( + String resourceGroupName, String accountName, String queueName, Map metadata, Context context) { + return createAsync(resourceGroupName, accountName, queueName, metadata, context).block(); + } + /** * Creates a new queue with the specified queue name, under the specified account. * @@ -326,11 +387,13 @@ public StorageQueueInner create( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String queueName, Map metadata) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -355,7 +418,7 @@ public Mono> updateWithResponseAsync( context -> service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -384,11 +447,13 @@ public Mono> updateWithResponseAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String queueName, Map metadata, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -410,7 +475,7 @@ public Mono> updateWithResponseAsync( queue.withMetadata(metadata); return service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -441,7 +506,38 @@ public Mono updateAsync( String resourceGroupName, String accountName, String queueName, Map metadata) { return updateWithResponseAsync(resourceGroupName, accountName, queueName, metadata) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Creates a new queue with the specified queue name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @param metadata A name-value pair that represents queue metadata. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono updateAsync( + String resourceGroupName, String accountName, String queueName, Map metadata, Context context) { + return updateWithResponseAsync(resourceGroupName, accountName, queueName, metadata, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -472,6 +568,29 @@ public StorageQueueInner update( return updateAsync(resourceGroupName, accountName, queueName, metadata).block(); } + /** + * Creates a new queue with the specified queue name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @param metadata A name-value pair that represents queue metadata. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageQueueInner update( + String resourceGroupName, String accountName, String queueName, Map metadata, Context context) { + return updateAsync(resourceGroupName, accountName, queueName, metadata, context).block(); + } + /** * Gets the queue with the specified queue name, under the specified account if it exists. * @@ -488,11 +607,13 @@ public StorageQueueInner update( * @return the queue with the specified queue name, under the specified account if it exists. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String queueName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -515,7 +636,7 @@ public Mono> getWithResponseAsync( context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -542,11 +663,13 @@ public Mono> getWithResponseAsync( * @return the queue with the specified queue name, under the specified account if it exists. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String queueName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -566,7 +689,7 @@ public Mono> getWithResponseAsync( } return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -594,7 +717,37 @@ public Mono> getWithResponseAsync( public Mono getAsync(String resourceGroupName, String accountName, String queueName) { return getWithResponseAsync(resourceGroupName, accountName, queueName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the queue with the specified queue name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @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 queue with the specified queue name, under the specified account if it exists. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync( + String resourceGroupName, String accountName, String queueName, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, queueName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -623,6 +776,27 @@ public StorageQueueInner get(String resourceGroupName, String accountName, Strin return getAsync(resourceGroupName, accountName, queueName).block(); } + /** + * Gets the queue with the specified queue name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @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 queue with the specified queue name, under the specified account if it exists. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageQueueInner get(String resourceGroupName, String accountName, String queueName, Context context) { + return getAsync(resourceGroupName, accountName, queueName, context).block(); + } + /** * Deletes the queue with the specified queue name, under the specified account if it exists. * @@ -641,9 +815,11 @@ public StorageQueueInner get(String resourceGroupName, String accountName, Strin @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String queueName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -666,7 +842,7 @@ public Mono> deleteWithResponseAsync( context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -695,9 +871,11 @@ public Mono> deleteWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String queueName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -717,7 +895,7 @@ public Mono> deleteWithResponseAsync( } return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -747,6 +925,28 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri .flatMap((Response res) -> Mono.empty()); } + /** + * Deletes the queue with the specified queue name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync(String resourceGroupName, String accountName, String queueName, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, queueName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes the queue with the specified queue name, under the specified account if it exists. * @@ -766,6 +966,26 @@ public void delete(String resourceGroupName, String accountName, String queueNam deleteAsync(resourceGroupName, accountName, queueName).block(); } + /** + * Deletes the queue with the specified queue name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param queueName A queue name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an + * alphanumeric character and it cannot have two consecutive dash(-) characters. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete(String resourceGroupName, String accountName, String queueName, Context context) { + deleteAsync(resourceGroupName, accountName, queueName, context).block(); + } + /** * Gets a list of all the queues under the specified storage account. * @@ -784,9 +1004,11 @@ public void delete(String resourceGroupName, String accountName, String queueNam @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, String maxpagesize, String filter) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -806,7 +1028,7 @@ public Mono> listSinglePageAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -845,9 +1067,11 @@ public Mono> listSinglePageAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, String maxpagesize, String filter, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -864,7 +1088,7 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -973,6 +1197,28 @@ public PagedIterable list( return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter)); } + /** + * Gets a list of all the queues under the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param maxpagesize Optional, a maximum number of queues that should be included in a list queue response. + * @param filter Optional, When specified, only the queues with a name starting with the given filter will be + * listed. + * @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 a list of all the queues under the specified storage account. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list( + String resourceGroupName, String accountName, String maxpagesize, String filter, Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, maxpagesize, filter, context)); + } + /** * Gets a list of all the queues under the specified storage account. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkusInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/SkusClient.java similarity index 77% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkusInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/SkusClient.java index 18c31cacc5d6..9038be1ba82c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkusInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/SkusClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; @@ -19,30 +19,33 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.PagedResponseBase; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.SkuInformationInner; +import com.azure.management.storage.fluent.inner.StorageSkuListResultInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in Skus. */ -public final class SkusInner { - private final ClientLogger logger = new ClientLogger(SkusInner.class); +public final class SkusClient { + private final ClientLogger logger = new ClientLogger(SkusClient.class); /** The proxy service used to perform REST calls. */ private final SkusService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of SkusInner. + * Initializes an instance of SkusClient. * * @param client the instance of the service client containing this operation class. */ - SkusInner(StorageManagementClientImpl client) { + public SkusClient(StorageManagementClient client) { this.service = RestProxy.create(SkusService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; } @@ -58,8 +61,8 @@ private interface SkusService { @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/skus") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, Context context); @@ -74,9 +77,11 @@ Mono> list( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync() { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -89,7 +94,7 @@ public Mono> listSinglePageAsync() { context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), context)) @@ -111,9 +116,11 @@ public Mono> listSinglePageAsync() { */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync(Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -122,7 +129,7 @@ public Mono> listSinglePageAsync(Context cont "Parameter this.client.getSubscriptionId() is required and cannot be null.")); } return service - .list(this.client.getHost(), this.client.getApiVersion(), this.client.getSubscriptionId(), context) + .list(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), context) .map( res -> new PagedResponseBase<>( @@ -166,4 +173,18 @@ public PagedFlux listAsync(Context context) { public PagedIterable list() { return new PagedIterable<>(listAsync()); } + + /** + * Lists the available SKUs supported by Microsoft.Storage for given subscription. + * + * @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 response from the List Storage SKUs operation. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list(Context context) { + return new PagedIterable<>(listAsync(context)); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/StorageAccountsClient.java similarity index 63% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/StorageAccountsClient.java index 218bf262152a..b0f1c5507008 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/StorageAccountsClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.Delete; @@ -26,25 +26,34 @@ import com.azure.core.http.rest.PagedResponseBase; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; +import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.polling.AsyncPollResponse; +import com.azure.core.util.polling.PollerFlux; import com.azure.management.resources.fluentcore.collection.InnerSupportsDelete; import com.azure.management.resources.fluentcore.collection.InnerSupportsGet; import com.azure.management.resources.fluentcore.collection.InnerSupportsListing; -import com.azure.management.storage.AccountSasParameters; -import com.azure.management.storage.BlobRestoreParameters; -import com.azure.management.storage.BlobRestoreRange; -import com.azure.management.storage.ListKeyExpand; -import com.azure.management.storage.ServiceSasParameters; -import com.azure.management.storage.StorageAccountCheckNameAvailabilityParameters; -import com.azure.management.storage.StorageAccountCreateParameters; -import com.azure.management.storage.StorageAccountExpand; -import com.azure.management.storage.StorageAccountRegenerateKeyParameters; -import com.azure.management.storage.StorageAccountUpdateParameters; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.BlobRestoreStatusInner; +import com.azure.management.storage.fluent.inner.CheckNameAvailabilityResultInner; +import com.azure.management.storage.fluent.inner.ListAccountSasResponseInner; +import com.azure.management.storage.fluent.inner.ListServiceSasResponseInner; +import com.azure.management.storage.fluent.inner.StorageAccountInner; +import com.azure.management.storage.fluent.inner.StorageAccountListKeysResultInner; +import com.azure.management.storage.fluent.inner.StorageAccountListResultInner; +import com.azure.management.storage.models.AccountSasParameters; +import com.azure.management.storage.models.BlobRestoreParameters; +import com.azure.management.storage.models.BlobRestoreRange; +import com.azure.management.storage.models.ListKeyExpand; +import com.azure.management.storage.models.ServiceSasParameters; +import com.azure.management.storage.models.StorageAccountCheckNameAvailabilityParameters; +import com.azure.management.storage.models.StorageAccountCreateParameters; +import com.azure.management.storage.models.StorageAccountExpand; +import com.azure.management.storage.models.StorageAccountRegenerateKeyParameters; +import com.azure.management.storage.models.StorageAccountUpdateParameters; import java.nio.ByteBuffer; import java.time.OffsetDateTime; import java.util.List; @@ -52,24 +61,24 @@ import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in StorageAccounts. */ -public final class StorageAccountsInner +public final class StorageAccountsClient implements InnerSupportsGet, InnerSupportsListing, InnerSupportsDelete { - private final ClientLogger logger = new ClientLogger(StorageAccountsInner.class); + private final ClientLogger logger = new ClientLogger(StorageAccountsClient.class); /** The proxy service used to perform REST calls. */ private final StorageAccountsService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of StorageAccountsInner. + * Initializes an instance of StorageAccountsClient. * * @param client the instance of the service client containing this operation class. */ - StorageAccountsInner(StorageManagementClientImpl client) { + public StorageAccountsClient(StorageManagementClient client) { this.service = RestProxy.create(StorageAccountsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -86,8 +95,8 @@ private interface StorageAccountsService { @Post("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> checkNameAvailability( - @HostParam("$host") String host, + Mono> checkNameAvailability( + @HostParam("$host") String endpoint, @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, @BodyParam("application/json") StorageAccountCheckNameAvailabilityParameters accountName, @@ -99,8 +108,8 @@ Mono> checkNameAvailability( + "/storageAccounts/{accountName}") @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono>> create( - @HostParam("$host") String host, + Mono>> create( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -115,7 +124,7 @@ Mono>> create( @ExpectedResponses({200, 204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -128,8 +137,8 @@ Mono> delete( + "/storageAccounts/{accountName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getByResourceGroup( - @HostParam("$host") String host, + Mono> getByResourceGroup( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -143,8 +152,8 @@ Mono> getByResourceGroup( + "/storageAccounts/{accountName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> update( - @HostParam("$host") String host, + Mono> update( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -156,8 +165,8 @@ Mono> update( @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/storageAccounts") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, Context context); @@ -168,8 +177,8 @@ Mono> list( + "/storageAccounts") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listByResourceGroup( - @HostParam("$host") String host, + Mono> listByResourceGroup( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, @@ -181,8 +190,8 @@ Mono> listByResourceGroup( + "/storageAccounts/{accountName}/listKeys") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listKeys( - @HostParam("$host") String host, + Mono> listKeys( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -196,8 +205,8 @@ Mono> listKeys( + "/storageAccounts/{accountName}/regenerateKey") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> regenerateKey( - @HostParam("$host") String host, + Mono> regenerateKey( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -211,8 +220,8 @@ Mono> regenerateKey( + "/storageAccounts/{accountName}/ListAccountSas") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listAccountSas( - @HostParam("$host") String host, + Mono> listAccountSas( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -226,8 +235,8 @@ Mono> listAccountSas( + "/storageAccounts/{accountName}/ListServiceSas") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listServiceSas( - @HostParam("$host") String host, + Mono> listServiceSas( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -241,8 +250,8 @@ Mono> listServiceSas( + "/storageAccounts/{accountName}/failover") @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono>> failover( - @HostParam("$host") String host, + Mono>> failover( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -255,8 +264,8 @@ Mono>> failover( + "/storageAccounts/{accountName}/restoreBlobRanges") @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono>> restoreBlobRanges( - @HostParam("$host") String host, + Mono>> restoreBlobRanges( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -271,7 +280,7 @@ Mono>> restoreBlobRanges( @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> revokeUserDelegationKeys( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -284,8 +293,8 @@ Mono> revokeUserDelegationKeys( + "/storageAccounts/{accountName}") @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> beginCreate( - @HostParam("$host") String host, + Mono> beginCreateWithoutPolling( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -299,8 +308,8 @@ Mono> beginCreate( + "/storageAccounts/{accountName}/failover") @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> beginFailover( - @HostParam("$host") String host, + Mono> beginFailoverWithoutPolling( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -313,8 +322,8 @@ Mono> beginFailover( + "/storageAccounts/{accountName}/restoreBlobRanges") @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> beginRestoreBlobRanges( - @HostParam("$host") String host, + Mono> beginRestoreBlobRangesWithoutPolling( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -326,7 +335,7 @@ Mono> beginRestoreBlobRanges( @Get("{nextLink}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listNext( + Mono> listNext( @PathParam(value = "nextLink", encoded = true) String nextLink, Context context); } @@ -340,10 +349,12 @@ Mono> listNext( * @return the CheckNameAvailability operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> checkNameAvailabilityWithResponseAsync(String name) { - if (this.client.getHost() == null) { + public Mono> checkNameAvailabilityWithResponseAsync(String name) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -361,7 +372,7 @@ public Mono> checkNameAvailabil context -> service .checkNameAvailability( - this.client.getHost(), + this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), accountName, @@ -380,11 +391,13 @@ public Mono> checkNameAvailabil * @return the CheckNameAvailability operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> checkNameAvailabilityWithResponseAsync( + public Mono> checkNameAvailabilityWithResponseAsync( String name, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -399,7 +412,7 @@ public Mono> checkNameAvailabil accountName.withName(name); return service .checkNameAvailability( - this.client.getHost(), + this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), accountName, @@ -419,7 +432,30 @@ public Mono> checkNameAvailabil public Mono checkNameAvailabilityAsync(String name) { return checkNameAvailabilityWithResponseAsync(name) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Checks that the storage account name is valid and is not already in use. + * + * @param name The storage account name. + * @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 CheckNameAvailability operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono checkNameAvailabilityAsync(String name, Context context) { + return checkNameAvailabilityWithResponseAsync(name, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -442,6 +478,21 @@ public CheckNameAvailabilityResultInner checkNameAvailability(String name) { return checkNameAvailabilityAsync(name).block(); } + /** + * Checks that the storage account name is valid and is not already in use. + * + * @param name The storage account name. + * @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 CheckNameAvailability operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public CheckNameAvailabilityResultInner checkNameAvailability(String name, Context context) { + return checkNameAvailabilityAsync(name, context).block(); + } + /** * Asynchronously creates a new storage account with the specified parameters. If an account is already created and * a subsequent create request is issued with different properties, the account properties will be updated. If an @@ -459,11 +510,13 @@ public CheckNameAvailabilityResultInner checkNameAvailability(String name) { * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono>> createWithResponseAsync( + public Mono>> createWithResponseAsync( String resourceGroupName, String accountName, StorageAccountCreateParameters parameters) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -488,7 +541,7 @@ public Mono>> createWithResponseAsync( context -> service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -498,6 +551,115 @@ public Mono>> createWithResponseAsync( .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()))); } + /** + * Asynchronously creates a new storage account with the specified parameters. If an account is already created and + * a subsequent create request is issued with different properties, the account properties will be updated. If an + * account is already created and a subsequent create or update request is issued with the exact same set of + * properties, the request will succeed. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters used when creating a storage account. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono>> createWithResponseAsync( + String resourceGroupName, String accountName, StorageAccountCreateParameters parameters, Context context) { + if (this.client.getEndpoint() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (resourceGroupName == null) { + return Mono + .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.")); + } + if (accountName == null) { + return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null.")); + } + if (this.client.getSubscriptionId() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getSubscriptionId() is required and cannot be null.")); + } + if (parameters == null) { + return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null.")); + } else { + parameters.validate(); + } + return service + .create( + this.client.getEndpoint(), + resourceGroupName, + accountName, + this.client.getApiVersion(), + this.client.getSubscriptionId(), + parameters, + context); + } + + /** + * Asynchronously creates a new storage account with the specified parameters. If an account is already created and + * a subsequent create request is issued with different properties, the account properties will be updated. If an + * account is already created and a subsequent create or update request is issued with the exact same set of + * properties, the request will succeed. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters used when creating a storage account. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PollerFlux, StorageAccountInner> beginCreate( + String resourceGroupName, String accountName, StorageAccountCreateParameters parameters) { + Mono>> mono = createWithResponseAsync(resourceGroupName, accountName, parameters); + return this + .client + .getLroResultAsync( + mono, this.client.getHttpPipeline(), StorageAccountInner.class, StorageAccountInner.class); + } + + /** + * Asynchronously creates a new storage account with the specified parameters. If an account is already created and + * a subsequent create request is issued with different properties, the account properties will be updated. If an + * account is already created and a subsequent create or update request is issued with the exact same set of + * properties, the request will succeed. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters used when creating a storage account. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PollerFlux, StorageAccountInner> beginCreate( + String resourceGroupName, String accountName, StorageAccountCreateParameters parameters, Context context) { + Mono>> mono = + createWithResponseAsync(resourceGroupName, accountName, parameters, context); + return this + .client + .getLroResultAsync( + mono, this.client.getHttpPipeline(), StorageAccountInner.class, StorageAccountInner.class); + } + /** * Asynchronously creates a new storage account with the specified parameters. If an account is already created and * a subsequent create request is issued with different properties, the account properties will be updated. If an @@ -517,8 +679,37 @@ public Mono>> createWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono createAsync( String resourceGroupName, String accountName, StorageAccountCreateParameters parameters) { - Mono>> mono = - createWithResponseAsync(resourceGroupName, accountName, parameters); + Mono>> mono = createWithResponseAsync(resourceGroupName, accountName, parameters); + return this + .client + .getLroResultAsync( + mono, this.client.getHttpPipeline(), StorageAccountInner.class, StorageAccountInner.class) + .last() + .flatMap(AsyncPollResponse::getFinalResult); + } + + /** + * Asynchronously creates a new storage account with the specified parameters. If an account is already created and + * a subsequent create request is issued with different properties, the account properties will be updated. If an + * account is already created and a subsequent create or update request is issued with the exact same set of + * properties, the request will succeed. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters used when creating a storage account. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createAsync( + String resourceGroupName, String accountName, StorageAccountCreateParameters parameters, Context context) { + Mono>> mono = + createWithResponseAsync(resourceGroupName, accountName, parameters, context); return this .client .getLroResultAsync( @@ -549,6 +740,29 @@ public StorageAccountInner create( return createAsync(resourceGroupName, accountName, parameters).block(); } + /** + * Asynchronously creates a new storage account with the specified parameters. If an account is already created and + * a subsequent create request is issued with different properties, the account properties will be updated. If an + * account is already created and a subsequent create or update request is issued with the exact same set of + * properties, the request will succeed. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters used when creating a storage account. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageAccountInner create( + String resourceGroupName, String accountName, StorageAccountCreateParameters parameters, Context context) { + return createAsync(resourceGroupName, accountName, parameters, context).block(); + } + /** * Deletes a storage account in Microsoft Azure. * @@ -563,9 +777,11 @@ public StorageAccountInner create( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync(String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -585,7 +801,7 @@ public Mono> deleteWithResponseAsync(String resourceGroupName, St context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -609,9 +825,11 @@ public Mono> deleteWithResponseAsync(String resourceGroupName, St */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync(String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -628,7 +846,7 @@ public Mono> deleteWithResponseAsync(String resourceGroupName, St } return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -653,6 +871,25 @@ public Mono deleteAsync(String resourceGroupName, String accountName) { return deleteWithResponseAsync(resourceGroupName, accountName).flatMap((Response res) -> Mono.empty()); } + /** + * Deletes a storage account in Microsoft Azure. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync(String resourceGroupName, String accountName, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes a storage account in Microsoft Azure. * @@ -669,6 +906,23 @@ public void delete(String resourceGroupName, String accountName) { deleteAsync(resourceGroupName, accountName).block(); } + /** + * Deletes a storage account in Microsoft Azure. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete(String resourceGroupName, String accountName, Context context) { + deleteAsync(resourceGroupName, accountName, context).block(); + } + /** * Returns the properties for the specified storage account including but not limited to name, SKU name, location, * and account status. The ListKeys operation should be used to retrieve storage keys. @@ -685,11 +939,13 @@ public void delete(String resourceGroupName, String accountName) { * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getByResourceGroupWithResponseAsync( + public Mono> getByResourceGroupWithResponseAsync( String resourceGroupName, String accountName, StorageAccountExpand expand) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -709,7 +965,7 @@ public Mono> getByResourceGroupWithResponseA context -> service .getByResourceGroup( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -736,11 +992,13 @@ public Mono> getByResourceGroupWithResponseA * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getByResourceGroupWithResponseAsync( + public Mono> getByResourceGroupWithResponseAsync( String resourceGroupName, String accountName, StorageAccountExpand expand, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -757,7 +1015,7 @@ public Mono> getByResourceGroupWithResponseA } return service .getByResourceGroup( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -786,7 +1044,37 @@ public Mono getByResourceGroupAsync( String resourceGroupName, String accountName, StorageAccountExpand expand) { return getByResourceGroupWithResponseAsync(resourceGroupName, accountName, expand) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Returns the properties for the specified storage account including but not limited to name, SKU name, location, + * and account status. The ListKeys operation should be used to retrieve storage keys. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param expand May be used to expand the properties within account's properties. By default, data is not included + * when fetching properties. Currently we only support geoReplicationStats and blobRestoreStatus. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getByResourceGroupAsync( + String resourceGroupName, String accountName, StorageAccountExpand expand, Context context) { + return getByResourceGroupWithResponseAsync(resourceGroupName, accountName, expand, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -814,7 +1102,7 @@ public Mono getByResourceGroupAsync(String resourceGroupNam final Context context = null; return getByResourceGroupWithResponseAsync(resourceGroupName, accountName, expand) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -852,8 +1140,30 @@ public StorageAccountInner getByResourceGroup( * insensitive. * @param accountName The name of the storage account within the specified resource group. Storage account names * must be between 3 and 24 characters in length and use numbers and lower-case letters only. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. + * @param expand May be used to expand the properties within account's properties. By default, data is not included + * when fetching properties. Currently we only support geoReplicationStats and blobRestoreStatus. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageAccountInner getByResourceGroup( + String resourceGroupName, String accountName, StorageAccountExpand expand, Context context) { + return getByResourceGroupAsync(resourceGroupName, accountName, expand, context).block(); + } + + /** + * Returns the properties for the specified storage account including but not limited to name, SKU name, location, + * and account status. The ListKeys operation should be used to retrieve storage keys. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 storage account. */ @@ -883,11 +1193,13 @@ public StorageAccountInner getByResourceGroup(String resourceGroupName, String a * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, StorageAccountUpdateParameters parameters) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -912,7 +1224,7 @@ public Mono> updateWithResponseAsync( context -> service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -942,11 +1254,13 @@ public Mono> updateWithResponseAsync( * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, StorageAccountUpdateParameters parameters, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -968,7 +1282,7 @@ public Mono> updateWithResponseAsync( } return service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1000,7 +1314,40 @@ public Mono updateAsync( String resourceGroupName, String accountName, StorageAccountUpdateParameters parameters) { return updateWithResponseAsync(resourceGroupName, accountName, parameters) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * The update operation can be used to update the SKU, encryption, access tier, or tags for a storage account. It + * can also be used to map the account to a custom domain. Only one custom domain is supported per storage account; + * the replacement/change of custom domain is not supported. In order to replace an old custom domain, the old value + * must be cleared/unregistered before a new value can be set. The update of multiple properties is supported. This + * call does not change the storage keys for the account. If you want to change the storage account keys, use the + * regenerate keys operation. The location and name of the storage account cannot be changed after creation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters that can be provided when updating the storage account properties. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono updateAsync( + String resourceGroupName, String accountName, StorageAccountUpdateParameters parameters, Context context) { + return updateWithResponseAsync(resourceGroupName, accountName, parameters, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1033,6 +1380,31 @@ public StorageAccountInner update( return updateAsync(resourceGroupName, accountName, parameters).block(); } + /** + * The update operation can be used to update the SKU, encryption, access tier, or tags for a storage account. It + * can also be used to map the account to a custom domain. Only one custom domain is supported per storage account; + * the replacement/change of custom domain is not supported. In order to replace an old custom domain, the old value + * must be cleared/unregistered before a new value can be set. The update of multiple properties is supported. This + * call does not change the storage keys for the account. If you want to change the storage account keys, use the + * regenerate keys operation. The location and name of the storage account cannot be changed after creation. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters that can be provided when updating the storage account properties. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageAccountInner update( + String resourceGroupName, String accountName, StorageAccountUpdateParameters parameters, Context context) { + return updateAsync(resourceGroupName, accountName, parameters, context).block(); + } + /** * Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the * ListKeys operation for this. @@ -1043,9 +1415,11 @@ public StorageAccountInner update( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync() { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -1058,7 +1432,7 @@ public Mono> listSinglePageAsync() { context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), context)) @@ -1086,9 +1460,11 @@ public Mono> listSinglePageAsync() { */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync(Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -1097,7 +1473,7 @@ public Mono> listSinglePageAsync(Context cont "Parameter this.client.getSubscriptionId() is required and cannot be null.")); } return service - .list(this.client.getHost(), this.client.getApiVersion(), this.client.getSubscriptionId(), context) + .list(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), context) .map( res -> new PagedResponseBase<>( @@ -1150,6 +1526,21 @@ public PagedIterable list() { return new PagedIterable<>(listAsync()); } + /** + * Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the + * ListKeys operation for this. + * + * @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 response from the List Storage Accounts operation. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list(Context context) { + return new PagedIterable<>(listAsync(context)); + } + /** * Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; * use the ListKeys operation for this. @@ -1163,9 +1554,11 @@ public PagedIterable list() { */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listByResourceGroupSinglePageAsync(String resourceGroupName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1182,7 +1575,7 @@ public Mono> listByResourceGroupSinglePageAsy context -> service .listByResourceGroup( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, this.client.getApiVersion(), this.client.getSubscriptionId(), @@ -1209,9 +1602,11 @@ public Mono> listByResourceGroupSinglePageAsy @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listByResourceGroupSinglePageAsync( String resourceGroupName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1225,7 +1620,7 @@ public Mono> listByResourceGroupSinglePageAsy } return service .listByResourceGroup( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, this.client.getApiVersion(), this.client.getSubscriptionId(), @@ -1285,6 +1680,23 @@ public PagedIterable listByResourceGroup(String resourceGro return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName)); } + /** + * Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; + * use the ListKeys operation for this. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @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 response from the List Storage Accounts operation. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listByResourceGroup(String resourceGroupName, Context context) { + return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName, context)); + } + /** * Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage account. * @@ -1299,11 +1711,13 @@ public PagedIterable listByResourceGroup(String resourceGro * @return the response from the ListKeys operation. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listKeysWithResponseAsync( + public Mono> listKeysWithResponseAsync( String resourceGroupName, String accountName, ListKeyExpand expand) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1323,7 +1737,7 @@ public Mono> listKeysWithRespo context -> service .listKeys( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1348,11 +1762,13 @@ public Mono> listKeysWithRespo * @return the response from the ListKeys operation. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listKeysWithResponseAsync( + public Mono> listKeysWithResponseAsync( String resourceGroupName, String accountName, ListKeyExpand expand, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1369,7 +1785,7 @@ public Mono> listKeysWithRespo } return service .listKeys( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1396,7 +1812,35 @@ public Mono listKeysAsync( String resourceGroupName, String accountName, ListKeyExpand expand) { return listKeysWithResponseAsync(resourceGroupName, accountName, expand) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param expand Specifies type of the key to be listed. Possible value is kerb. + * @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 response from the ListKeys operation. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono listKeysAsync( + String resourceGroupName, String accountName, ListKeyExpand expand, Context context) { + return listKeysWithResponseAsync(resourceGroupName, accountName, expand, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1423,7 +1867,7 @@ public Mono listKeysAsync(String resourceGrou final Context context = null; return listKeysWithResponseAsync(resourceGroupName, accountName, expand) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1451,6 +1895,26 @@ public StorageAccountListKeysResultInner listKeys( return listKeysAsync(resourceGroupName, accountName, expand).block(); } + /** + * Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param expand Specifies type of the key to be listed. Possible value is kerb. + * @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 response from the ListKeys operation. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageAccountListKeysResultInner listKeys( + String resourceGroupName, String accountName, ListKeyExpand expand, Context context) { + return listKeysAsync(resourceGroupName, accountName, expand, context).block(); + } + /** * Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage account. * @@ -1485,11 +1949,13 @@ public StorageAccountListKeysResultInner listKeys(String resourceGroupName, Stri * @return the response from the ListKeys operation. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> regenerateKeyWithResponseAsync( + public Mono> regenerateKeyWithResponseAsync( String resourceGroupName, String accountName, String keyName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1514,7 +1980,7 @@ public Mono> regenerateKeyWith context -> service .regenerateKey( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1540,11 +2006,13 @@ public Mono> regenerateKeyWith * @return the response from the ListKeys operation. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> regenerateKeyWithResponseAsync( + public Mono> regenerateKeyWithResponseAsync( String resourceGroupName, String accountName, String keyName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1566,7 +2034,7 @@ public Mono> regenerateKeyWith regenerateKey.withKeyName(keyName); return service .regenerateKey( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1594,7 +2062,36 @@ public Mono regenerateKeyAsync( String resourceGroupName, String accountName, String keyName) { return regenerateKeyWithResponseAsync(resourceGroupName, accountName, keyName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Regenerates one of the access keys or Kerberos keys for the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2, kerb1, + * kerb2. + * @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 response from the ListKeys operation. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono regenerateKeyAsync( + String resourceGroupName, String accountName, String keyName, Context context) { + return regenerateKeyWithResponseAsync(resourceGroupName, accountName, keyName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1623,6 +2120,27 @@ public StorageAccountListKeysResultInner regenerateKey( return regenerateKeyAsync(resourceGroupName, accountName, keyName).block(); } + /** + * Regenerates one of the access keys or Kerberos keys for the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2, kerb1, + * kerb2. + * @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 response from the ListKeys operation. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageAccountListKeysResultInner regenerateKey( + String resourceGroupName, String accountName, String keyName, Context context) { + return regenerateKeyAsync(resourceGroupName, accountName, keyName, context).block(); + } + /** * List SAS credentials of a storage account. * @@ -1637,11 +2155,13 @@ public StorageAccountListKeysResultInner regenerateKey( * @return the List SAS credentials operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listAccountSasWithResponseAsync( + public Mono> listAccountSasWithResponseAsync( String resourceGroupName, String accountName, AccountSasParameters parameters) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1666,7 +2186,7 @@ public Mono> listAccountSasWithRespo context -> service .listAccountSas( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1691,11 +2211,13 @@ public Mono> listAccountSasWithRespo * @return the List SAS credentials operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listAccountSasWithResponseAsync( + public Mono> listAccountSasWithResponseAsync( String resourceGroupName, String accountName, AccountSasParameters parameters, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1717,7 +2239,7 @@ public Mono> listAccountSasWithRespo } return service .listAccountSas( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1744,7 +2266,35 @@ public Mono listAccountSasAsync( String resourceGroupName, String accountName, AccountSasParameters parameters) { return listAccountSasWithResponseAsync(resourceGroupName, accountName, parameters) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * List SAS credentials of a storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters to list SAS credentials of a storage account. + * @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 List SAS credentials operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono listAccountSasAsync( + String resourceGroupName, String accountName, AccountSasParameters parameters, Context context) { + return listAccountSasWithResponseAsync(resourceGroupName, accountName, parameters, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1773,24 +2323,46 @@ public ListAccountSasResponseInner listAccountSas( } /** - * List service SAS credentials of a specific resource. + * List SAS credentials of a storage account. * * @param resourceGroupName The name of the resource group within the user's subscription. The name is case * insensitive. * @param accountName The name of the storage account within the specified resource group. Storage account names * must be between 3 and 24 characters in length and use numbers and lower-case letters only. - * @param parameters The parameters to list service SAS credentials of a specific resource. + * @param parameters The parameters to list SAS credentials of a storage account. + * @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 List service SAS credentials operation response. + * @return the List SAS credentials operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listServiceSasWithResponseAsync( - String resourceGroupName, String accountName, ServiceSasParameters parameters) { - if (this.client.getHost() == null) { + public ListAccountSasResponseInner listAccountSas( + String resourceGroupName, String accountName, AccountSasParameters parameters, Context context) { + return listAccountSasAsync(resourceGroupName, accountName, parameters, context).block(); + } + + /** + * List service SAS credentials of a specific resource. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters to list service SAS credentials of a specific resource. + * @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 List service SAS credentials operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> listServiceSasWithResponseAsync( + String resourceGroupName, String accountName, ServiceSasParameters parameters) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1815,7 +2387,7 @@ public Mono> listServiceSasWithRespo context -> service .listServiceSas( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1840,11 +2412,13 @@ public Mono> listServiceSasWithRespo * @return the List service SAS credentials operation response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listServiceSasWithResponseAsync( + public Mono> listServiceSasWithResponseAsync( String resourceGroupName, String accountName, ServiceSasParameters parameters, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1866,7 +2440,7 @@ public Mono> listServiceSasWithRespo } return service .listServiceSas( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1893,7 +2467,35 @@ public Mono listServiceSasAsync( String resourceGroupName, String accountName, ServiceSasParameters parameters) { return listServiceSasWithResponseAsync(resourceGroupName, accountName, parameters) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * List service SAS credentials of a specific resource. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters to list service SAS credentials of a specific 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 List service SAS credentials operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono listServiceSasAsync( + String resourceGroupName, String accountName, ServiceSasParameters parameters, Context context) { + return listServiceSasWithResponseAsync(resourceGroupName, accountName, parameters, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -1921,6 +2523,26 @@ public ListServiceSasResponseInner listServiceSas( return listServiceSasAsync(resourceGroupName, accountName, parameters).block(); } + /** + * List service SAS credentials of a specific resource. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters to list service SAS credentials of a specific 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 List service SAS credentials operation response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ListServiceSasResponseInner listServiceSas( + String resourceGroupName, String accountName, ServiceSasParameters parameters, Context context) { + return listServiceSasAsync(resourceGroupName, accountName, parameters, context).block(); + } + /** * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become @@ -1936,11 +2558,12 @@ public ListServiceSasResponseInner listServiceSas( * @return the completion. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono>> failoverWithResponseAsync( - String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + public Mono>> failoverWithResponseAsync(String resourceGroupName, String accountName) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -1960,7 +2583,7 @@ public Mono>> failoverWithResponseAsync( context -> service .failover( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -1969,6 +2592,95 @@ public Mono>> failoverWithResponseAsync( .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()))); } + /** + * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from + * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become + * primary after failover. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono>> failoverWithResponseAsync( + String resourceGroupName, String accountName, Context context) { + if (this.client.getEndpoint() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (resourceGroupName == null) { + return Mono + .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.")); + } + if (accountName == null) { + return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null.")); + } + if (this.client.getSubscriptionId() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getSubscriptionId() is required and cannot be null.")); + } + return service + .failover( + this.client.getEndpoint(), + resourceGroupName, + accountName, + this.client.getApiVersion(), + this.client.getSubscriptionId(), + context); + } + + /** + * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from + * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become + * primary after failover. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PollerFlux, Void> beginFailover(String resourceGroupName, String accountName) { + Mono>> mono = failoverWithResponseAsync(resourceGroupName, accountName); + return this.client.getLroResultAsync(mono, this.client.getHttpPipeline(), Void.class, Void.class); + } + + /** + * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from + * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become + * primary after failover. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PollerFlux, Void> beginFailover( + String resourceGroupName, String accountName, Context context) { + Mono>> mono = failoverWithResponseAsync(resourceGroupName, accountName, context); + return this.client.getLroResultAsync(mono, this.client.getHttpPipeline(), Void.class, Void.class); + } + /** * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become @@ -1985,7 +2697,32 @@ public Mono>> failoverWithResponseAsync( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono failoverAsync(String resourceGroupName, String accountName) { - Mono>> mono = failoverWithResponseAsync(resourceGroupName, accountName); + Mono>> mono = failoverWithResponseAsync(resourceGroupName, accountName); + return this + .client + .getLroResultAsync(mono, this.client.getHttpPipeline(), Void.class, Void.class) + .last() + .flatMap(AsyncPollResponse::getFinalResult); + } + + /** + * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from + * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become + * primary after failover. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono failoverAsync(String resourceGroupName, String accountName, Context context) { + Mono>> mono = failoverWithResponseAsync(resourceGroupName, accountName, context); return this .client .getLroResultAsync(mono, this.client.getHttpPipeline(), Void.class, Void.class) @@ -2011,6 +2748,25 @@ public void failover(String resourceGroupName, String accountName) { failoverAsync(resourceGroupName, accountName).block(); } + /** + * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from + * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become + * primary after failover. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void failover(String resourceGroupName, String accountName, Context context) { + failoverAsync(resourceGroupName, accountName, context).block(); + } + /** * Restore blobs in the specified blob ranges. * @@ -2026,11 +2782,13 @@ public void failover(String resourceGroupName, String accountName) { * @return blob restore status. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono>> restoreBlobRangesWithResponseAsync( + public Mono>> restoreBlobRangesWithResponseAsync( String resourceGroupName, String accountName, OffsetDateTime timeToRestore, List blobRanges) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2061,7 +2819,7 @@ public Mono>> restoreBlobRangesWithResponseAsync context -> service .restoreBlobRanges( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2071,6 +2829,124 @@ public Mono>> restoreBlobRangesWithResponseAsync .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()))); } + /** + * Restore blobs in the specified blob ranges. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param timeToRestore Restore blob to the specified time. + * @param blobRanges Blob ranges to restore. + * @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 blob restore status. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono>> restoreBlobRangesWithResponseAsync( + String resourceGroupName, + String accountName, + OffsetDateTime timeToRestore, + List blobRanges, + Context context) { + if (this.client.getEndpoint() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (resourceGroupName == null) { + return Mono + .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.")); + } + if (accountName == null) { + return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null.")); + } + if (this.client.getSubscriptionId() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getSubscriptionId() is required and cannot be null.")); + } + if (timeToRestore == null) { + return Mono.error(new IllegalArgumentException("Parameter timeToRestore is required and cannot be null.")); + } + if (blobRanges == null) { + return Mono.error(new IllegalArgumentException("Parameter blobRanges is required and cannot be null.")); + } else { + blobRanges.forEach(e -> e.validate()); + } + BlobRestoreParameters parameters = new BlobRestoreParameters(); + parameters.withTimeToRestore(timeToRestore); + parameters.withBlobRanges(blobRanges); + return service + .restoreBlobRanges( + this.client.getEndpoint(), + resourceGroupName, + accountName, + this.client.getApiVersion(), + this.client.getSubscriptionId(), + parameters, + context); + } + + /** + * Restore blobs in the specified blob ranges. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param timeToRestore Restore blob to the specified time. + * @param blobRanges Blob ranges to restore. + * @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 blob restore status. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PollerFlux, BlobRestoreStatusInner> beginRestoreBlobRanges( + String resourceGroupName, String accountName, OffsetDateTime timeToRestore, List blobRanges) { + Mono>> mono = + restoreBlobRangesWithResponseAsync(resourceGroupName, accountName, timeToRestore, blobRanges); + return this + .client + .getLroResultAsync( + mono, this.client.getHttpPipeline(), BlobRestoreStatusInner.class, BlobRestoreStatusInner.class); + } + + /** + * Restore blobs in the specified blob ranges. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param timeToRestore Restore blob to the specified time. + * @param blobRanges Blob ranges to restore. + * @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 blob restore status. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PollerFlux, BlobRestoreStatusInner> beginRestoreBlobRanges( + String resourceGroupName, + String accountName, + OffsetDateTime timeToRestore, + List blobRanges, + Context context) { + Mono>> mono = + restoreBlobRangesWithResponseAsync(resourceGroupName, accountName, timeToRestore, blobRanges, context); + return this + .client + .getLroResultAsync( + mono, this.client.getHttpPipeline(), BlobRestoreStatusInner.class, BlobRestoreStatusInner.class); + } + /** * Restore blobs in the specified blob ranges. * @@ -2088,7 +2964,7 @@ public Mono>> restoreBlobRangesWithResponseAsync @ServiceMethod(returns = ReturnType.SINGLE) public Mono restoreBlobRangesAsync( String resourceGroupName, String accountName, OffsetDateTime timeToRestore, List blobRanges) { - Mono>> mono = + Mono>> mono = restoreBlobRangesWithResponseAsync(resourceGroupName, accountName, timeToRestore, blobRanges); return this .client @@ -2098,6 +2974,38 @@ public Mono restoreBlobRangesAsync( .flatMap(AsyncPollResponse::getFinalResult); } + /** + * Restore blobs in the specified blob ranges. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param timeToRestore Restore blob to the specified time. + * @param blobRanges Blob ranges to restore. + * @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 blob restore status. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono restoreBlobRangesAsync( + String resourceGroupName, + String accountName, + OffsetDateTime timeToRestore, + List blobRanges, + Context context) { + Mono>> mono = + restoreBlobRangesWithResponseAsync(resourceGroupName, accountName, timeToRestore, blobRanges, context); + return this + .client + .getLroResultAsync( + mono, this.client.getHttpPipeline(), BlobRestoreStatusInner.class, BlobRestoreStatusInner.class) + .last() + .flatMap(AsyncPollResponse::getFinalResult); + } + /** * Restore blobs in the specified blob ranges. * @@ -2118,6 +3026,31 @@ public BlobRestoreStatusInner restoreBlobRanges( return restoreBlobRangesAsync(resourceGroupName, accountName, timeToRestore, blobRanges).block(); } + /** + * Restore blobs in the specified blob ranges. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param timeToRestore Restore blob to the specified time. + * @param blobRanges Blob ranges to restore. + * @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 blob restore status. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobRestoreStatusInner restoreBlobRanges( + String resourceGroupName, + String accountName, + OffsetDateTime timeToRestore, + List blobRanges, + Context context) { + return restoreBlobRangesAsync(resourceGroupName, accountName, timeToRestore, blobRanges, context).block(); + } + /** * Revoke user delegation keys. * @@ -2133,9 +3066,11 @@ public BlobRestoreStatusInner restoreBlobRanges( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> revokeUserDelegationKeysWithResponseAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2155,7 +3090,7 @@ public Mono> revokeUserDelegationKeysWithResponseAsync( context -> service .revokeUserDelegationKeys( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2180,9 +3115,11 @@ public Mono> revokeUserDelegationKeysWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> revokeUserDelegationKeysWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2199,7 +3136,7 @@ public Mono> revokeUserDelegationKeysWithResponseAsync( } return service .revokeUserDelegationKeys( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2225,6 +3162,25 @@ public Mono revokeUserDelegationKeysAsync(String resourceGroupName, String .flatMap((Response res) -> Mono.empty()); } + /** + * Revoke user delegation keys. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono revokeUserDelegationKeysAsync(String resourceGroupName, String accountName, Context context) { + return revokeUserDelegationKeysWithResponseAsync(resourceGroupName, accountName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Revoke user delegation keys. * @@ -2241,6 +3197,23 @@ public void revokeUserDelegationKeys(String resourceGroupName, String accountNam revokeUserDelegationKeysAsync(resourceGroupName, accountName).block(); } + /** + * Revoke user delegation keys. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void revokeUserDelegationKeys(String resourceGroupName, String accountName, Context context) { + revokeUserDelegationKeysAsync(resourceGroupName, accountName, context).block(); + } + /** * Asynchronously creates a new storage account with the specified parameters. If an account is already created and * a subsequent create request is issued with different properties, the account properties will be updated. If an @@ -2258,11 +3231,13 @@ public void revokeUserDelegationKeys(String resourceGroupName, String accountNam * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> beginCreateWithResponseAsync( + public Mono> beginCreateWithoutPollingWithResponseAsync( String resourceGroupName, String accountName, StorageAccountCreateParameters parameters) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2286,8 +3261,8 @@ public Mono> beginCreateWithResponseAsync( .withContext( context -> service - .beginCreate( - this.client.getHost(), + .beginCreateWithoutPolling( + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2315,11 +3290,13 @@ public Mono> beginCreateWithResponseAsync( * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> beginCreateWithResponseAsync( + public Mono> beginCreateWithoutPollingWithResponseAsync( String resourceGroupName, String accountName, StorageAccountCreateParameters parameters, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2340,8 +3317,8 @@ public Mono> beginCreateWithResponseAsync( parameters.validate(); } return service - .beginCreate( - this.client.getHost(), + .beginCreateWithoutPolling( + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2367,11 +3344,42 @@ public Mono> beginCreateWithResponseAsync( * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono beginCreateAsync( + public Mono beginCreateWithoutPollingAsync( String resourceGroupName, String accountName, StorageAccountCreateParameters parameters) { - return beginCreateWithResponseAsync(resourceGroupName, accountName, parameters) + return beginCreateWithoutPollingWithResponseAsync(resourceGroupName, accountName, parameters) + .flatMap( + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Asynchronously creates a new storage account with the specified parameters. If an account is already created and + * a subsequent create request is issued with different properties, the account properties will be updated. If an + * account is already created and a subsequent create or update request is issued with the exact same set of + * properties, the request will succeed. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters used when creating a storage account. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono beginCreateWithoutPollingAsync( + String resourceGroupName, String accountName, StorageAccountCreateParameters parameters, Context context) { + return beginCreateWithoutPollingWithResponseAsync(resourceGroupName, accountName, parameters, context) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -2397,9 +3405,32 @@ public Mono beginCreateAsync( * @return the storage account. */ @ServiceMethod(returns = ReturnType.SINGLE) - public StorageAccountInner beginCreate( + public StorageAccountInner beginCreateWithoutPolling( String resourceGroupName, String accountName, StorageAccountCreateParameters parameters) { - return beginCreateAsync(resourceGroupName, accountName, parameters).block(); + return beginCreateWithoutPollingAsync(resourceGroupName, accountName, parameters).block(); + } + + /** + * Asynchronously creates a new storage account with the specified parameters. If an account is already created and + * a subsequent create request is issued with different properties, the account properties will be updated. If an + * account is already created and a subsequent create or update request is issued with the exact same set of + * properties, the request will succeed. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param parameters The parameters used when creating a storage account. + * @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 storage account. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public StorageAccountInner beginCreateWithoutPolling( + String resourceGroupName, String accountName, StorageAccountCreateParameters parameters, Context context) { + return beginCreateWithoutPollingAsync(resourceGroupName, accountName, parameters, context).block(); } /** @@ -2417,10 +3448,13 @@ public StorageAccountInner beginCreate( * @return the completion. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> beginFailoverWithResponseAsync(String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + public Mono> beginFailoverWithoutPollingWithResponseAsync( + String resourceGroupName, String accountName) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2439,8 +3473,8 @@ public Mono> beginFailoverWithResponseAsync(String resourceGroupN .withContext( context -> service - .beginFailover( - this.client.getHost(), + .beginFailoverWithoutPolling( + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2465,11 +3499,13 @@ public Mono> beginFailoverWithResponseAsync(String resourceGroupN * @return the completion. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> beginFailoverWithResponseAsync( + public Mono> beginFailoverWithoutPollingWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2485,8 +3521,8 @@ public Mono> beginFailoverWithResponseAsync( "Parameter this.client.getSubscriptionId() is required and cannot be null.")); } return service - .beginFailover( - this.client.getHost(), + .beginFailoverWithoutPolling( + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2509,8 +3545,29 @@ public Mono> beginFailoverWithResponseAsync( * @return the completion. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono beginFailoverAsync(String resourceGroupName, String accountName) { - return beginFailoverWithResponseAsync(resourceGroupName, accountName) + public Mono beginFailoverWithoutPollingAsync(String resourceGroupName, String accountName) { + return beginFailoverWithoutPollingWithResponseAsync(resourceGroupName, accountName) + .flatMap((Response res) -> Mono.empty()); + } + + /** + * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from + * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become + * primary after failover. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono beginFailoverWithoutPollingAsync(String resourceGroupName, String accountName, Context context) { + return beginFailoverWithoutPollingWithResponseAsync(resourceGroupName, accountName, context) .flatMap((Response res) -> Mono.empty()); } @@ -2528,8 +3585,27 @@ public Mono beginFailoverAsync(String resourceGroupName, String accountNam * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ @ServiceMethod(returns = ReturnType.SINGLE) - public void beginFailover(String resourceGroupName, String accountName) { - beginFailoverAsync(resourceGroupName, accountName).block(); + public void beginFailoverWithoutPolling(String resourceGroupName, String accountName) { + beginFailoverWithoutPollingAsync(resourceGroupName, accountName).block(); + } + + /** + * Failover request can be triggered for a storage account in case of availability issues. The failover occurs from + * the storage account's primary cluster to secondary cluster for RA-GRS accounts. The secondary cluster will become + * primary after failover. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void beginFailoverWithoutPolling(String resourceGroupName, String accountName, Context context) { + beginFailoverWithoutPollingAsync(resourceGroupName, accountName, context).block(); } /** @@ -2547,11 +3623,13 @@ public void beginFailover(String resourceGroupName, String accountName) { * @return blob restore status. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> beginRestoreBlobRangesWithResponseAsync( + public Mono> beginRestoreBlobRangesWithoutPollingWithResponseAsync( String resourceGroupName, String accountName, OffsetDateTime timeToRestore, List blobRanges) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2581,8 +3659,8 @@ public Mono> beginRestoreBlobRangesWithRe .withContext( context -> service - .beginRestoreBlobRanges( - this.client.getHost(), + .beginRestoreBlobRangesWithoutPolling( + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2608,15 +3686,17 @@ public Mono> beginRestoreBlobRangesWithRe * @return blob restore status. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> beginRestoreBlobRangesWithResponseAsync( + public Mono> beginRestoreBlobRangesWithoutPollingWithResponseAsync( String resourceGroupName, String accountName, OffsetDateTime timeToRestore, List blobRanges, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -2643,8 +3723,8 @@ public Mono> beginRestoreBlobRangesWithRe parameters.withTimeToRestore(timeToRestore); parameters.withBlobRanges(blobRanges); return service - .beginRestoreBlobRanges( - this.client.getHost(), + .beginRestoreBlobRangesWithoutPolling( + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -2668,11 +3748,46 @@ public Mono> beginRestoreBlobRangesWithRe * @return blob restore status. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono beginRestoreBlobRangesAsync( + public Mono beginRestoreBlobRangesWithoutPollingAsync( String resourceGroupName, String accountName, OffsetDateTime timeToRestore, List blobRanges) { - return beginRestoreBlobRangesWithResponseAsync(resourceGroupName, accountName, timeToRestore, blobRanges) + return beginRestoreBlobRangesWithoutPollingWithResponseAsync( + resourceGroupName, accountName, timeToRestore, blobRanges) + .flatMap( + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Restore blobs in the specified blob ranges. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param timeToRestore Restore blob to the specified time. + * @param blobRanges Blob ranges to restore. + * @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 blob restore status. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono beginRestoreBlobRangesWithoutPollingAsync( + String resourceGroupName, + String accountName, + OffsetDateTime timeToRestore, + List blobRanges, + Context context) { + return beginRestoreBlobRangesWithoutPollingWithResponseAsync( + resourceGroupName, accountName, timeToRestore, blobRanges, context) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -2696,9 +3811,37 @@ public Mono beginRestoreBlobRangesAsync( * @return blob restore status. */ @ServiceMethod(returns = ReturnType.SINGLE) - public BlobRestoreStatusInner beginRestoreBlobRanges( + public BlobRestoreStatusInner beginRestoreBlobRangesWithoutPolling( String resourceGroupName, String accountName, OffsetDateTime timeToRestore, List blobRanges) { - return beginRestoreBlobRangesAsync(resourceGroupName, accountName, timeToRestore, blobRanges).block(); + return beginRestoreBlobRangesWithoutPollingAsync(resourceGroupName, accountName, timeToRestore, blobRanges) + .block(); + } + + /** + * Restore blobs in the specified blob ranges. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param timeToRestore Restore blob to the specified time. + * @param blobRanges Blob ranges to restore. + * @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 blob restore status. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public BlobRestoreStatusInner beginRestoreBlobRangesWithoutPolling( + String resourceGroupName, + String accountName, + OffsetDateTime timeToRestore, + List blobRanges, + Context context) { + return beginRestoreBlobRangesWithoutPollingAsync( + resourceGroupName, accountName, timeToRestore, blobRanges, context) + .block(); } /** diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableServicesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/TableServicesClient.java similarity index 68% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableServicesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/TableServicesClient.java index f07d3d96452b..177b039966dd 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableServicesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/TableServicesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; @@ -17,31 +17,34 @@ import com.azure.core.annotation.ServiceInterface; import com.azure.core.annotation.ServiceMethod; import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.CorsRules; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.ListTableServicesInner; +import com.azure.management.storage.fluent.inner.TableServicePropertiesInner; +import com.azure.management.storage.models.CorsRules; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in TableServices. */ -public final class TableServicesInner { - private final ClientLogger logger = new ClientLogger(TableServicesInner.class); +public final class TableServicesClient { + private final ClientLogger logger = new ClientLogger(TableServicesClient.class); /** The proxy service used to perform REST calls. */ private final TableServicesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of TableServicesInner. + * Initializes an instance of TableServicesClient. * * @param client the instance of the service client containing this operation class. */ - TableServicesInner(StorageManagementClientImpl client) { + public TableServicesClient(StorageManagementClient client) { this.service = RestProxy.create(TableServicesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; @@ -60,8 +63,8 @@ private interface TableServicesService { + "/storageAccounts/{accountName}/tableServices") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -74,8 +77,8 @@ Mono> list( + "/storageAccounts/{accountName}/tableServices/{tableServiceName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> setServiceProperties( - @HostParam("$host") String host, + Mono> setServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -90,8 +93,8 @@ Mono> setServiceProperties( + "/storageAccounts/{accountName}/tableServices/{tableServiceName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getServiceProperties( - @HostParam("$host") String host, + Mono> getServiceProperties( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -113,11 +116,12 @@ Mono> getServiceProperties( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listWithResponseAsync( - String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + public Mono> listWithResponseAsync(String resourceGroupName, String accountName) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -137,7 +141,7 @@ public Mono> listWithResponseAsync( context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -160,11 +164,13 @@ public Mono> listWithResponseAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> listWithResponseAsync( + public Mono> listWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -181,7 +187,7 @@ public Mono> listWithResponseAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -205,7 +211,33 @@ public Mono> listWithResponseAsync( public Mono listAsync(String resourceGroupName, String accountName) { return listWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * List all table services for the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono listAsync(String resourceGroupName, String accountName, Context context) { + return listWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -231,6 +263,24 @@ public ListTableServicesInner list(String resourceGroupName, String accountName) return listAsync(resourceGroupName, accountName).block(); } + /** + * List all table services for the storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ListTableServicesInner list(String resourceGroupName, String accountName, Context context) { + return listAsync(resourceGroupName, accountName, context).block(); + } + /** * Sets the properties of a storage account’s Table service, including properties for Storage Analytics and CORS * (Cross-Origin Resource Sharing) rules. @@ -246,11 +296,13 @@ public ListTableServicesInner list(String resourceGroupName, String accountName) * @return the properties of a storage account’s Table service. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, CorsRules cors) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -276,7 +328,7 @@ public Mono> setServicePropertiesWit context -> service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -303,11 +355,13 @@ public Mono> setServicePropertiesWit * @return the properties of a storage account’s Table service. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> setServicePropertiesWithResponseAsync( + public Mono> setServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, CorsRules cors, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -330,7 +384,7 @@ public Mono> setServicePropertiesWit parameters.withCors(cors); return service .setServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -359,7 +413,36 @@ public Mono setServicePropertiesAsync( String resourceGroupName, String accountName, CorsRules cors) { return setServicePropertiesWithResponseAsync(resourceGroupName, accountName, cors) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Sets the properties of a storage account’s Table service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param cors Sets the CORS rules. You can include up to five CorsRule elements in the request. + * @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 properties of a storage account’s Table service. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono setServicePropertiesAsync( + String resourceGroupName, String accountName, CorsRules cors, Context context) { + return setServicePropertiesWithResponseAsync(resourceGroupName, accountName, cors, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -388,6 +471,27 @@ public TableServicePropertiesInner setServiceProperties( return setServicePropertiesAsync(resourceGroupName, accountName, cors).block(); } + /** + * Sets the properties of a storage account’s Table service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param cors Sets the CORS rules. You can include up to five CorsRule elements in the request. + * @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 properties of a storage account’s Table service. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public TableServicePropertiesInner setServiceProperties( + String resourceGroupName, String accountName, CorsRules cors, Context context) { + return setServicePropertiesAsync(resourceGroupName, accountName, cors, context).block(); + } + /** * Gets the properties of a storage account’s Table service, including properties for Storage Analytics and CORS * (Cross-Origin Resource Sharing) rules. @@ -403,11 +507,13 @@ public TableServicePropertiesInner setServiceProperties( * (Cross-Origin Resource Sharing) rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -428,7 +534,7 @@ public Mono> getServicePropertiesWit context -> service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -454,11 +560,13 @@ public Mono> getServicePropertiesWit * (Cross-Origin Resource Sharing) rules. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getServicePropertiesWithResponseAsync( + public Mono> getServicePropertiesWithResponseAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -476,7 +584,7 @@ public Mono> getServicePropertiesWit final String tableServiceName = "default"; return service .getServiceProperties( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -503,7 +611,36 @@ public Mono> getServicePropertiesWit public Mono getServicePropertiesAsync(String resourceGroupName, String accountName) { return getServicePropertiesWithResponseAsync(resourceGroupName, accountName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the properties of a storage account’s Table service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of a storage account’s Table service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getServicePropertiesAsync( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesWithResponseAsync(resourceGroupName, accountName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -530,4 +667,25 @@ public Mono getServicePropertiesAsync(String resour public TableServicePropertiesInner getServiceProperties(String resourceGroupName, String accountName) { return getServicePropertiesAsync(resourceGroupName, accountName).block(); } + + /** + * Gets the properties of a storage account’s Table service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 properties of a storage account’s Table service, including properties for Storage Analytics and CORS + * (Cross-Origin Resource Sharing) rules. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public TableServicePropertiesInner getServiceProperties( + String resourceGroupName, String accountName, Context context) { + return getServicePropertiesAsync(resourceGroupName, accountName, context).block(); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TablesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/TablesClient.java similarity index 73% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TablesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/TablesClient.java index 434023aa3498..3cfa14b168c3 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TablesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/TablesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.Delete; import com.azure.core.annotation.ExpectedResponses; @@ -24,29 +24,31 @@ import com.azure.core.http.rest.PagedResponseBase; import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.ListTableResourceInner; +import com.azure.management.storage.fluent.inner.TableInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in Tables. */ -public final class TablesInner { - private final ClientLogger logger = new ClientLogger(TablesInner.class); +public final class TablesClient { + private final ClientLogger logger = new ClientLogger(TablesClient.class); /** The proxy service used to perform REST calls. */ private final TablesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of TablesInner. + * Initializes an instance of TablesClient. * * @param client the instance of the service client containing this operation class. */ - TablesInner(StorageManagementClientImpl client) { + public TablesClient(StorageManagementClient client) { this.service = RestProxy.create(TablesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; } @@ -64,8 +66,8 @@ private interface TablesService { + "/storageAccounts/{accountName}/tableServices/default/tables/{tableName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> create( - @HostParam("$host") String host, + Mono> create( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -79,8 +81,8 @@ Mono> create( + "/storageAccounts/{accountName}/tableServices/default/tables/{tableName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> update( - @HostParam("$host") String host, + Mono> update( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -94,8 +96,8 @@ Mono> update( + "/storageAccounts/{accountName}/tableServices/default/tables/{tableName}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> get( - @HostParam("$host") String host, + Mono> get( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -110,7 +112,7 @@ Mono> get( @ExpectedResponses({204}) @UnexpectedResponseExceptionType(ManagementException.class) Mono> delete( - @HostParam("$host") String host, + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -124,8 +126,8 @@ Mono> delete( + "/storageAccounts/{accountName}/tableServices/default/tables") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> list( - @HostParam("$host") String host, + Mono> list( + @HostParam("$host") String endpoint, @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName, @QueryParam("api-version") String apiVersion, @@ -136,7 +138,7 @@ Mono> list( @Get("{nextLink}") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listNext( + Mono> listNext( @PathParam(value = "nextLink", encoded = true) String nextLink, Context context); } @@ -155,11 +157,13 @@ Mono> listNext( * @return properties of the table, including Id, resource name, resource type. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String tableName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -182,7 +186,7 @@ public Mono> createWithResponseAsync( context -> service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -208,11 +212,13 @@ public Mono> createWithResponseAsync( * @return properties of the table, including Id, resource name, resource type. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync( + public Mono> createWithResponseAsync( String resourceGroupName, String accountName, String tableName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -232,7 +238,7 @@ public Mono> createWithResponseAsync( } return service .create( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -259,7 +265,36 @@ public Mono> createWithResponseAsync( public Mono createAsync(String resourceGroupName, String accountName, String tableName) { return createWithResponseAsync(resourceGroupName, accountName, tableName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Creates a new table with the specified table name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 properties of the table, including Id, resource name, resource type. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono createAsync( + String resourceGroupName, String accountName, String tableName, Context context) { + return createWithResponseAsync(resourceGroupName, accountName, tableName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -296,17 +331,39 @@ public TableInner create(String resourceGroupName, String accountName, String ta * must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 properties of the table, including Id, resource name, resource type. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public TableInner create(String resourceGroupName, String accountName, String tableName, Context context) { + return createAsync(resourceGroupName, accountName, tableName, context).block(); + } + + /** + * Creates a new table with the specified table name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 properties of the table, including Id, resource name, resource type. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String tableName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -329,7 +386,7 @@ public Mono> updateWithResponseAsync( context -> service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -355,11 +412,13 @@ public Mono> updateWithResponseAsync( * @return properties of the table, including Id, resource name, resource type. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateWithResponseAsync( + public Mono> updateWithResponseAsync( String resourceGroupName, String accountName, String tableName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -379,7 +438,7 @@ public Mono> updateWithResponseAsync( } return service .update( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -406,7 +465,36 @@ public Mono> updateWithResponseAsync( public Mono updateAsync(String resourceGroupName, String accountName, String tableName) { return updateWithResponseAsync(resourceGroupName, accountName, tableName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Creates a new table with the specified table name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 properties of the table, including Id, resource name, resource type. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono updateAsync( + String resourceGroupName, String accountName, String tableName, Context context) { + return updateWithResponseAsync(resourceGroupName, accountName, tableName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -434,6 +522,26 @@ public TableInner update(String resourceGroupName, String accountName, String ta return updateAsync(resourceGroupName, accountName, tableName).block(); } + /** + * Creates a new table with the specified table name, under the specified account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 properties of the table, including Id, resource name, resource type. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public TableInner update(String resourceGroupName, String accountName, String tableName, Context context) { + return updateAsync(resourceGroupName, accountName, tableName, context).block(); + } + /** * Gets the table with the specified table name, under the specified account if it exists. * @@ -449,11 +557,13 @@ public TableInner update(String resourceGroupName, String accountName, String ta * @return the table with the specified table name, under the specified account if it exists. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String tableName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -476,7 +586,7 @@ public Mono> getWithResponseAsync( context -> service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -502,11 +612,13 @@ public Mono> getWithResponseAsync( * @return the table with the specified table name, under the specified account if it exists. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync( + public Mono> getWithResponseAsync( String resourceGroupName, String accountName, String tableName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -526,7 +638,7 @@ public Mono> getWithResponseAsync( } return service .get( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -553,7 +665,35 @@ public Mono> getWithResponseAsync( public Mono getAsync(String resourceGroupName, String accountName, String tableName) { return getWithResponseAsync(resourceGroupName, accountName, tableName) .flatMap( - (SimpleResponse res) -> { + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Gets the table with the specified table name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 table with the specified table name, under the specified account if it exists. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono getAsync(String resourceGroupName, String accountName, String tableName, Context context) { + return getWithResponseAsync(resourceGroupName, accountName, tableName, context) + .flatMap( + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -581,6 +721,26 @@ public TableInner get(String resourceGroupName, String accountName, String table return getAsync(resourceGroupName, accountName, tableName).block(); } + /** + * Gets the table with the specified table name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 table with the specified table name, under the specified account if it exists. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public TableInner get(String resourceGroupName, String accountName, String tableName, Context context) { + return getAsync(resourceGroupName, accountName, tableName, context).block(); + } + /** * Deletes the table with the specified table name, under the specified account if it exists. * @@ -598,9 +758,11 @@ public TableInner get(String resourceGroupName, String accountName, String table @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String tableName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -623,7 +785,7 @@ public Mono> deleteWithResponseAsync( context -> service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -651,9 +813,11 @@ public Mono> deleteWithResponseAsync( @ServiceMethod(returns = ReturnType.SINGLE) public Mono> deleteWithResponseAsync( String resourceGroupName, String accountName, String tableName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -673,7 +837,7 @@ public Mono> deleteWithResponseAsync( } return service .delete( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -702,6 +866,27 @@ public Mono deleteAsync(String resourceGroupName, String accountName, Stri .flatMap((Response res) -> Mono.empty()); } + /** + * Deletes the table with the specified table name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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 completion. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono deleteAsync(String resourceGroupName, String accountName, String tableName, Context context) { + return deleteWithResponseAsync(resourceGroupName, accountName, tableName, context) + .flatMap((Response res) -> Mono.empty()); + } + /** * Deletes the table with the specified table name, under the specified account if it exists. * @@ -720,6 +905,25 @@ public void delete(String resourceGroupName, String accountName, String tableNam deleteAsync(resourceGroupName, accountName, tableName).block(); } + /** + * Deletes the table with the specified table name, under the specified account if it exists. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @param tableName A table name must be unique within a storage account and must be between 3 and 63 characters.The + * name must comprise of only alphanumeric characters and it cannot begin with a numeric character. + * @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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void delete(String resourceGroupName, String accountName, String tableName, Context context) { + deleteAsync(resourceGroupName, accountName, tableName, context).block(); + } + /** * Gets a list of all the tables under the specified storage account. * @@ -734,9 +938,11 @@ public void delete(String resourceGroupName, String accountName, String tableNam */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync(String resourceGroupName, String accountName) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -756,7 +962,7 @@ public Mono> listSinglePageAsync(String resourceGroupN context -> service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -790,9 +996,11 @@ public Mono> listSinglePageAsync(String resourceGroupN @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listSinglePageAsync( String resourceGroupName, String accountName, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (resourceGroupName == null) { return Mono @@ -809,7 +1017,7 @@ public Mono> listSinglePageAsync( } return service .list( - this.client.getHost(), + this.client.getEndpoint(), resourceGroupName, accountName, this.client.getApiVersion(), @@ -881,6 +1089,24 @@ public PagedIterable list(String resourceGroupName, String accountNa return new PagedIterable<>(listAsync(resourceGroupName, accountName)); } + /** + * Gets a list of all the tables under the specified storage account. + * + * @param resourceGroupName The name of the resource group within the user's subscription. The name is case + * insensitive. + * @param accountName The name of the storage account within the specified resource group. Storage account names + * must be between 3 and 24 characters in length and use numbers and lower-case letters only. + * @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 a list of all the tables under the specified storage account. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list(String resourceGroupName, String accountName, Context context) { + return new PagedIterable<>(listAsync(resourceGroupName, accountName, context)); + } + /** * Get the next page of items. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsagesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/UsagesClient.java similarity index 78% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsagesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/UsagesClient.java index 5033000f70dd..ab673d8919d9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsagesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/UsagesClient.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; @@ -19,30 +19,33 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.PagedResponseBase; +import com.azure.core.http.rest.Response; import com.azure.core.http.rest.RestProxy; -import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; +import com.azure.management.storage.StorageManagementClient; +import com.azure.management.storage.fluent.inner.UsageInner; +import com.azure.management.storage.fluent.inner.UsageListResultInner; import reactor.core.publisher.Mono; /** An instance of this class provides access to all the operations defined in Usages. */ -public final class UsagesInner { - private final ClientLogger logger = new ClientLogger(UsagesInner.class); +public final class UsagesClient { + private final ClientLogger logger = new ClientLogger(UsagesClient.class); /** The proxy service used to perform REST calls. */ private final UsagesService service; /** The service client containing this operation class. */ - private final StorageManagementClientImpl client; + private final StorageManagementClient client; /** - * Initializes an instance of UsagesInner. + * Initializes an instance of UsagesClient. * * @param client the instance of the service client containing this operation class. */ - UsagesInner(StorageManagementClientImpl client) { + public UsagesClient(StorageManagementClient client) { this.service = RestProxy.create(UsagesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); this.client = client; } @@ -58,8 +61,8 @@ private interface UsagesService { @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Storage/locations/{location}/usages") @ExpectedResponses({200}) @UnexpectedResponseExceptionType(ManagementException.class) - Mono> listByLocation( - @HostParam("$host") String host, + Mono> listByLocation( + @HostParam("$host") String endpoint, @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location, @@ -77,9 +80,11 @@ Mono> listByLocation( */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listByLocationSinglePageAsync(String location) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -95,7 +100,7 @@ public Mono> listByLocationSinglePageAsync(String loca context -> service .listByLocation( - this.client.getHost(), + this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), location, @@ -119,9 +124,11 @@ public Mono> listByLocationSinglePageAsync(String loca */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono> listByLocationSinglePageAsync(String location, Context context) { - if (this.client.getHost() == null) { + if (this.client.getEndpoint() == null) { return Mono - .error(new IllegalArgumentException("Parameter this.client.getHost() is required and cannot be null.")); + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); } if (this.client.getSubscriptionId() == null) { return Mono @@ -134,7 +141,11 @@ public Mono> listByLocationSinglePageAsync(String loca } return service .listByLocation( - this.client.getHost(), this.client.getApiVersion(), this.client.getSubscriptionId(), location, context) + this.client.getEndpoint(), + this.client.getApiVersion(), + this.client.getSubscriptionId(), + location, + context) .map( res -> new PagedResponseBase<>( @@ -183,4 +194,19 @@ public PagedFlux listByLocationAsync(String location, Context contex public PagedIterable listByLocation(String location) { return new PagedIterable<>(listByLocationAsync(location)); } + + /** + * Gets the current usage count and the limit for the resources of the location under the subscription. + * + * @param location The location of the Azure Storage 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 current usage count and the limit for the resources of the location under the subscription. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable listByLocation(String location, Context context) { + return new PagedIterable<>(listByLocationAsync(location, context)); + } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainerInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobContainerInner.java similarity index 81% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainerInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobContainerInner.java index 3ddad827f794..175a66c7843f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainerInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobContainerInner.java @@ -2,18 +2,18 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.AzureEntityResource; -import com.azure.management.storage.ImmutabilityPolicyProperties; -import com.azure.management.storage.LeaseDuration; -import com.azure.management.storage.LeaseState; -import com.azure.management.storage.LeaseStatus; -import com.azure.management.storage.LegalHoldProperties; -import com.azure.management.storage.PublicAccess; +import com.azure.management.storage.models.AzureEntityResource; +import com.azure.management.storage.models.ImmutabilityPolicyProperties; +import com.azure.management.storage.models.LeaseDuration; +import com.azure.management.storage.models.LeaseState; +import com.azure.management.storage.models.LeaseStatus; +import com.azure.management.storage.models.LegalHoldProperties; +import com.azure.management.storage.models.PublicAccess; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; @@ -25,6 +25,30 @@ public class BlobContainerInner extends AzureEntityResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(BlobContainerInner.class); + /* + * The version of the deleted blob container. + */ + @JsonProperty(value = "properties.version", access = JsonProperty.Access.WRITE_ONLY) + private String version; + + /* + * Indicates whether the blob container was deleted. + */ + @JsonProperty(value = "properties.deleted", access = JsonProperty.Access.WRITE_ONLY) + private Boolean deleted; + + /* + * Blob container deletion time. + */ + @JsonProperty(value = "properties.deletedTime", access = JsonProperty.Access.WRITE_ONLY) + private OffsetDateTime deletedTime; + + /* + * Remaining retention days for soft deleted blob container. + */ + @JsonProperty(value = "properties.remainingRetentionDays", access = JsonProperty.Access.WRITE_ONLY) + private Integer remainingRetentionDays; + /* * Default the container to use specified encryption scope for all writes. */ @@ -106,6 +130,42 @@ public class BlobContainerInner extends AzureEntityResource { @JsonProperty(value = "properties.hasImmutabilityPolicy", access = JsonProperty.Access.WRITE_ONLY) private Boolean hasImmutabilityPolicy; + /** + * Get the version property: The version of the deleted blob container. + * + * @return the version value. + */ + public String version() { + return this.version; + } + + /** + * Get the deleted property: Indicates whether the blob container was deleted. + * + * @return the deleted value. + */ + public Boolean deleted() { + return this.deleted; + } + + /** + * Get the deletedTime property: Blob container deletion time. + * + * @return the deletedTime value. + */ + public OffsetDateTime deletedTime() { + return this.deletedTime; + } + + /** + * Get the remainingRetentionDays property: Remaining retention days for soft deleted blob container. + * + * @return the remainingRetentionDays value. + */ + public Integer remainingRetentionDays() { + return this.remainingRetentionDays; + } + /** * Get the defaultEncryptionScope property: Default the container to use specified encryption scope for all writes. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreStatusInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobRestoreStatusInner.java similarity index 93% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreStatusInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobRestoreStatusInner.java index 397ebc2e9804..d19a5e6adb67 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreStatusInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobRestoreStatusInner.java @@ -2,12 +2,12 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.BlobRestoreParameters; -import com.azure.management.storage.BlobRestoreProgressStatus; +import com.azure.management.storage.models.BlobRestoreParameters; +import com.azure.management.storage.models.BlobRestoreProgressStatus; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServiceItemsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobServiceItemsInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServiceItemsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobServiceItemsInner.java index 76fcd28ac5a1..ac4886c0d344 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServiceItemsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobServiceItemsInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServicePropertiesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobServicePropertiesInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServicePropertiesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobServicePropertiesInner.java index 8d5eb31af96e..e575827c854e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServicePropertiesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/BlobServicePropertiesInner.java @@ -2,17 +2,17 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.ChangeFeed; -import com.azure.management.storage.CorsRules; -import com.azure.management.storage.DeleteRetentionPolicy; -import com.azure.management.storage.RestorePolicyProperties; -import com.azure.management.storage.Sku; +import com.azure.management.storage.models.ChangeFeed; +import com.azure.management.storage.models.CorsRules; +import com.azure.management.storage.models.DeleteRetentionPolicy; +import com.azure.management.storage.models.RestorePolicyProperties; +import com.azure.management.storage.models.Sku; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CheckNameAvailabilityResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/CheckNameAvailabilityResultInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CheckNameAvailabilityResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/CheckNameAvailabilityResultInner.java index 30a8d9dd556d..2dfa8937c6be 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CheckNameAvailabilityResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/CheckNameAvailabilityResultInner.java @@ -2,11 +2,11 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.Reason; +import com.azure.management.storage.models.Reason; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/EncryptionScopeInner.java similarity index 94% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/EncryptionScopeInner.java index 0e88ab4eec47..e4de95331d36 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/EncryptionScopeInner.java @@ -2,15 +2,15 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.EncryptionScopeKeyVaultProperties; -import com.azure.management.storage.EncryptionScopeSource; -import com.azure.management.storage.EncryptionScopeState; +import com.azure.management.storage.models.EncryptionScopeKeyVaultProperties; +import com.azure.management.storage.models.EncryptionScopeSource; +import com.azure.management.storage.models.EncryptionScopeState; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeListResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/EncryptionScopeListResultInner.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeListResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/EncryptionScopeListResultInner.java index 47276dced549..023f930b8083 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeListResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/EncryptionScopeListResultInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServiceItemsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileServiceItemsInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServiceItemsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileServiceItemsInner.java index 8eac1c18ff35..15721f52f478 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServiceItemsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileServiceItemsInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServicePropertiesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileServicePropertiesInner.java similarity index 94% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServicePropertiesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileServicePropertiesInner.java index a07ae3be12b9..986fea48bdf2 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileServicePropertiesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileServicePropertiesInner.java @@ -2,15 +2,15 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.CorsRules; -import com.azure.management.storage.DeleteRetentionPolicy; -import com.azure.management.storage.Sku; +import com.azure.management.storage.models.CorsRules; +import com.azure.management.storage.models.DeleteRetentionPolicy; +import com.azure.management.storage.models.Sku; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareInner.java index 98cf4ad42bb3..49e7a2d744a4 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareInner.java @@ -2,15 +2,15 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.AzureEntityResource; -import com.azure.management.storage.EnabledProtocols; -import com.azure.management.storage.RootSquashType; -import com.azure.management.storage.ShareAccessTier; +import com.azure.management.storage.models.AzureEntityResource; +import com.azure.management.storage.models.EnabledProtocols; +import com.azure.management.storage.models.RootSquashType; +import com.azure.management.storage.models.ShareAccessTier; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareItemInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareItemInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareItemInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareItemInner.java index 698ba52be871..86229544c071 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareItemInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareItemInner.java @@ -2,15 +2,15 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.AzureEntityResource; -import com.azure.management.storage.EnabledProtocols; -import com.azure.management.storage.RootSquashType; -import com.azure.management.storage.ShareAccessTier; +import com.azure.management.storage.models.AzureEntityResource; +import com.azure.management.storage.models.EnabledProtocols; +import com.azure.management.storage.models.RootSquashType; +import com.azure.management.storage.models.ShareAccessTier; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareItemsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareItemsInner.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareItemsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareItemsInner.java index 674d233d342e..ced75fb3ac5d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/FileShareItemsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/FileShareItemsInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ImmutabilityPolicyInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ImmutabilityPolicyInner.java index 31f95ef8e8de..75391a21d25b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ImmutabilityPolicyInner.java @@ -2,13 +2,13 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.AzureEntityResource; -import com.azure.management.storage.ImmutabilityPolicyState; +import com.azure.management.storage.models.AzureEntityResource; +import com.azure.management.storage.models.ImmutabilityPolicyState; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerResponseInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/LeaseContainerResponseInner.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerResponseInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/LeaseContainerResponseInner.java index d3e0ad05df92..d472ff3a655e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerResponseInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/LeaseContainerResponseInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHoldInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/LegalHoldInner.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHoldInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/LegalHoldInner.java index ef981b7c2c63..a083f035f715 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHoldInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/LegalHoldInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListAccountSasResponseInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListAccountSasResponseInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListAccountSasResponseInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListAccountSasResponseInner.java index eeaae5973737..324da5a16600 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListAccountSasResponseInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListAccountSasResponseInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListContainerItemInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListContainerItemInner.java similarity index 81% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListContainerItemInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListContainerItemInner.java index 52c6f84de5a5..1dffc1dce449 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListContainerItemInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListContainerItemInner.java @@ -2,18 +2,18 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.AzureEntityResource; -import com.azure.management.storage.ImmutabilityPolicyProperties; -import com.azure.management.storage.LeaseDuration; -import com.azure.management.storage.LeaseState; -import com.azure.management.storage.LeaseStatus; -import com.azure.management.storage.LegalHoldProperties; -import com.azure.management.storage.PublicAccess; +import com.azure.management.storage.models.AzureEntityResource; +import com.azure.management.storage.models.ImmutabilityPolicyProperties; +import com.azure.management.storage.models.LeaseDuration; +import com.azure.management.storage.models.LeaseState; +import com.azure.management.storage.models.LeaseStatus; +import com.azure.management.storage.models.LegalHoldProperties; +import com.azure.management.storage.models.PublicAccess; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; @@ -25,6 +25,30 @@ public class ListContainerItemInner extends AzureEntityResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(ListContainerItemInner.class); + /* + * The version of the deleted blob container. + */ + @JsonProperty(value = "properties.version", access = JsonProperty.Access.WRITE_ONLY) + private String version; + + /* + * Indicates whether the blob container was deleted. + */ + @JsonProperty(value = "properties.deleted", access = JsonProperty.Access.WRITE_ONLY) + private Boolean deleted; + + /* + * Blob container deletion time. + */ + @JsonProperty(value = "properties.deletedTime", access = JsonProperty.Access.WRITE_ONLY) + private OffsetDateTime deletedTime; + + /* + * Remaining retention days for soft deleted blob container. + */ + @JsonProperty(value = "properties.remainingRetentionDays", access = JsonProperty.Access.WRITE_ONLY) + private Integer remainingRetentionDays; + /* * Default the container to use specified encryption scope for all writes. */ @@ -106,6 +130,42 @@ public class ListContainerItemInner extends AzureEntityResource { @JsonProperty(value = "properties.hasImmutabilityPolicy", access = JsonProperty.Access.WRITE_ONLY) private Boolean hasImmutabilityPolicy; + /** + * Get the version property: The version of the deleted blob container. + * + * @return the version value. + */ + public String version() { + return this.version; + } + + /** + * Get the deleted property: Indicates whether the blob container was deleted. + * + * @return the deleted value. + */ + public Boolean deleted() { + return this.deleted; + } + + /** + * Get the deletedTime property: Blob container deletion time. + * + * @return the deletedTime value. + */ + public OffsetDateTime deletedTime() { + return this.deletedTime; + } + + /** + * Get the remainingRetentionDays property: Remaining retention days for soft deleted blob container. + * + * @return the remainingRetentionDays value. + */ + public Integer remainingRetentionDays() { + return this.remainingRetentionDays; + } + /** * Get the defaultEncryptionScope property: Default the container to use specified encryption scope for all writes. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListContainerItemsInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListContainerItemsInner.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListContainerItemsInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListContainerItemsInner.java index 65bc2d1bb657..cafacb69fbaa 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListContainerItemsInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListContainerItemsInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueInner.java index 167d79a43ca9..c55d6576fad3 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueResourceInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueResourceInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueResourceInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueResourceInner.java index 9025b56e4afb..20dc51e577fb 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueResourceInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueResourceInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueServicesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueServicesInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueServicesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueServicesInner.java index bbf2ae137676..8b98ea5af99e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListQueueServicesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListQueueServicesInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListServiceSasResponseInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListServiceSasResponseInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListServiceSasResponseInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListServiceSasResponseInner.java index a1a097db0fb8..3377b9c31bd1 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListServiceSasResponseInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListServiceSasResponseInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListTableResourceInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListTableResourceInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListTableResourceInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListTableResourceInner.java index b7579fd05531..366e16682ed5 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListTableResourceInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListTableResourceInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListTableServicesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListTableServicesInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListTableServicesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListTableServicesInner.java index 731dc1449726..b462a9098d62 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListTableServicesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ListTableServicesInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ManagementPolicyInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ManagementPolicyInner.java index 7f77fd4fb192..d3530cdef285 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ManagementPolicyInner.java @@ -2,13 +2,13 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.ManagementPolicySchema; +import com.azure.management.storage.models.ManagementPolicySchema; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPoliciesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ObjectReplicationPoliciesInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPoliciesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ObjectReplicationPoliciesInner.java index d6e36df5a7e3..4cfecdbe3d3c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPoliciesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ObjectReplicationPoliciesInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ObjectReplicationPolicyInner.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ObjectReplicationPolicyInner.java index a2d91439959f..f5d5eef49ba5 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/ObjectReplicationPolicyInner.java @@ -2,13 +2,13 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.ObjectReplicationPolicyRule; +import com.azure.management.storage.models.ObjectReplicationPolicyRule; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/OperationInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/OperationInner.java index f4dec2fa2524..67011cca3c69 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/OperationInner.java @@ -2,13 +2,13 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.OperationDisplay; -import com.azure.management.storage.ServiceSpecification; +import com.azure.management.storage.models.OperationDisplay; +import com.azure.management.storage.models.ServiceSpecification; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationListResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/OperationListResultInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationListResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/OperationListResultInner.java index e7d1dd134201..a85fc492d2c1 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationListResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/OperationListResultInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateEndpointConnectionInner.java similarity index 93% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateEndpointConnectionInner.java index f2a362dc5b3c..7a0df07ecd94 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateEndpointConnectionInner.java @@ -2,15 +2,15 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.PrivateEndpoint; -import com.azure.management.storage.PrivateEndpointConnectionProvisioningState; -import com.azure.management.storage.PrivateLinkServiceConnectionState; +import com.azure.management.storage.models.PrivateEndpoint; +import com.azure.management.storage.models.PrivateEndpointConnectionProvisioningState; +import com.azure.management.storage.models.PrivateLinkServiceConnectionState; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionListResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateEndpointConnectionListResultInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionListResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateEndpointConnectionListResultInner.java index 5a05ca872987..410f758d81ec 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionListResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateEndpointConnectionListResultInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResourceListResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateLinkResourceListResultInner.java similarity index 93% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResourceListResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateLinkResourceListResultInner.java index bfb5c35dda3c..ee3af9bf4dea 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResourceListResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/PrivateLinkResourceListResultInner.java @@ -2,11 +2,11 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.PrivateLinkResource; +import com.azure.management.storage.models.PrivateLinkResource; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueueServicePropertiesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/QueueServicePropertiesInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueueServicePropertiesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/QueueServicePropertiesInner.java index 4936e269fd31..f6e7496e0159 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/QueueServicePropertiesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/QueueServicePropertiesInner.java @@ -2,13 +2,13 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.CorsRules; +import com.azure.management.storage.models.CorsRules; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuInformationInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/SkuInformationInner.java similarity index 94% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuInformationInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/SkuInformationInner.java index d4837347099d..108152830dd3 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuInformationInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/SkuInformationInner.java @@ -2,15 +2,15 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.Kind; -import com.azure.management.storage.Restriction; -import com.azure.management.storage.SkuCapability; -import com.azure.management.storage.SkuName; -import com.azure.management.storage.SkuTier; +import com.azure.management.storage.models.Kind; +import com.azure.management.storage.models.Restriction; +import com.azure.management.storage.models.SkuCapability; +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.SkuTier; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountInner.java index 5f0f3cfa8753..0fbf96037b81 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountInner.java @@ -2,26 +2,26 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.Resource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.AccessTier; -import com.azure.management.storage.AccountStatus; -import com.azure.management.storage.AzureFilesIdentityBasedAuthentication; -import com.azure.management.storage.CustomDomain; -import com.azure.management.storage.Encryption; -import com.azure.management.storage.Endpoints; -import com.azure.management.storage.GeoReplicationStats; -import com.azure.management.storage.Identity; -import com.azure.management.storage.Kind; -import com.azure.management.storage.LargeFileSharesState; -import com.azure.management.storage.NetworkRuleSet; -import com.azure.management.storage.ProvisioningState; -import com.azure.management.storage.RoutingPreference; -import com.azure.management.storage.Sku; +import com.azure.management.storage.models.AccessTier; +import com.azure.management.storage.models.AccountStatus; +import com.azure.management.storage.models.AzureFilesIdentityBasedAuthentication; +import com.azure.management.storage.models.CustomDomain; +import com.azure.management.storage.models.Encryption; +import com.azure.management.storage.models.Endpoints; +import com.azure.management.storage.models.GeoReplicationStats; +import com.azure.management.storage.models.Identity; +import com.azure.management.storage.models.Kind; +import com.azure.management.storage.models.LargeFileSharesState; +import com.azure.management.storage.models.NetworkRuleSet; +import com.azure.management.storage.models.ProvisioningState; +import com.azure.management.storage.models.RoutingPreference; +import com.azure.management.storage.models.Sku; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountListKeysResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountListKeysResultInner.java similarity index 92% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountListKeysResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountListKeysResultInner.java index 0630108674e5..230a78b278d9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountListKeysResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountListKeysResultInner.java @@ -2,11 +2,11 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.StorageAccountKey; +import com.azure.management.storage.models.StorageAccountKey; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountListResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountListResultInner.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountListResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountListResultInner.java index ec4a8a4d8e61..c3387d252b99 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountListResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageAccountListResultInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageQueueInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageQueueInner.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageQueueInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageQueueInner.java index e76b7d27c92c..3bb47121aa84 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageQueueInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageQueueInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSkuListResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageSkuListResultInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSkuListResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageSkuListResultInner.java index dd3bd044df11..1503488a94f9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSkuListResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/StorageSkuListResultInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/TableInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/TableInner.java index d038309c09d1..4e9620f3612c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/TableInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.annotation.JsonFlatten; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableServicePropertiesInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/TableServicePropertiesInner.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableServicePropertiesInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/TableServicePropertiesInner.java index 0162ef67adee..d8d7fe3d8886 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TableServicePropertiesInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/TableServicePropertiesInner.java @@ -2,13 +2,13 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.ProxyResource; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.CorsRules; +import com.azure.management.storage.models.CorsRules; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/UsageInner.java similarity index 93% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/UsageInner.java index bffd9317262c..f1930bc69a73 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/UsageInner.java @@ -2,12 +2,12 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; -import com.azure.management.storage.UsageName; -import com.azure.management.storage.UsageUnit; +import com.azure.management.storage.models.UsageName; +import com.azure.management.storage.models.UsageUnit; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageListResultInner.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/UsageListResultInner.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageListResultInner.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/UsageListResultInner.java index 20a101b7e006..810b6d386c25 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageListResultInner.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/UsageListResultInner.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage.models; +package com.azure.management.storage.fluent.inner; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/package-info.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/package-info.java new file mode 100644 index 000000000000..ec2615f8429a --- /dev/null +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/inner/package-info.java @@ -0,0 +1,5 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +/** Package containing the classes for StorageManagementClient. The Azure Storage Management API. */ +package com.azure.management.storage.fluent.inner; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/package-info.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/package-info.java new file mode 100644 index 000000000000..c78803e316a8 --- /dev/null +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/fluent/package-info.java @@ -0,0 +1,5 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +/** Package containing the classes for StorageManagementClient. The Azure Storage Management API. */ +package com.azure.management.storage.fluent; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java index 76ccac2357eb..b59640ff92db 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java @@ -4,15 +4,17 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; -import com.azure.management.storage.BlobContainer; -import com.azure.management.storage.ImmutabilityPolicyProperties; -import com.azure.management.storage.LeaseDuration; -import com.azure.management.storage.LeaseState; -import com.azure.management.storage.LeaseStatus; -import com.azure.management.storage.LegalHoldProperties; -import com.azure.management.storage.PublicAccess; -import com.azure.management.storage.models.BlobContainerInner; -import com.azure.management.storage.models.BlobContainersInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.BlobContainersClient; +import com.azure.management.storage.models.BlobContainer; +import com.azure.management.storage.models.ImmutabilityPolicyProperties; +import com.azure.management.storage.models.LeaseDuration; +import com.azure.management.storage.models.LeaseState; +import com.azure.management.storage.models.LeaseStatus; +import com.azure.management.storage.models.LegalHoldProperties; +import com.azure.management.storage.models.PublicAccess; +import com.azure.management.storage.fluent.inner.BlobContainerInner; + import java.time.OffsetDateTime; import java.util.HashMap; import java.util.Map; @@ -56,7 +58,7 @@ public StorageManager manager() { @Override public Mono createResourceAsync() { - BlobContainersInner client = this.manager().inner().blobContainers(); + BlobContainersClient client = this.manager().inner().getBlobContainers(); return client .createAsync(this.resourceGroupName, this.accountName, this.containerName, this.inner().withPublicAccess(cpublicAccess).withMetadata(cmetadata)) @@ -65,7 +67,7 @@ public Mono createResourceAsync() { @Override public Mono updateResourceAsync() { - BlobContainersInner client = this.manager().inner().blobContainers(); + BlobContainersClient client = this.manager().inner().getBlobContainers(); return client .updateAsync(this.resourceGroupName, this.accountName, this.containerName, this.inner().withPublicAccess(upublicAccess).withMetadata(umetadata)) @@ -74,7 +76,7 @@ public Mono updateResourceAsync() { @Override protected Mono getInnerAsync() { - return this.manager().inner().blobContainers().getAsync(resourceGroupName, accountName, containerName); + return this.manager().inner().getBlobContainers().getAsync(resourceGroupName, accountName, containerName); } @Override diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java index f7434069cc49..f3aaff611d15 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java @@ -5,22 +5,23 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.azure.management.storage.BlobContainer; -import com.azure.management.storage.BlobContainers; -import com.azure.management.storage.ImmutabilityPolicy; -import com.azure.management.storage.LegalHold; -import com.azure.management.storage.models.BlobContainerInner; -import com.azure.management.storage.models.BlobContainersInner; -import com.azure.management.storage.models.ImmutabilityPolicyInner; -import com.azure.management.storage.models.ListContainerItemInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.BlobContainersClient; +import com.azure.management.storage.models.BlobContainer; +import com.azure.management.storage.models.BlobContainers; +import com.azure.management.storage.models.ImmutabilityPolicy; +import com.azure.management.storage.models.LegalHold; +import com.azure.management.storage.fluent.inner.BlobContainerInner; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; +import com.azure.management.storage.fluent.inner.ListContainerItemInner; import java.util.List; import reactor.core.publisher.Mono; -class BlobContainersImpl extends WrapperImpl implements BlobContainers { +public class BlobContainersImpl extends WrapperImpl implements BlobContainers { private final StorageManager manager; - BlobContainersImpl(StorageManager manager) { - super(manager.inner().blobContainers()); + public BlobContainersImpl(StorageManager manager) { + super(manager.inner().getBlobContainers()); this.manager = manager; } @@ -56,13 +57,13 @@ private ImmutabilityPolicyImpl wrapImmutabilityPolicyModel(ImmutabilityPolicyInn @Override public PagedFlux listAsync(String resourceGroupName, String accountName) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client.listAsync(resourceGroupName, accountName); } @Override public Mono getAsync(String resourceGroupName, String accountName, String containerName) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client .getAsync(resourceGroupName, accountName, containerName) .map(this::wrapBlobContainerModel); @@ -70,14 +71,14 @@ public Mono getAsync(String resourceGroupName, String accountName @Override public Mono deleteAsync(String resourceGroupName, String accountName, String containerName) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client.deleteAsync(resourceGroupName, accountName, containerName); } @Override public Mono setLegalHoldAsync( String resourceGroupName, String accountName, String containerName, List tags) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client .setLegalHoldAsync(resourceGroupName, accountName, containerName, tags) .map(legalHoldInner -> new LegalHoldImpl(legalHoldInner, manager())); @@ -86,7 +87,7 @@ public Mono setLegalHoldAsync( @Override public Mono clearLegalHoldAsync( String resourceGroupName, String accountName, String containerName, List tags) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client .clearLegalHoldAsync(resourceGroupName, accountName, containerName, tags) .map(legalHoldInner -> new LegalHoldImpl(legalHoldInner, manager())); @@ -101,7 +102,7 @@ public Mono getImmutabilityPolicyAsync( @Override public Mono getImmutabilityPolicyAsync( String resourceGroupName, String accountName, String containerName, String eTagValue) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client .getImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, eTagValue) .map(this::wrapImmutabilityPolicyModel); @@ -128,7 +129,7 @@ public Mono lockImmutabilityPolicyAsync( @Override public Mono lockImmutabilityPolicyAsync( String resourceGroupName, String accountName, String containerName, String eTagValue) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client .lockImmutabilityPolicyAsync(resourceGroupName, accountName, containerName, eTagValue) .map(inner -> new ImmutabilityPolicyImpl(inner, manager())); @@ -158,7 +159,7 @@ public Mono extendImmutabilityPolicyAsync( int immutabilityPeriodSinceCreationInDays, Boolean allowProtectedAppendWrites, String eTagValue) { - BlobContainersInner client = this.inner(); + BlobContainersClient client = this.inner(); return client .extendImmutabilityPolicyAsync( resourceGroupName, diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServiceEncryptionStatusImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServiceEncryptionStatusImpl.java index fe1e156ca5b6..c629c250a82b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServiceEncryptionStatusImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServiceEncryptionStatusImpl.java @@ -3,9 +3,9 @@ package com.azure.management.storage.implementation; -import com.azure.management.storage.EncryptionService; -import com.azure.management.storage.EncryptionServices; -import com.azure.management.storage.StorageService; +import com.azure.management.storage.models.EncryptionService; +import com.azure.management.storage.models.EncryptionServices; +import com.azure.management.storage.models.StorageService; /** Implementation of StorageAccountEncryptionStatus for Blob service. */ class BlobServiceEncryptionStatusImpl extends StorageAccountEncryptionStatusImpl { diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java index fcb26ef0c15b..fe0909e28a98 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicePropertiesImpl.java @@ -4,12 +4,14 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; -import com.azure.management.storage.BlobServiceProperties; -import com.azure.management.storage.CorsRule; -import com.azure.management.storage.CorsRules; -import com.azure.management.storage.DeleteRetentionPolicy; -import com.azure.management.storage.models.BlobServicePropertiesInner; -import com.azure.management.storage.models.BlobServicesInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.BlobServicesClient; +import com.azure.management.storage.models.BlobServiceProperties; +import com.azure.management.storage.models.CorsRule; +import com.azure.management.storage.models.CorsRules; +import com.azure.management.storage.models.DeleteRetentionPolicy; +import com.azure.management.storage.fluent.inner.BlobServicePropertiesInner; + import java.util.ArrayList; import java.util.List; import reactor.core.publisher.Mono; @@ -47,7 +49,7 @@ public StorageManager manager() { @Override public Mono createResourceAsync() { - BlobServicesInner client = this.manager().inner().blobServices(); + BlobServicesClient client = this.manager().inner().getBlobServices(); return client .setServicePropertiesAsync(this.resourceGroupName, this.accountName, this.inner()) .map(innerToFluentMap(this)); @@ -55,7 +57,7 @@ public Mono createResourceAsync() { @Override public Mono updateResourceAsync() { - BlobServicesInner client = this.manager().inner().blobServices(); + BlobServicesClient client = this.manager().inner().getBlobServices(); return client .setServicePropertiesAsync(this.resourceGroupName, this.accountName, this.inner()) .map(innerToFluentMap(this)); @@ -63,7 +65,7 @@ public Mono updateResourceAsync() { @Override protected Mono getInnerAsync() { - BlobServicesInner client = this.manager().inner().blobServices(); + BlobServicesClient client = this.manager().inner().getBlobServices(); return client.getServicePropertiesAsync(this.resourceGroupName, this.accountName); } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicesImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicesImpl.java index 1d179dda45d3..4eb151998f6c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicesImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/BlobServicesImpl.java @@ -4,17 +4,18 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.azure.management.storage.BlobServiceProperties; -import com.azure.management.storage.BlobServices; -import com.azure.management.storage.models.BlobServicePropertiesInner; -import com.azure.management.storage.models.BlobServicesInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.BlobServicesClient; +import com.azure.management.storage.models.BlobServiceProperties; +import com.azure.management.storage.models.BlobServices; +import com.azure.management.storage.fluent.inner.BlobServicePropertiesInner; import reactor.core.publisher.Mono; -class BlobServicesImpl extends WrapperImpl implements BlobServices { +public class BlobServicesImpl extends WrapperImpl implements BlobServices { private final StorageManager manager; - BlobServicesImpl(StorageManager manager) { - super(manager.inner().blobServices()); + public BlobServicesImpl(StorageManager manager) { + super(manager.inner().getBlobServices()); this.manager = manager; } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/FileServiceEncryptionStatusImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/FileServiceEncryptionStatusImpl.java index d667fe8133b3..91f881be0acc 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/FileServiceEncryptionStatusImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/FileServiceEncryptionStatusImpl.java @@ -3,9 +3,9 @@ package com.azure.management.storage.implementation; -import com.azure.management.storage.EncryptionService; -import com.azure.management.storage.EncryptionServices; -import com.azure.management.storage.StorageService; +import com.azure.management.storage.models.EncryptionService; +import com.azure.management.storage.models.EncryptionServices; +import com.azure.management.storage.models.StorageService; /** Implementation of StorageAccountEncryptionStatus for File service. */ class FileServiceEncryptionStatusImpl extends StorageAccountEncryptionStatusImpl { diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java index 94051b59bf0b..a66932fe7205 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ImmutabilityPolicyImpl.java @@ -5,10 +5,11 @@ import com.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import com.azure.management.resources.fluentcore.utils.ETagState; -import com.azure.management.storage.ImmutabilityPolicy; -import com.azure.management.storage.ImmutabilityPolicyState; -import com.azure.management.storage.models.BlobContainersInner; -import com.azure.management.storage.models.ImmutabilityPolicyInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.BlobContainersClient; +import com.azure.management.storage.models.ImmutabilityPolicy; +import com.azure.management.storage.models.ImmutabilityPolicyState; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; import reactor.core.publisher.Mono; class ImmutabilityPolicyImpl @@ -49,7 +50,7 @@ public StorageManager manager() { @Override public Mono createResourceAsync() { - BlobContainersInner client = this.manager().inner().blobContainers(); + BlobContainersClient client = this.manager().inner().getBlobContainers(); return client .createOrUpdateImmutabilityPolicyAsync( this.resourceGroupName, @@ -63,7 +64,7 @@ public Mono createResourceAsync() { @Override public Mono updateResourceAsync() { - BlobContainersInner client = this.manager().inner().blobContainers(); + BlobContainersClient client = this.manager().inner().getBlobContainers(); return client .createOrUpdateImmutabilityPolicyAsync( this.resourceGroupName, @@ -82,7 +83,7 @@ public Mono updateResourceAsync() { @Override protected Mono getInnerAsync() { - BlobContainersInner client = this.manager().inner().blobContainers(); + BlobContainersClient client = this.manager().inner().getBlobContainers(); return client.getImmutabilityPolicyAsync(this.resourceGroupName, this.accountName, this.containerName, null); } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/LegalHoldImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/LegalHoldImpl.java index 710c3dcd90d0..b973e19779a2 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/LegalHoldImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/LegalHoldImpl.java @@ -4,8 +4,9 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.azure.management.storage.LegalHold; -import com.azure.management.storage.models.LegalHoldInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.models.LegalHold; +import com.azure.management.storage.fluent.inner.LegalHoldInner; import java.util.List; class LegalHoldImpl extends WrapperImpl implements LegalHold { diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPoliciesImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPoliciesImpl.java index 9cab200daf26..bba481b1c0a4 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPoliciesImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPoliciesImpl.java @@ -4,17 +4,18 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.azure.management.storage.ManagementPolicies; -import com.azure.management.storage.ManagementPolicy; -import com.azure.management.storage.models.ManagementPoliciesInner; -import com.azure.management.storage.models.ManagementPolicyInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.ManagementPoliciesClient; +import com.azure.management.storage.models.ManagementPolicies; +import com.azure.management.storage.models.ManagementPolicy; +import com.azure.management.storage.fluent.inner.ManagementPolicyInner; import reactor.core.publisher.Mono; -class ManagementPoliciesImpl extends WrapperImpl implements ManagementPolicies { +public class ManagementPoliciesImpl extends WrapperImpl implements ManagementPolicies { private final StorageManager manager; - ManagementPoliciesImpl(StorageManager manager) { - super(manager.inner().managementPolicies()); + public ManagementPoliciesImpl(StorageManager manager) { + super(manager.inner().getManagementPolicies()); this.manager = manager; } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java index 602654078331..9aca36e3e916 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/ManagementPolicyImpl.java @@ -5,15 +5,16 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; -import com.azure.management.storage.BlobTypes; -import com.azure.management.storage.ManagementPolicy; -import com.azure.management.storage.ManagementPolicyBaseBlob; -import com.azure.management.storage.ManagementPolicyRule; -import com.azure.management.storage.ManagementPolicySchema; -import com.azure.management.storage.ManagementPolicySnapShot; -import com.azure.management.storage.PolicyRule; -import com.azure.management.storage.models.ManagementPoliciesInner; -import com.azure.management.storage.models.ManagementPolicyInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.ManagementPoliciesClient; +import com.azure.management.storage.models.BlobTypes; +import com.azure.management.storage.models.ManagementPolicy; +import com.azure.management.storage.models.ManagementPolicyBaseBlob; +import com.azure.management.storage.models.ManagementPolicyRule; +import com.azure.management.storage.models.ManagementPolicySchema; +import com.azure.management.storage.models.ManagementPolicySnapShot; +import com.azure.management.storage.models.PolicyRule; +import com.azure.management.storage.fluent.inner.ManagementPolicyInner; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Collections; @@ -59,7 +60,7 @@ public StorageManager manager() { @Override public Mono createResourceAsync() { - ManagementPoliciesInner client = this.manager().inner().managementPolicies(); + ManagementPoliciesClient client = this.manager().inner().getManagementPolicies(); return client .createOrUpdateAsync(this.resourceGroupName, this.accountName, cpolicy) .map( @@ -72,7 +73,7 @@ public Mono createResourceAsync() { @Override public Mono updateResourceAsync() { - ManagementPoliciesInner client = this.manager().inner().managementPolicies(); + ManagementPoliciesClient client = this.manager().inner().getManagementPolicies(); return client .createOrUpdateAsync(this.resourceGroupName, this.accountName, upolicy) .map( @@ -85,7 +86,7 @@ public Mono updateResourceAsync() { @Override protected Mono getInnerAsync() { - ManagementPoliciesInner client = this.manager().inner().managementPolicies(); + ManagementPoliciesClient client = this.manager().inner().getManagementPolicies(); return client.getAsync(this.resourceGroupName, this.accountName); } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java index e73832a32c1f..a9d92568f6fe 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java @@ -4,17 +4,17 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.BlobTypes; -import com.azure.management.storage.DateAfterCreation; -import com.azure.management.storage.DateAfterModification; -import com.azure.management.storage.ManagementPolicy; -import com.azure.management.storage.ManagementPolicyAction; -import com.azure.management.storage.ManagementPolicyBaseBlob; -import com.azure.management.storage.ManagementPolicyDefinition; -import com.azure.management.storage.ManagementPolicyFilter; -import com.azure.management.storage.ManagementPolicyRule; -import com.azure.management.storage.ManagementPolicySnapShot; -import com.azure.management.storage.PolicyRule; +import com.azure.management.storage.models.BlobTypes; +import com.azure.management.storage.models.DateAfterCreation; +import com.azure.management.storage.models.DateAfterModification; +import com.azure.management.storage.models.ManagementPolicy; +import com.azure.management.storage.models.ManagementPolicyAction; +import com.azure.management.storage.models.ManagementPolicyBaseBlob; +import com.azure.management.storage.models.ManagementPolicyDefinition; +import com.azure.management.storage.models.ManagementPolicyFilter; +import com.azure.management.storage.models.ManagementPolicyRule; +import com.azure.management.storage.models.ManagementPolicySnapShot; +import com.azure.management.storage.models.PolicyRule; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/QueueServiceEncryptionStatusImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/QueueServiceEncryptionStatusImpl.java index 94850048b2cd..e2dd498bb05e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/QueueServiceEncryptionStatusImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/QueueServiceEncryptionStatusImpl.java @@ -3,9 +3,9 @@ package com.azure.management.storage.implementation; -import com.azure.management.storage.EncryptionService; -import com.azure.management.storage.EncryptionServices; -import com.azure.management.storage.StorageService; +import com.azure.management.storage.models.EncryptionService; +import com.azure.management.storage.models.EncryptionServices; +import com.azure.management.storage.models.StorageService; /** Implementation of StorageAccountEncryptionStatus for Queue service. */ class QueueServiceEncryptionStatusImpl extends StorageAccountEncryptionStatusImpl { diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountEncryptionStatusImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountEncryptionStatusImpl.java index 195bf7e268aa..e33d804a9fbd 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountEncryptionStatusImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountEncryptionStatusImpl.java @@ -3,9 +3,9 @@ package com.azure.management.storage.implementation; -import com.azure.management.storage.EncryptionService; -import com.azure.management.storage.EncryptionServices; -import com.azure.management.storage.StorageAccountEncryptionStatus; +import com.azure.management.storage.models.EncryptionService; +import com.azure.management.storage.models.EncryptionServices; +import com.azure.management.storage.models.StorageAccountEncryptionStatus; import java.time.OffsetDateTime; /** Shared implementation of StorageAccountEncryptionStatus. */ diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java index 0fb817d2d0b9..9e31ed9f381f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountImpl.java @@ -6,28 +6,31 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; import com.azure.management.resources.fluentcore.utils.Utils; -import com.azure.management.storage.AccessTier; -import com.azure.management.storage.AzureFilesIdentityBasedAuthentication; -import com.azure.management.storage.CustomDomain; -import com.azure.management.storage.DirectoryServiceOptions; -import com.azure.management.storage.Encryption; -import com.azure.management.storage.Identity; -import com.azure.management.storage.Kind; -import com.azure.management.storage.LargeFileSharesState; -import com.azure.management.storage.ProvisioningState; -import com.azure.management.storage.PublicEndpoints; -import com.azure.management.storage.Sku; -import com.azure.management.storage.SkuName; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccountCreateParameters; -import com.azure.management.storage.StorageAccountEncryptionKeySource; -import com.azure.management.storage.StorageAccountEncryptionStatus; -import com.azure.management.storage.StorageAccountKey; -import com.azure.management.storage.StorageAccountSkuType; -import com.azure.management.storage.StorageAccountUpdateParameters; -import com.azure.management.storage.StorageService; -import com.azure.management.storage.models.StorageAccountInner; -import com.azure.management.storage.models.StorageAccountsInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.StorageAccountsClient; +import com.azure.management.storage.models.AccessTier; +import com.azure.management.storage.models.AccountStatuses; +import com.azure.management.storage.models.AzureFilesIdentityBasedAuthentication; +import com.azure.management.storage.models.CustomDomain; +import com.azure.management.storage.models.DirectoryServiceOptions; +import com.azure.management.storage.models.Encryption; +import com.azure.management.storage.models.Identity; +import com.azure.management.storage.models.Kind; +import com.azure.management.storage.models.LargeFileSharesState; +import com.azure.management.storage.models.ProvisioningState; +import com.azure.management.storage.models.PublicEndpoints; +import com.azure.management.storage.models.Sku; +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountCreateParameters; +import com.azure.management.storage.models.StorageAccountEncryptionKeySource; +import com.azure.management.storage.models.StorageAccountEncryptionStatus; +import com.azure.management.storage.models.StorageAccountKey; +import com.azure.management.storage.models.StorageAccountSkuType; +import com.azure.management.storage.models.StorageAccountUpdateParameters; +import com.azure.management.storage.models.StorageService; +import com.azure.management.storage.fluent.inner.StorageAccountInner; + import java.time.OffsetDateTime; import java.util.List; import java.util.Map; @@ -203,7 +206,7 @@ public Mono> getKeysAsync() { return this .manager() .inner() - .storageAccounts() + .getStorageAccounts() .listKeysAsync(this.resourceGroupName(), this.name()) .map(storageAccountListKeysResultInner -> storageAccountListKeysResultInner.keys()); } @@ -218,7 +221,7 @@ public Mono> regenerateKeyAsync(String keyName) { return this .manager() .inner() - .storageAccounts() + .getStorageAccounts() .regenerateKeyAsync(this.resourceGroupName(), this.name(), keyName) .map(storageAccountListKeysResultInner -> storageAccountListKeysResultInner.keys()); } @@ -237,7 +240,7 @@ public Mono refreshAsync() { @Override protected Mono getInnerAsync() { - return this.manager().inner().storageAccounts().getByResourceGroupAsync(this.resourceGroupName(), this.name()); + return this.manager().inner().getStorageAccounts().getByResourceGroupAsync(this.resourceGroupName(), this.name()); } @Override @@ -500,11 +503,11 @@ public Mono createResourceAsync() { this.networkRulesHelper.setDefaultActionIfRequired(); createParameters.withLocation(this.regionName()); createParameters.withTags(this.inner().tags()); - final StorageAccountsInner client = this.manager().inner().storageAccounts(); + final StorageAccountsClient client = this.manager().inner().getStorageAccounts(); return this .manager() .inner() - .storageAccounts() + .getStorageAccounts() .createAsync(this.resourceGroupName(), this.name(), createParameters) .flatMap( storageAccountInner -> @@ -521,7 +524,7 @@ public Mono updateResourceAsync() { return this .manager() .inner() - .storageAccounts() + .getStorageAccounts() .updateAsync(resourceGroupName(), this.name(), updateParameters) .map(innerToFluentMap(this)) .doOnNext(storageAccount -> clearWrapperProperties()); diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java index 266ba3883613..aefd49fa922a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageAccountsImpl.java @@ -4,23 +4,24 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.arm.collection.implementation.TopLevelModifiableResourcesImpl; -import com.azure.management.storage.CheckNameAvailabilityResult; -import com.azure.management.storage.ServiceSasParameters; -import com.azure.management.storage.SkuName; -import com.azure.management.storage.StorageAccount; -import com.azure.management.storage.StorageAccounts; -import com.azure.management.storage.models.StorageAccountInner; -import com.azure.management.storage.models.StorageAccountsInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.StorageAccountsClient; +import com.azure.management.storage.models.CheckNameAvailabilityResult; +import com.azure.management.storage.models.ServiceSasParameters; +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccounts; +import com.azure.management.storage.fluent.inner.StorageAccountInner; import reactor.core.publisher.Mono; /** The implementation of StorageAccounts and its parent interfaces. */ -class StorageAccountsImpl +public class StorageAccountsImpl extends TopLevelModifiableResourcesImpl< - StorageAccount, StorageAccountImpl, StorageAccountInner, StorageAccountsInner, StorageManager> + StorageAccount, StorageAccountImpl, StorageAccountInner, StorageAccountsClient, StorageManager> implements StorageAccounts { - StorageAccountsImpl(final StorageManager storageManager) { - super(storageManager.inner().storageAccounts(), storageManager); + public StorageAccountsImpl(final StorageManager storageManager) { + super(storageManager.inner().getStorageAccounts(), storageManager); } @Override diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageEncryptionHelper.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageEncryptionHelper.java index 86bac7e2983f..3f57560fe3cb 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageEncryptionHelper.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageEncryptionHelper.java @@ -3,17 +3,17 @@ package com.azure.management.storage.implementation; -import com.azure.management.storage.Encryption; -import com.azure.management.storage.EncryptionService; -import com.azure.management.storage.EncryptionServices; -import com.azure.management.storage.KeySource; -import com.azure.management.storage.KeyVaultProperties; -import com.azure.management.storage.StorageAccountCreateParameters; -import com.azure.management.storage.StorageAccountEncryptionKeySource; -import com.azure.management.storage.StorageAccountEncryptionStatus; -import com.azure.management.storage.StorageAccountUpdateParameters; -import com.azure.management.storage.StorageService; -import com.azure.management.storage.models.StorageAccountInner; +import com.azure.management.storage.models.Encryption; +import com.azure.management.storage.models.EncryptionService; +import com.azure.management.storage.models.EncryptionServices; +import com.azure.management.storage.models.KeySource; +import com.azure.management.storage.models.KeyVaultProperties; +import com.azure.management.storage.models.StorageAccountCreateParameters; +import com.azure.management.storage.models.StorageAccountEncryptionKeySource; +import com.azure.management.storage.models.StorageAccountEncryptionStatus; +import com.azure.management.storage.models.StorageAccountUpdateParameters; +import com.azure.management.storage.models.StorageService; +import com.azure.management.storage.fluent.inner.StorageAccountInner; import java.util.HashMap; import java.util.Map; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java index 656f344c849a..36400bb32c33 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java @@ -3,15 +3,15 @@ package com.azure.management.storage.implementation; -import com.azure.management.storage.Action; -import com.azure.management.storage.Bypass; -import com.azure.management.storage.DefaultAction; -import com.azure.management.storage.IpRule; -import com.azure.management.storage.NetworkRuleSet; -import com.azure.management.storage.StorageAccountCreateParameters; -import com.azure.management.storage.StorageAccountUpdateParameters; -import com.azure.management.storage.VirtualNetworkRule; -import com.azure.management.storage.models.StorageAccountInner; +import com.azure.management.storage.models.Action; +import com.azure.management.storage.models.Bypass; +import com.azure.management.storage.models.DefaultAction; +import com.azure.management.storage.models.IpRule; +import com.azure.management.storage.models.NetworkRuleSet; +import com.azure.management.storage.models.StorageAccountCreateParameters; +import com.azure.management.storage.models.StorageAccountUpdateParameters; +import com.azure.management.storage.models.VirtualNetworkRule; +import com.azure.management.storage.fluent.inner.StorageAccountInner; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkuImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkuImpl.java index 36d10e9978bb..9d9f1a83552f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkuImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkuImpl.java @@ -4,15 +4,15 @@ package com.azure.management.storage.implementation; import com.azure.management.resources.fluentcore.arm.Region; -import com.azure.management.storage.Kind; -import com.azure.management.storage.Restriction; -import com.azure.management.storage.SkuCapability; -import com.azure.management.storage.SkuName; -import com.azure.management.storage.SkuTier; -import com.azure.management.storage.StorageAccountSkuType; -import com.azure.management.storage.StorageResourceType; -import com.azure.management.storage.StorageSku; -import com.azure.management.storage.models.SkuInformationInner; +import com.azure.management.storage.models.Kind; +import com.azure.management.storage.models.Restriction; +import com.azure.management.storage.models.SkuCapability; +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.SkuTier; +import com.azure.management.storage.models.StorageAccountSkuType; +import com.azure.management.storage.models.StorageResourceType; +import com.azure.management.storage.models.StorageSku; +import com.azure.management.storage.fluent.inner.SkuInformationInner; import java.util.ArrayList; import java.util.List; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java index 3e15c95c30f0..b92ca53d2f7d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java @@ -5,16 +5,17 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; -import com.azure.management.storage.StorageSku; -import com.azure.management.storage.StorageSkus; -import com.azure.management.storage.models.SkusInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.SkusClient; +import com.azure.management.storage.models.StorageSku; +import com.azure.management.storage.models.StorageSkus; /** The implementation for {@link StorageSkus}. */ -class StorageSkusImpl implements StorageSkus { +public class StorageSkusImpl implements StorageSkus { private final StorageManager manager; - StorageSkusImpl(StorageManager storageManager) { + public StorageSkusImpl(StorageManager storageManager) { this.manager = storageManager; } @@ -34,7 +35,7 @@ public PagedFlux listAsync() { } @Override - public SkusInner inner() { - return manager.inner().skus(); + public SkusClient inner() { + return manager.inner().getSkus(); } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/TableServiceEncryptionStatusImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/TableServiceEncryptionStatusImpl.java index 71b95b9ba3f8..13b30a26cf4d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/TableServiceEncryptionStatusImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/TableServiceEncryptionStatusImpl.java @@ -3,9 +3,9 @@ package com.azure.management.storage.implementation; -import com.azure.management.storage.EncryptionService; -import com.azure.management.storage.EncryptionServices; -import com.azure.management.storage.StorageService; +import com.azure.management.storage.models.EncryptionService; +import com.azure.management.storage.models.EncryptionServices; +import com.azure.management.storage.models.StorageService; /** Implementation of StorageAccountEncryptionStatus for Table service. */ class TableServiceEncryptionStatusImpl extends StorageAccountEncryptionStatusImpl { diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/UsagesImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/UsagesImpl.java index e013524fcfc3..a703e5b40aea 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/UsagesImpl.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/UsagesImpl.java @@ -4,16 +4,17 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; -import com.azure.management.storage.Usages; -import com.azure.management.storage.models.UsageInner; -import com.azure.management.storage.models.UsagesInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.UsagesClient; +import com.azure.management.storage.models.Usages; +import com.azure.management.storage.fluent.inner.UsageInner; /** The implementation of {@link Usages}. */ -class UsagesImpl implements Usages { +public class UsagesImpl implements Usages { private final StorageManager manager; - UsagesImpl(StorageManager storageManager) { + public UsagesImpl(StorageManager storageManager) { this.manager = storageManager; } @@ -33,7 +34,7 @@ public PagedFlux listAsync() { } @Override - public UsagesInner inner() { - return this.manager().inner().usages(); + public UsagesClient inner() { + return this.manager().inner().getUsages(); } } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccessTier.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccessTier.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccessTier.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccessTier.java index 529b2f96de86..460b4e40b720 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccessTier.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccessTier.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccountSasParameters.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountSasParameters.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccountSasParameters.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountSasParameters.java index 034ca4e35b5f..2f2219ffac7f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccountSasParameters.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountSasParameters.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccountStatus.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountStatus.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccountStatus.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountStatus.java index 57c553264fed..c18919676821 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AccountStatus.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountStatus.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/AccountStatuses.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountStatuses.java similarity index 85% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/AccountStatuses.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountStatuses.java index e33430e7c011..b5b33834d79a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/implementation/AccountStatuses.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AccountStatuses.java @@ -1,14 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage.implementation; - -import com.azure.management.storage.AccountStatus; +package com.azure.management.storage.models; /** An instance of this class stores the availability of a storage account. */ public class AccountStatuses { - private AccountStatus primary; - private AccountStatus secondary; + private final AccountStatus primary; + private final AccountStatus secondary; /** * Creates an instance of AccountStatuses class. diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Action.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Action.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Action.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Action.java index 92dade92f7d9..9537cef8272e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Action.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Action.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ActiveDirectoryProperties.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ActiveDirectoryProperties.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ActiveDirectoryProperties.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ActiveDirectoryProperties.java index 8b7d0a83d1e5..71f50456c607 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ActiveDirectoryProperties.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ActiveDirectoryProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AzureEntityResource.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AzureEntityResource.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/AzureEntityResource.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AzureEntityResource.java index 21ff958f6138..34a8e6f9580b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AzureEntityResource.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AzureEntityResource.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.management.ProxyResource; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AzureFilesIdentityBasedAuthentication.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AzureFilesIdentityBasedAuthentication.java similarity index 89% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/AzureFilesIdentityBasedAuthentication.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AzureFilesIdentityBasedAuthentication.java index c6b322c783de..51fac5651f89 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/AzureFilesIdentityBasedAuthentication.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/AzureFilesIdentityBasedAuthentication.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; @@ -75,8 +75,11 @@ public AzureFilesIdentityBasedAuthentication withActiveDirectoryProperties( */ public void validate() { if (directoryServiceOptions() == null) { - throw logger.logExceptionAsError(new IllegalArgumentException( - "Missing required property directoryServiceOptions in model AzureFilesIdentityBasedAuthentication")); + throw logger + .logExceptionAsError( + new IllegalArgumentException( + "Missing required property directoryServiceOptions in model" + + " AzureFilesIdentityBasedAuthentication")); } if (activeDirectoryProperties() != null) { activeDirectoryProperties().validate(); diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainer.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainer.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainer.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainer.java index cf42c7c5f5e8..69c3f1093f1c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainer.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainer.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.models.HasManager; @@ -10,8 +10,8 @@ import com.azure.management.resources.fluentcore.model.HasInner; import com.azure.management.resources.fluentcore.model.Indexable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.BlobContainerInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.inner.BlobContainerInner; import java.time.OffsetDateTime; import java.util.Map; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainers.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainers.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainers.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainers.java index 47a66d8c904a..d22ccdb718ee 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainers.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainers.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.http.rest.PagedFlux; -import com.azure.management.storage.models.ListContainerItemInner; +import com.azure.management.storage.fluent.inner.ListContainerItemInner; import java.util.List; import reactor.core.publisher.Mono; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersCreateOrUpdateImmutabilityPolicyHeaders.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersCreateOrUpdateImmutabilityPolicyHeaders.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersCreateOrUpdateImmutabilityPolicyHeaders.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersCreateOrUpdateImmutabilityPolicyHeaders.java index 1e9b0f6ee052..983c4e64fa28 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersCreateOrUpdateImmutabilityPolicyHeaders.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersCreateOrUpdateImmutabilityPolicyHeaders.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersCreateOrUpdateImmutabilityPolicyResponse.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersCreateOrUpdateImmutabilityPolicyResponse.java index 0e6605e46498..340f7fae123a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersCreateOrUpdateImmutabilityPolicyResponse.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersCreateOrUpdateImmutabilityPolicyResponse.java @@ -7,7 +7,7 @@ import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpRequest; import com.azure.core.http.rest.ResponseBase; -import com.azure.management.storage.BlobContainersCreateOrUpdateImmutabilityPolicyHeaders; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; /** Contains all response data for the createOrUpdateImmutabilityPolicy operation. */ public final class BlobContainersCreateOrUpdateImmutabilityPolicyResponse diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersDeleteImmutabilityPolicyHeaders.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersDeleteImmutabilityPolicyHeaders.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersDeleteImmutabilityPolicyHeaders.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersDeleteImmutabilityPolicyHeaders.java index 0f5ff13e1c13..154a5a02d8f3 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersDeleteImmutabilityPolicyHeaders.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersDeleteImmutabilityPolicyHeaders.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersDeleteImmutabilityPolicyResponse.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersDeleteImmutabilityPolicyResponse.java index c8c9e201545f..d99b2403efd2 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersDeleteImmutabilityPolicyResponse.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersDeleteImmutabilityPolicyResponse.java @@ -7,7 +7,7 @@ import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpRequest; import com.azure.core.http.rest.ResponseBase; -import com.azure.management.storage.BlobContainersDeleteImmutabilityPolicyHeaders; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; /** Contains all response data for the deleteImmutabilityPolicy operation. */ public final class BlobContainersDeleteImmutabilityPolicyResponse diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersExtendImmutabilityPolicyHeaders.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersExtendImmutabilityPolicyHeaders.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersExtendImmutabilityPolicyHeaders.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersExtendImmutabilityPolicyHeaders.java index cb663d7f2d88..4bcb6c9d2fff 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersExtendImmutabilityPolicyHeaders.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersExtendImmutabilityPolicyHeaders.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersExtendImmutabilityPolicyResponse.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersExtendImmutabilityPolicyResponse.java index 93a48455c88c..d9c757ddd4dd 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersExtendImmutabilityPolicyResponse.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersExtendImmutabilityPolicyResponse.java @@ -7,7 +7,7 @@ import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpRequest; import com.azure.core.http.rest.ResponseBase; -import com.azure.management.storage.BlobContainersExtendImmutabilityPolicyHeaders; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; /** Contains all response data for the extendImmutabilityPolicy operation. */ public final class BlobContainersExtendImmutabilityPolicyResponse diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersGetImmutabilityPolicyHeaders.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersGetImmutabilityPolicyHeaders.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersGetImmutabilityPolicyHeaders.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersGetImmutabilityPolicyHeaders.java index 46a2aa1de7f7..33c55c846d9f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersGetImmutabilityPolicyHeaders.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersGetImmutabilityPolicyHeaders.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersGetImmutabilityPolicyResponse.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersGetImmutabilityPolicyResponse.java index 1364a4bd9b75..5a452714c61a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersGetImmutabilityPolicyResponse.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersGetImmutabilityPolicyResponse.java @@ -7,7 +7,7 @@ import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpRequest; import com.azure.core.http.rest.ResponseBase; -import com.azure.management.storage.BlobContainersGetImmutabilityPolicyHeaders; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; /** Contains all response data for the getImmutabilityPolicy operation. */ public final class BlobContainersGetImmutabilityPolicyResponse diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersLockImmutabilityPolicyHeaders.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersLockImmutabilityPolicyHeaders.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersLockImmutabilityPolicyHeaders.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersLockImmutabilityPolicyHeaders.java index c1bfe48dee66..b141b0bf2f4d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobContainersLockImmutabilityPolicyHeaders.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersLockImmutabilityPolicyHeaders.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersLockImmutabilityPolicyResponse.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersLockImmutabilityPolicyResponse.java index 71f9ad0f36fc..ed08ff65c81f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersLockImmutabilityPolicyResponse.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobContainersLockImmutabilityPolicyResponse.java @@ -7,7 +7,7 @@ import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpRequest; import com.azure.core.http.rest.ResponseBase; -import com.azure.management.storage.BlobContainersLockImmutabilityPolicyHeaders; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; /** Contains all response data for the lockImmutabilityPolicy operation. */ public final class BlobContainersLockImmutabilityPolicyResponse diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreParameters.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreParameters.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreParameters.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreParameters.java index 5ded5ec5f2d4..0f992884d29e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreParameters.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreParameters.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreProgressStatus.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreProgressStatus.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreProgressStatus.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreProgressStatus.java index a46f4dffe7e2..6c4a6928464d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreProgressStatus.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreProgressStatus.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreRange.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreRange.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreRange.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreRange.java index d73ea39341b8..7d9ef6740c5a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobRestoreRange.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobRestoreRange.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobServiceProperties.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServiceProperties.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobServiceProperties.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServiceProperties.java index e8883339fe8b..1aea1cf69626 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobServiceProperties.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServiceProperties.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.models.HasManager; @@ -11,8 +11,8 @@ import com.azure.management.resources.fluentcore.model.Indexable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.BlobServicePropertiesInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.inner.BlobServicePropertiesInner; import java.util.List; /** Type representing BlobServiceProperties. */ diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobServices.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServices.java similarity index 89% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobServices.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServices.java index bdc4c2596f41..e916d0eb1492 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobServices.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobServices.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.collection.SupportsCreating; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.models.BlobServicesInner; +import com.azure.management.storage.fluent.BlobServicesClient; import reactor.core.publisher.Mono; /** Type representing BlobServices. */ @Fluent public interface BlobServices - extends SupportsCreating, HasInner { + extends SupportsCreating, HasInner { /** * Gets the properties of a storage account’s Blob service, including properties for Storage Analytics and CORS * (Cross-Origin Resource Sharing) rules. diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobTypes.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobTypes.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobTypes.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobTypes.java index 0ac012077e85..4b47dc19f633 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/BlobTypes.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/BlobTypes.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Bypass.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Bypass.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Bypass.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Bypass.java index 2fce5daa1ead..d7932f985c75 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Bypass.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Bypass.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ChangeFeed.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ChangeFeed.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ChangeFeed.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ChangeFeed.java index c1c8b97c2f5b..e910b603a6bf 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ChangeFeed.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ChangeFeed.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CheckNameAvailabilityResult.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CheckNameAvailabilityResult.java similarity index 90% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/CheckNameAvailabilityResult.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CheckNameAvailabilityResult.java index ed3d8cd8da48..3082ae281911 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CheckNameAvailabilityResult.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CheckNameAvailabilityResult.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; -import com.azure.management.storage.models.CheckNameAvailabilityResultInner; +import com.azure.management.storage.fluent.inner.CheckNameAvailabilityResultInner; /** The {@link StorageAccounts#checkNameAvailability} action result. */ public class CheckNameAvailabilityResult { diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRule.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRule.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRule.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRule.java index 96a4a59e2fdd..64e52030306e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRule.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRule.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRuleAllowedMethodsItem.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRuleAllowedMethodsItem.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRuleAllowedMethodsItem.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRuleAllowedMethodsItem.java index 6c9339968cbf..5621578af505 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRuleAllowedMethodsItem.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRuleAllowedMethodsItem.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRules.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRules.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRules.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRules.java index 2f2b34f64535..04eed2734f61 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CorsRules.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CorsRules.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CustomDomain.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CustomDomain.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/CustomDomain.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CustomDomain.java index ec1dbc5e2d87..7f951a6ea084 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/CustomDomain.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/CustomDomain.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DateAfterCreation.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DateAfterCreation.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/DateAfterCreation.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DateAfterCreation.java index ab02b13c52d8..116ffd4072d7 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DateAfterCreation.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DateAfterCreation.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DateAfterModification.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DateAfterModification.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/DateAfterModification.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DateAfterModification.java index 5f64a15521d6..6158d3baf49c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DateAfterModification.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DateAfterModification.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DefaultAction.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DefaultAction.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/DefaultAction.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DefaultAction.java index ef662357232a..d22503483f1e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DefaultAction.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DefaultAction.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DeleteRetentionPolicy.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DeleteRetentionPolicy.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/DeleteRetentionPolicy.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DeleteRetentionPolicy.java index ef3390408d92..def384374e8a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DeleteRetentionPolicy.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DeleteRetentionPolicy.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DeletedShare.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DeletedShare.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/DeletedShare.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DeletedShare.java index 6a365e27c6d0..e232ffc07286 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DeletedShare.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DeletedShare.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Dimension.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Dimension.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Dimension.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Dimension.java index 1381fb98c5e8..00260c3bac0f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Dimension.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Dimension.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DirectoryServiceOptions.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DirectoryServiceOptions.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/DirectoryServiceOptions.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DirectoryServiceOptions.java index 16174ff0253d..e60abeda7961 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/DirectoryServiceOptions.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/DirectoryServiceOptions.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EnabledProtocols.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EnabledProtocols.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/EnabledProtocols.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EnabledProtocols.java index f67660b7950a..3f25ade65f04 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EnabledProtocols.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EnabledProtocols.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Encryption.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Encryption.java similarity index 72% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Encryption.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Encryption.java index c59d7c223201..c73729a4f161 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Encryption.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Encryption.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; @@ -27,6 +27,13 @@ public final class Encryption { @JsonProperty(value = "keySource", required = true) private KeySource keySource; + /* + * A boolean indicating whether or not the service applies a secondary + * layer of encryption with platform managed keys for data at rest. + */ + @JsonProperty(value = "requireInfrastructureEncryption") + private Boolean requireInfrastructureEncryption; + /* * Properties provided by key vault. */ @@ -75,6 +82,28 @@ public Encryption withKeySource(KeySource keySource) { return this; } + /** + * Get the requireInfrastructureEncryption property: A boolean indicating whether or not the service applies a + * secondary layer of encryption with platform managed keys for data at rest. + * + * @return the requireInfrastructureEncryption value. + */ + public Boolean requireInfrastructureEncryption() { + return this.requireInfrastructureEncryption; + } + + /** + * Set the requireInfrastructureEncryption property: A boolean indicating whether or not the service applies a + * secondary layer of encryption with platform managed keys for data at rest. + * + * @param requireInfrastructureEncryption the requireInfrastructureEncryption value to set. + * @return the Encryption object itself. + */ + public Encryption withRequireInfrastructureEncryption(Boolean requireInfrastructureEncryption) { + this.requireInfrastructureEncryption = requireInfrastructureEncryption; + return this; + } + /** * Get the keyVaultProperties property: Properties provided by key vault. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeKeyVaultProperties.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeKeyVaultProperties.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeKeyVaultProperties.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeKeyVaultProperties.java index 3a2d7bdb4066..167239908254 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeKeyVaultProperties.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeKeyVaultProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeSource.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeSource.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeSource.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeSource.java index c67b110ee90c..e057388d4dd7 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeSource.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeSource.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeState.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeState.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeState.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeState.java index 4f69a52cd8cc..04c9abd75e9b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionScopeState.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionScopeState.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionService.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionService.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionService.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionService.java index b4f309b0ac63..3a7cf7796e3c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionService.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionService.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionServices.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionServices.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionServices.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionServices.java index a6794af0f17d..7efadb1adc2c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/EncryptionServices.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/EncryptionServices.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Endpoints.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Endpoints.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Endpoints.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Endpoints.java index 95b87b4ec418..9f54114edfef 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Endpoints.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Endpoints.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/GeoReplicationStats.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GeoReplicationStats.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/GeoReplicationStats.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GeoReplicationStats.java index f39e5c0e0473..13568ac816e0 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/GeoReplicationStats.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GeoReplicationStats.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/GeoReplicationStatus.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GeoReplicationStatus.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/GeoReplicationStatus.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GeoReplicationStatus.java index 373778a1657d..1a79030f2139 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/GeoReplicationStatus.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GeoReplicationStatus.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/GetShareExpand.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GetShareExpand.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/GetShareExpand.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GetShareExpand.java index 7738d99ddb27..81927036cd56 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/GetShareExpand.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/GetShareExpand.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/HttpProtocol.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/HttpProtocol.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/HttpProtocol.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/HttpProtocol.java index 4bb910ffef36..c0ad0ba5b07d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/HttpProtocol.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/HttpProtocol.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Identity.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Identity.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Identity.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Identity.java index 3022ee694339..37e3f4b0822c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Identity.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Identity.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicy.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicy.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicy.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicy.java index 4b10e0bb3ce3..cc6ef5327f53 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicy.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicy.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.models.HasManager; @@ -11,8 +11,8 @@ import com.azure.management.resources.fluentcore.model.Indexable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.ImmutabilityPolicyInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.inner.ImmutabilityPolicyInner; /** Type representing ImmutabilityPolicy. */ @Fluent diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyProperties.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyProperties.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyProperties.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyProperties.java index 75ab578c9807..102a811647b8 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyProperties.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyState.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyState.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyState.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyState.java index 473f64cf4090..079fcf48e6cb 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyState.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyState.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyUpdateType.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyUpdateType.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyUpdateType.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyUpdateType.java index 0b49d5659fbb..0b0bb975214a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ImmutabilityPolicyUpdateType.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ImmutabilityPolicyUpdateType.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/IpRule.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/IpRule.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/IpRule.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/IpRule.java index 7d002884133f..d827204ffbd0 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/IpRule.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/IpRule.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyPermission.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyPermission.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyPermission.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyPermission.java index 38b6e27ecfdf..af9a66b861ca 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyPermission.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyPermission.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeySource.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeySource.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeySource.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeySource.java index ce704cf545c5..800c9608813e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeySource.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeySource.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyType.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyType.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyType.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyType.java index 31e76ebed27a..0619f6b0d6c5 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyType.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyType.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyVaultProperties.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyVaultProperties.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyVaultProperties.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyVaultProperties.java index 286769c69c8d..ab1bb9e984d8 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/KeyVaultProperties.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/KeyVaultProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Kind.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Kind.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Kind.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Kind.java index 3a4b15475524..81b164988018 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Kind.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Kind.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LargeFileSharesState.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LargeFileSharesState.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LargeFileSharesState.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LargeFileSharesState.java index d53d3746ae3c..a33733071cec 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LargeFileSharesState.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LargeFileSharesState.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseContainerRequest.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerRequest.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseContainerRequest.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerRequest.java index 71b7792cf144..4d98bedca1c8 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseContainerRequest.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerRequest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseContainerRequestAction.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerRequestAction.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseContainerRequestAction.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerRequestAction.java index 895fc7bcc0af..d032a80acc51 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseContainerRequestAction.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseContainerRequestAction.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseDuration.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseDuration.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseDuration.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseDuration.java index 5b8957831d88..8400bbe9cca9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseDuration.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseDuration.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseState.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseState.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseState.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseState.java index 2270a89951b4..aac3d50d8370 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseState.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseState.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseStatus.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseStatus.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseStatus.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseStatus.java index e87127928db1..20fba54a2633 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LeaseStatus.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LeaseStatus.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LegalHold.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHold.java similarity index 77% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LegalHold.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHold.java index 3dad37b5ac50..cd1ee78f2965 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LegalHold.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHold.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.models.HasManager; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.LegalHoldInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.inner.LegalHoldInner; import java.util.List; /** Type representing LegalHold. */ diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LegalHoldProperties.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHoldProperties.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/LegalHoldProperties.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHoldProperties.java index 4a9f531f1222..97b79bdd9f65 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/LegalHoldProperties.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/LegalHoldProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ListKeyExpand.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListKeyExpand.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ListKeyExpand.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListKeyExpand.java index 9b1b99f5de9c..d2c7c9b20015 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ListKeyExpand.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListKeyExpand.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ListSharesExpand.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListSharesExpand.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ListSharesExpand.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListSharesExpand.java index b1112bba9178..fa3623baa3e8 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ListSharesExpand.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ListSharesExpand.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicies.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicies.java similarity index 91% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicies.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicies.java index 785f790e61e9..67bd2bf033d8 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicies.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicies.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.collection.SupportsCreating; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.models.ManagementPoliciesInner; +import com.azure.management.storage.fluent.ManagementPoliciesClient; import reactor.core.publisher.Mono; /** Type representing ManagementPolicies. */ @Fluent public interface ManagementPolicies - extends SupportsCreating, HasInner { + extends SupportsCreating, HasInner { /** * Gets the managementpolicy associated with the specified storage account. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicy.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicy.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicy.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicy.java index 72d31b73a6af..493a4ce25e1b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicy.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicy.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.models.HasManager; @@ -11,8 +11,8 @@ import com.azure.management.resources.fluentcore.model.Indexable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.ManagementPolicyInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.inner.ManagementPolicyInner; import java.time.OffsetDateTime; import java.util.List; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyAction.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyAction.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyAction.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyAction.java index cb1e9b0e5237..eeea4a512614 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyAction.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyAction.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyBaseBlob.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyBaseBlob.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyBaseBlob.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyBaseBlob.java index dbe29a29a0f7..a437cb6eb21e 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyBaseBlob.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyBaseBlob.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyDefinition.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyDefinition.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyDefinition.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyDefinition.java index e414b2b550dd..b5fdc89f60e8 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyDefinition.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyDefinition.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyFilter.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyFilter.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyFilter.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyFilter.java index fd86bbb55a66..353349bb6a3f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyFilter.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyFilter.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyRule.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyRule.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyRule.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyRule.java index 7f30eff3ce9e..c1b7b027e6cd 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicyRule.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicyRule.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicySchema.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicySchema.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicySchema.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicySchema.java index aba0865203fe..5631cf715820 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicySchema.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicySchema.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicySnapShot.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicySnapShot.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicySnapShot.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicySnapShot.java index 35d9d3b93cf2..e446597ee79b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ManagementPolicySnapShot.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ManagementPolicySnapShot.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/MetricSpecification.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/MetricSpecification.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/MetricSpecification.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/MetricSpecification.java index f7a55b8c7650..b9953bdea23a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/MetricSpecification.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/MetricSpecification.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/NetworkRuleSet.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/NetworkRuleSet.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/NetworkRuleSet.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/NetworkRuleSet.java index cd828e2038d7..f07be3f22609 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/NetworkRuleSet.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/NetworkRuleSet.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ObjectReplicationPolicyFilter.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyFilter.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ObjectReplicationPolicyFilter.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyFilter.java index 8c4bde3ca0c0..2219d28add60 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ObjectReplicationPolicyFilter.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyFilter.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ObjectReplicationPolicyRule.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyRule.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ObjectReplicationPolicyRule.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyRule.java index a9470b657eb5..5f964b71d223 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ObjectReplicationPolicyRule.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ObjectReplicationPolicyRule.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/OperationDisplay.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationDisplay.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/OperationDisplay.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationDisplay.java index 964f62ea6c30..acdb943a21dc 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/OperationDisplay.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/OperationDisplay.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Permissions.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Permissions.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Permissions.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Permissions.java index fe046a63174a..472e057a57a1 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Permissions.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Permissions.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PolicyRule.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PolicyRule.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PolicyRule.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PolicyRule.java index 2a0188a2498b..9685c8a39d7d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PolicyRule.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PolicyRule.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.model.Attachable; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpoint.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpoint.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpoint.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpoint.java index 677e04f9a6ac..29f594af8f0d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpoint.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpoint.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpointConnectionProvisioningState.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionProvisioningState.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpointConnectionProvisioningState.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionProvisioningState.java index 70b5e8afbc7c..aa2fcd890cd4 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpointConnectionProvisioningState.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointConnectionProvisioningState.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpointServiceConnectionStatus.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointServiceConnectionStatus.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpointServiceConnectionStatus.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointServiceConnectionStatus.java index feaddcaf1416..c99b757af8b1 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateEndpointServiceConnectionStatus.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateEndpointServiceConnectionStatus.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateLinkResource.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResource.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateLinkResource.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResource.java index 59591e326987..e5472e44eda6 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateLinkResource.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkResource.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateLinkServiceConnectionState.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkServiceConnectionState.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateLinkServiceConnectionState.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkServiceConnectionState.java index 03843e33f8ab..8016225604b3 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PrivateLinkServiceConnectionState.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PrivateLinkServiceConnectionState.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ProvisioningState.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ProvisioningState.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ProvisioningState.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ProvisioningState.java index 6981b00de497..c96efa8a35c6 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ProvisioningState.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ProvisioningState.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PublicAccess.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PublicAccess.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PublicAccess.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PublicAccess.java index 21bde2d10546..e463b4eed76f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PublicAccess.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PublicAccess.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PublicEndpoints.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PublicEndpoints.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/PublicEndpoints.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PublicEndpoints.java index 1681cee89bc6..2eb18d57ba90 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/PublicEndpoints.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/PublicEndpoints.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; /** * An instance of this class stores the The URIs associated with a storage account that are used to perform a retrieval diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Reason.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Reason.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Reason.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Reason.java index 023833c0c816..25b7541d4ca1 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Reason.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Reason.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ReasonCode.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ReasonCode.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ReasonCode.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ReasonCode.java index a6fd6f1798d5..395f25d2f25a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ReasonCode.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ReasonCode.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RestorePolicyProperties.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RestorePolicyProperties.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/RestorePolicyProperties.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RestorePolicyProperties.java index db5872ac91d7..1bdb982f18dc 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RestorePolicyProperties.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RestorePolicyProperties.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Restriction.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Restriction.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Restriction.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Restriction.java index 0d33db5fea2a..6f3a5de14e4c 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Restriction.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Restriction.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RootSquashType.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RootSquashType.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/RootSquashType.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RootSquashType.java index 926c0cbb7c2d..e35961a6cefc 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RootSquashType.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RootSquashType.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RoutingChoice.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RoutingChoice.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/RoutingChoice.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RoutingChoice.java index 8a6d755d6ae4..da1e2b3148ab 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RoutingChoice.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RoutingChoice.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RoutingPreference.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RoutingPreference.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/RoutingPreference.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RoutingPreference.java index fdb184f14d41..e91b0a8084ec 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/RoutingPreference.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/RoutingPreference.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ServiceSasParameters.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ServiceSasParameters.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ServiceSasParameters.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ServiceSasParameters.java index 23d31146dbe8..c163fc09d682 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ServiceSasParameters.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ServiceSasParameters.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ServiceSpecification.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ServiceSpecification.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ServiceSpecification.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ServiceSpecification.java index bf2bd726a5c9..c6295c315351 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ServiceSpecification.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ServiceSpecification.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Services.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Services.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Services.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Services.java index 46177085d3e2..53674a5659df 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Services.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Services.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ShareAccessTier.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ShareAccessTier.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/ShareAccessTier.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ShareAccessTier.java index 335118ccdea9..56567d4c6784 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/ShareAccessTier.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/ShareAccessTier.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SignedResource.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SignedResource.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/SignedResource.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SignedResource.java index 84b8c0135197..243716dba7a9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SignedResource.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SignedResource.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SignedResourceTypes.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SignedResourceTypes.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/SignedResourceTypes.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SignedResourceTypes.java index 3054b98d32d4..4373761e8d2f 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SignedResourceTypes.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SignedResourceTypes.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Sku.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Sku.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Sku.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Sku.java index e8fb812f6dbb..5be467cad8c9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Sku.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Sku.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuCapability.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuCapability.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuCapability.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuCapability.java index 6c0e1800f9c8..04f18f84d770 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuCapability.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuCapability.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuName.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuName.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuName.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuName.java index 957c6e77aba0..15f0ed3c69a1 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuName.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuName.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuTier.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuTier.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuTier.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuTier.java index 1bbe831cf33b..3e8471b67525 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/SkuTier.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/SkuTier.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/State.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/State.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/State.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/State.java index cb7657ae18f9..c31782675b03 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/State.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/State.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccount.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccount.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccount.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccount.java index ea574704ea5c..44938799b496 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccount.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccount.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.models.GroupableResource; @@ -10,9 +10,8 @@ import com.azure.management.resources.fluentcore.model.Creatable; import com.azure.management.resources.fluentcore.model.Refreshable; import com.azure.management.resources.fluentcore.model.Updatable; -import com.azure.management.storage.implementation.AccountStatuses; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.StorageAccountInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.inner.StorageAccountInner; import java.time.OffsetDateTime; import java.util.List; import java.util.Map; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountCheckNameAvailabilityParameters.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountCheckNameAvailabilityParameters.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountCheckNameAvailabilityParameters.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountCheckNameAvailabilityParameters.java index af322681af85..57be77427170 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountCheckNameAvailabilityParameters.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountCheckNameAvailabilityParameters.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountCreateParameters.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountCreateParameters.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountCreateParameters.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountCreateParameters.java index 5229d09c5a71..ba3908845d2a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountCreateParameters.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountCreateParameters.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountEncryptionKeySource.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountEncryptionKeySource.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountEncryptionKeySource.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountEncryptionKeySource.java index fca4718cd40b..5b9465831f0d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountEncryptionKeySource.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountEncryptionKeySource.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import java.util.Collection; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountEncryptionStatus.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountEncryptionStatus.java similarity index 93% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountEncryptionStatus.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountEncryptionStatus.java index 3ce7d19ac20e..93d21717ae8d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountEncryptionStatus.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountEncryptionStatus.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import java.time.OffsetDateTime; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountExpand.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountExpand.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountExpand.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountExpand.java index 7d54a8c6f067..dd29ad36a5ab 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountExpand.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountExpand.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountInternetEndpoints.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountInternetEndpoints.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountInternetEndpoints.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountInternetEndpoints.java index 9bc14ce63154..4a16011caede 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountInternetEndpoints.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountInternetEndpoints.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountKey.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountKey.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountKey.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountKey.java index 0445a8842780..0e3f73c57cb6 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountKey.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountKey.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountMicrosoftEndpoints.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountMicrosoftEndpoints.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountMicrosoftEndpoints.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountMicrosoftEndpoints.java index d1d02d8c9789..43ab2302ab27 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountMicrosoftEndpoints.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountMicrosoftEndpoints.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountRegenerateKeyParameters.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountRegenerateKeyParameters.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountRegenerateKeyParameters.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountRegenerateKeyParameters.java index 028fe3209520..5e4fec274c5b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountRegenerateKeyParameters.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountRegenerateKeyParameters.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountSkuType.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountSkuType.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountSkuType.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountSkuType.java index a4e51a3725a7..361bd497456d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountSkuType.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountSkuType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; /** Defines sku values for storage account resource. */ public final class StorageAccountSkuType { diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountUpdateParameters.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountUpdateParameters.java similarity index 99% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountUpdateParameters.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountUpdateParameters.java index 1db1624b04e4..f2e4f6e3d640 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccountUpdateParameters.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccountUpdateParameters.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.annotation.JsonFlatten; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccounts.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccounts.java similarity index 94% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccounts.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccounts.java index e957bb699a7a..3ebefa961d2b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageAccounts.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageAccounts.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.collection.SupportsBatchDeletion; @@ -15,8 +15,8 @@ import com.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.azure.management.resources.fluentcore.collection.SupportsListing; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.StorageAccountsInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.StorageAccountsClient; import reactor.core.publisher.Mono; /** Entry point for storage accounts management API. */ @@ -32,7 +32,7 @@ public interface StorageAccounts SupportsBatchCreation, SupportsBatchDeletion, HasManager, - HasInner { + HasInner { /** * Checks that account name is valid and is not in use. * diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageManagementClientImpl.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageManagementClientImpl.java deleted file mode 100644 index 82155f376d10..000000000000 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageManagementClientImpl.java +++ /dev/null @@ -1,348 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.management.storage.models; - -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.policy.CookiePolicy; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.management.AzureEnvironment; -import com.azure.core.util.logging.ClientLogger; -import com.azure.management.AzureServiceClient; - -/** Initializes a new instance of the StorageManagementClientImpl type. */ -public final class StorageManagementClientImpl extends AzureServiceClient { - private final ClientLogger logger = new ClientLogger(StorageManagementClientImpl.class); - - /** The ID of the target subscription. */ - private String subscriptionId; - - /** - * Gets The ID of the target subscription. - * - * @return the subscriptionId value. - */ - public String getSubscriptionId() { - return this.subscriptionId; - } - - /** - * Sets The ID of the target subscription. - * - * @param subscriptionId the subscriptionId value. - * @return the service client itself. - */ - public StorageManagementClientImpl setSubscriptionId(String subscriptionId) { - this.subscriptionId = subscriptionId; - return this; - } - - /** server parameter. */ - private String host; - - /** - * Gets server parameter. - * - * @return the host value. - */ - public String getHost() { - return this.host; - } - - /** - * Sets server parameter. - * - * @param host the host value. - * @return the service client itself. - */ - public StorageManagementClientImpl setHost(String host) { - this.host = host; - return this; - } - - /** Api Version. */ - private String apiVersion; - - /** - * Gets Api Version. - * - * @return the apiVersion value. - */ - public String getApiVersion() { - return this.apiVersion; - } - - /** - * Sets Api Version. - * - * @param apiVersion the apiVersion value. - * @return the service client itself. - */ - public StorageManagementClientImpl setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - return this; - } - - /** The HTTP pipeline to send requests through. */ - private final HttpPipeline httpPipeline; - - /** - * Gets The HTTP pipeline to send requests through. - * - * @return the httpPipeline value. - */ - public HttpPipeline getHttpPipeline() { - return this.httpPipeline; - } - - /** The OperationsInner object to access its operations. */ - private final OperationsInner operations; - - /** - * Gets the OperationsInner object to access its operations. - * - * @return the OperationsInner object. - */ - public OperationsInner operations() { - return this.operations; - } - - /** The SkusInner object to access its operations. */ - private final SkusInner skus; - - /** - * Gets the SkusInner object to access its operations. - * - * @return the SkusInner object. - */ - public SkusInner skus() { - return this.skus; - } - - /** The StorageAccountsInner object to access its operations. */ - private final StorageAccountsInner storageAccounts; - - /** - * Gets the StorageAccountsInner object to access its operations. - * - * @return the StorageAccountsInner object. - */ - public StorageAccountsInner storageAccounts() { - return this.storageAccounts; - } - - /** The UsagesInner object to access its operations. */ - private final UsagesInner usages; - - /** - * Gets the UsagesInner object to access its operations. - * - * @return the UsagesInner object. - */ - public UsagesInner usages() { - return this.usages; - } - - /** The ManagementPoliciesInner object to access its operations. */ - private final ManagementPoliciesInner managementPolicies; - - /** - * Gets the ManagementPoliciesInner object to access its operations. - * - * @return the ManagementPoliciesInner object. - */ - public ManagementPoliciesInner managementPolicies() { - return this.managementPolicies; - } - - /** The PrivateEndpointConnectionsInner object to access its operations. */ - private final PrivateEndpointConnectionsInner privateEndpointConnections; - - /** - * Gets the PrivateEndpointConnectionsInner object to access its operations. - * - * @return the PrivateEndpointConnectionsInner object. - */ - public PrivateEndpointConnectionsInner privateEndpointConnections() { - return this.privateEndpointConnections; - } - - /** The PrivateLinkResourcesInner object to access its operations. */ - private final PrivateLinkResourcesInner privateLinkResources; - - /** - * Gets the PrivateLinkResourcesInner object to access its operations. - * - * @return the PrivateLinkResourcesInner object. - */ - public PrivateLinkResourcesInner privateLinkResources() { - return this.privateLinkResources; - } - - /** The ObjectReplicationPoliciesOperationsInner object to access its operations. */ - private final ObjectReplicationPoliciesOperationsInner objectReplicationPoliciesOperations; - - /** - * Gets the ObjectReplicationPoliciesOperationsInner object to access its operations. - * - * @return the ObjectReplicationPoliciesOperationsInner object. - */ - public ObjectReplicationPoliciesOperationsInner objectReplicationPoliciesOperations() { - return this.objectReplicationPoliciesOperations; - } - - /** The EncryptionScopesInner object to access its operations. */ - private final EncryptionScopesInner encryptionScopes; - - /** - * Gets the EncryptionScopesInner object to access its operations. - * - * @return the EncryptionScopesInner object. - */ - public EncryptionScopesInner encryptionScopes() { - return this.encryptionScopes; - } - - /** The BlobServicesInner object to access its operations. */ - private final BlobServicesInner blobServices; - - /** - * Gets the BlobServicesInner object to access its operations. - * - * @return the BlobServicesInner object. - */ - public BlobServicesInner blobServices() { - return this.blobServices; - } - - /** The BlobContainersInner object to access its operations. */ - private final BlobContainersInner blobContainers; - - /** - * Gets the BlobContainersInner object to access its operations. - * - * @return the BlobContainersInner object. - */ - public BlobContainersInner blobContainers() { - return this.blobContainers; - } - - /** The FileServicesInner object to access its operations. */ - private final FileServicesInner fileServices; - - /** - * Gets the FileServicesInner object to access its operations. - * - * @return the FileServicesInner object. - */ - public FileServicesInner fileServices() { - return this.fileServices; - } - - /** The FileSharesInner object to access its operations. */ - private final FileSharesInner fileShares; - - /** - * Gets the FileSharesInner object to access its operations. - * - * @return the FileSharesInner object. - */ - public FileSharesInner fileShares() { - return this.fileShares; - } - - /** The QueueServicesInner object to access its operations. */ - private final QueueServicesInner queueServices; - - /** - * Gets the QueueServicesInner object to access its operations. - * - * @return the QueueServicesInner object. - */ - public QueueServicesInner queueServices() { - return this.queueServices; - } - - /** The QueuesInner object to access its operations. */ - private final QueuesInner queues; - - /** - * Gets the QueuesInner object to access its operations. - * - * @return the QueuesInner object. - */ - public QueuesInner queues() { - return this.queues; - } - - /** The TableServicesInner object to access its operations. */ - private final TableServicesInner tableServices; - - /** - * Gets the TableServicesInner object to access its operations. - * - * @return the TableServicesInner object. - */ - public TableServicesInner tableServices() { - return this.tableServices; - } - - /** The TablesInner object to access its operations. */ - private final TablesInner tables; - - /** - * Gets the TablesInner object to access its operations. - * - * @return the TablesInner object. - */ - public TablesInner tables() { - return this.tables; - } - - /** Initializes an instance of StorageManagementClient client. */ - public StorageManagementClientImpl() { - this( - new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()).build(), - AzureEnvironment.AZURE); - } - - /** - * Initializes an instance of StorageManagementClient client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - */ - public StorageManagementClientImpl(HttpPipeline httpPipeline) { - this(httpPipeline, AzureEnvironment.AZURE); - } - - /** - * Initializes an instance of StorageManagementClient client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - * @param environment The Azure environment. - */ - public StorageManagementClientImpl(HttpPipeline httpPipeline, AzureEnvironment environment) { - super(httpPipeline, environment); - this.httpPipeline = httpPipeline; - this.operations = new OperationsInner(this); - this.skus = new SkusInner(this); - this.storageAccounts = new StorageAccountsInner(this); - this.usages = new UsagesInner(this); - this.managementPolicies = new ManagementPoliciesInner(this); - this.privateEndpointConnections = new PrivateEndpointConnectionsInner(this); - this.privateLinkResources = new PrivateLinkResourcesInner(this); - this.objectReplicationPoliciesOperations = new ObjectReplicationPoliciesOperationsInner(this); - this.encryptionScopes = new EncryptionScopesInner(this); - this.blobServices = new BlobServicesInner(this); - this.blobContainers = new BlobContainersInner(this); - this.fileServices = new FileServicesInner(this); - this.fileShares = new FileSharesInner(this); - this.queueServices = new QueueServicesInner(this); - this.queues = new QueuesInner(this); - this.tableServices = new TableServicesInner(this); - this.tables = new TablesInner(this); - } -} diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageResourceType.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageResourceType.java similarity index 95% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageResourceType.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageResourceType.java index fdac6232d55f..bfbc7347ff94 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageResourceType.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageResourceType.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import java.util.Collection; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageService.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageService.java similarity index 96% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageService.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageService.java index eb85821bd79a..04e570355509 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageService.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageService.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.util.ExpandableStringEnum; import java.util.Collection; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageSku.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSku.java similarity index 91% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageSku.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSku.java index 8a67e249af58..f41a807ccc68 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageSku.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSku.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.models.SkuInformationInner; +import com.azure.management.storage.fluent.inner.SkuInformationInner; import java.util.List; /** Type representing sku for an Azure storage resource. */ diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageSkus.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSkus.java similarity index 66% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageSkus.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSkus.java index be44420ecb5e..13c8ca966d15 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageSkus.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageSkus.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.management.resources.fluentcore.arm.models.HasManager; import com.azure.management.resources.fluentcore.collection.SupportsListing; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.SkusInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.SkusClient; /** Entry point to storage service SKUs. */ -public interface StorageSkus extends SupportsListing, HasInner, HasManager { +public interface StorageSkus extends SupportsListing, HasInner, HasManager { } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageUsage.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageUsage.java similarity index 100% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/StorageUsage.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/StorageUsage.java diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/TagFilter.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TagFilter.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/TagFilter.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TagFilter.java index be30d173db08..aed531b0029d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/TagFilter.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TagFilter.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/TagProperty.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TagProperty.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/TagProperty.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TagProperty.java index 8afaf177332d..d0670513e5f9 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/TagProperty.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TagProperty.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/TrackedResource.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TrackedResource.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/TrackedResource.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TrackedResource.java index cb31eb1e824a..547a749ceeef 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/TrackedResource.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/TrackedResource.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.management.ProxyResource; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/UpdateHistoryProperty.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UpdateHistoryProperty.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/UpdateHistoryProperty.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UpdateHistoryProperty.java index efdeb1d2ac2d..57d98d012651 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/UpdateHistoryProperty.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UpdateHistoryProperty.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/UsageName.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageName.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/UsageName.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageName.java index c020b32e56a7..1baef418c89d 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/UsageName.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageName.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Immutable; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/UsageUnit.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageUnit.java similarity index 97% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/UsageUnit.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageUnit.java index 39db295c2f97..02ffabc1ece3 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/UsageUnit.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/UsageUnit.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Usages.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Usages.java similarity index 64% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/Usages.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Usages.java index cfba9dd67332..db4f060fee3a 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/Usages.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/Usages.java @@ -1,17 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.management.resources.fluentcore.arm.models.HasManager; import com.azure.management.resources.fluentcore.collection.SupportsListing; import com.azure.management.resources.fluentcore.model.HasInner; -import com.azure.management.storage.implementation.StorageManager; -import com.azure.management.storage.models.UsageInner; -import com.azure.management.storage.models.UsagesInner; +import com.azure.management.storage.StorageManager; +import com.azure.management.storage.fluent.UsagesClient; +import com.azure.management.storage.fluent.inner.UsageInner; /** Entry point for storage resource usage management API. */ @Fluent -public interface Usages extends SupportsListing, HasInner, HasManager { +public interface Usages extends SupportsListing, HasInner, HasManager { } diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/VirtualNetworkRule.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/VirtualNetworkRule.java similarity index 98% rename from sdk/storage/mgmt/src/main/java/com/azure/management/storage/VirtualNetworkRule.java rename to sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/VirtualNetworkRule.java index 889482f2e817..a4ba800fb04b 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/VirtualNetworkRule.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/VirtualNetworkRule.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) AutoRest Code Generator. -package com.azure.management.storage; +package com.azure.management.storage.models; import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/package-info.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/package-info.java index ef78cb31747e..23a3bab1f6dd 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/package-info.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/models/package-info.java @@ -1,9 +1,5 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. -/** - * Package containing the implementations and inner classes for StorageManagementClient. The Azure Storage Management - * API. - */ +/** Package containing the classes for StorageManagementClient. The Azure Storage Management API. */ package com.azure.management.storage.models; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/package-info.java b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/package-info.java index 61e5576dcb0d..a6900a32adc2 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/management/storage/package-info.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/management/storage/package-info.java @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. -/** - * This package contains the base classes for storage management sdk. - */ +/** Package containing the classes for StorageManagementClient. The Azure Storage Management API. */ package com.azure.management.storage; diff --git a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountNetworkRuleTests.java b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountNetworkRuleTests.java index 060a49e754fb..e52a8a9df767 100644 --- a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountNetworkRuleTests.java +++ b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountNetworkRuleTests.java @@ -7,6 +7,8 @@ import com.azure.management.resources.ResourceGroup; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; +import com.azure.management.storage.models.DefaultAction; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountOperationsTests.java b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountOperationsTests.java index 7782ad8cccf3..5ef5f7cbc658 100644 --- a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountOperationsTests.java +++ b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageAccountOperationsTests.java @@ -11,6 +11,14 @@ import com.azure.management.resources.fluentcore.utils.Utils; import java.util.List; import java.util.Map; + +import com.azure.management.storage.models.SkuName; +import com.azure.management.storage.models.StorageAccount; +import com.azure.management.storage.models.StorageAccountEncryptionKeySource; +import com.azure.management.storage.models.StorageAccountEncryptionStatus; +import com.azure.management.storage.models.StorageAccountKey; +import com.azure.management.storage.models.StorageAccountSkuType; +import com.azure.management.storage.models.StorageService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; diff --git a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobContainersTests.java b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobContainersTests.java index 02ad0b1865bf..0d2a42f7728d 100644 --- a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobContainersTests.java +++ b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobContainersTests.java @@ -9,6 +9,10 @@ import java.util.Map; import com.azure.management.resources.fluentcore.profile.AzureProfile; +import com.azure.management.storage.models.BlobContainer; +import com.azure.management.storage.models.BlobContainers; +import com.azure.management.storage.models.PublicAccess; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobServicesTests.java b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobServicesTests.java index ed8555cbddc8..44a423109fc7 100644 --- a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobServicesTests.java +++ b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageBlobServicesTests.java @@ -6,6 +6,9 @@ import com.azure.core.http.HttpPipeline; import com.azure.management.resources.fluentcore.arm.Region; import com.azure.management.resources.fluentcore.profile.AzureProfile; +import com.azure.management.storage.models.BlobServiceProperties; +import com.azure.management.storage.models.BlobServices; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementPoliciesTests.java b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementPoliciesTests.java index 5626b6e3beea..7ccfc19158b4 100644 --- a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementPoliciesTests.java +++ b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementPoliciesTests.java @@ -10,6 +10,12 @@ import java.util.List; import com.azure.management.resources.fluentcore.profile.AzureProfile; +import com.azure.management.storage.models.AccessTier; +import com.azure.management.storage.models.BlobTypes; +import com.azure.management.storage.models.ManagementPolicies; +import com.azure.management.storage.models.ManagementPolicy; +import com.azure.management.storage.models.PolicyRule; +import com.azure.management.storage.models.StorageAccount; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementTest.java b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementTest.java index 342bea118707..f03d05bb0bc1 100644 --- a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementTest.java +++ b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/StorageManagementTest.java @@ -7,7 +7,6 @@ import com.azure.management.resources.core.TestBase; import com.azure.management.resources.fluentcore.profile.AzureProfile; import com.azure.management.resources.implementation.ResourceManager; -import com.azure.management.storage.implementation.StorageManager; /** The base for storage manager tests. */ public abstract class StorageManagementTest extends TestBase { diff --git a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/UsageOperationsTests.java b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/UsageOperationsTests.java index c3584472428e..df60ebee6873 100644 --- a/sdk/storage/mgmt/src/test/java/com/azure/management/storage/UsageOperationsTests.java +++ b/sdk/storage/mgmt/src/test/java/com/azure/management/storage/UsageOperationsTests.java @@ -5,7 +5,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.management.resources.core.TestUtilities; -import com.azure.management.storage.models.UsageInner; +import com.azure.management.storage.fluent.inner.UsageInner; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test;