MGMT draft structure refactor for storage

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -1951,6 +1951,10 @@
     <Package name="~com\.azure\.management\.(.+)\.models"/>
     <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE,SKIPPED_CLASS_TOO_BIG"/>
   </Match>
+  <Match>
+    <Package name="~com\.azure\.management\.(.+)\.fluent"/>
+    <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE,SKIPPED_CLASS_TOO_BIG"/>
+  </Match>
 
   <!-- Exclude REC_CATCH_EXCEPTION for management samples. All samples in management catch Exception instead of throw it. -->
   <Match>

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.

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<AppServiceManager, WebSiteManagementClientImpl> {

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<Indexable> 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();

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;

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;
 

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;

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;

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<ComputeManager, ComputeManagementClientImpl> {

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;

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;

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;

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;
 

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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

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;

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;

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;
 

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;

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;

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;
 

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;

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} ` +

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;