Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -646,7 +646,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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -632,7 +632,7 @@ public Flux<Indexable> createAsync() {
if (currentStorageAccount == null && storageAccountToSet == null && storageAccountCreatable == null) {
withNewStorageAccount(
this.manager().getSdkContext().randomResourceName(name(), 20),
com.azure.management.storage.SkuName.STANDARD_GRS);
com.azure.management.storage.models.SkuName.STANDARD_GRS);
}
}
return super.createAsync();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,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.StorageAccount;
import com.azure.management.storage.StorageAccountSkuType;
import com.azure.management.storage.models.StorageAccount;
import com.azure.management.storage.models.StorageAccountSkuType;
import com.azure.management.storage.implementation.StorageManager;
import java.io.ByteArrayOutputStream;
import java.io.File;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
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.models.StorageAccount;
import com.azure.management.storage.implementation.StorageManager;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
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.models.StorageAccount;
import com.azure.management.storage.implementation.StorageManager;
import reactor.core.Exceptions;
import reactor.core.publisher.Mono;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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.model.Creatable;
import com.azure.management.storage.StorageAccount;
import com.azure.management.storage.models.StorageAccount;
import com.azure.management.storage.implementation.StorageManager;
import java.time.OffsetDateTime;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
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.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.implementation.StorageManager;

/** The entry point for accessing resource management APIs in Azure. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sdk/management/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function codegen(project, cb) {
cmd = autoRestExe + ' ' + readmeFile +
' --java ' +
' --azure-arm=true ' +
' --track1-naming=true --generate-client-as-impl=true --implementation-subpackage=models --sync-methods=all --required-parameter-client-methods=true --add-context-parameter=true --context-client-method-parameter=true --client-side-validations=true --client-logger=true ' +
' --track1-naming=true --implementation-subpackage=inner --sync-methods=all --required-parameter-client-methods=true --add-context-parameter=true --context-client-method-parameter=true --client-side-validations=true --client-logger=true ' +
generator +
` --java.namespace=${mappings[project].package} ` +
` --java.output-folder=${outDir} ` +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading