diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java index b90e5bc19a18..8a65c85c89e0 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ApiManagementConfig.java @@ -21,7 +21,7 @@ public final class ApiManagementConfig { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java index e93ba466aedc..65e9f1bd86bb 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ArmIdWrapper.java @@ -21,7 +21,7 @@ public final class ArmIdWrapper { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java index 3f098a4aeea1..1957e719e2f2 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/ContainerInfo.java @@ -184,7 +184,7 @@ public ContainerInfo withName(String name) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java index c18bff1665ad..34dda75edc33 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/HostingEnvironmentProfile.java @@ -33,7 +33,7 @@ public final class HostingEnvironmentProfile { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java index c8367b8a0f50..c8b9aed395d0 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/PrivateLinkResource.java @@ -39,7 +39,7 @@ public final class PrivateLinkResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java index 683278fd7f6b..219a4fd7f42c 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/SnapshotRecoverySource.java @@ -57,7 +57,7 @@ public SnapshotRecoverySource withLocation(String location) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java index baaa1c264d38..56047b8b4ea9 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/Solution.java @@ -58,7 +58,7 @@ public final class Solution { * * @return the id value. */ - public Double getId() { + public Double id() { return this.id; } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java index 938763bc9d63..f47ab37cec29 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/VirtualNetworkProfile.java @@ -39,7 +39,7 @@ public final class VirtualNetworkProfile { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java index 879f67f2c2bb..24678dee88fd 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java @@ -25,13 +25,13 @@ class AppServiceCertificateKeyVaultBindingImpl AppServiceCertificateKeyVaultBindingImpl( AppServiceCertificateResourceInner innerObject, AppServiceCertificateOrderImpl parent) { - super(innerObject.getName(), innerObject, (parent != null) ? parent.manager() : null); + super(innerObject.name(), innerObject, (parent != null) ? parent.manager() : null); this.parent = parent; } @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java index 82044d379f85..8c659fa58b55 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java @@ -152,7 +152,7 @@ public AppServiceCertificateKeyVaultBinding createKeyVaultBinding(String certifi @Override public Mono createKeyVaultBindingAsync(String certificateName, Vault vault) { AppServiceCertificateResourceInner certInner = new AppServiceCertificateResourceInner(); - certInner.setLocation(vault.regionName()); + certInner.withLocation(vault.regionName()); certInner.withKeyVaultId(vault.id()); certInner.withKeyVaultSecretName(certificateName); return this diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java index 4f5a870e86a9..c0d98486630a 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java @@ -34,7 +34,7 @@ protected AppServiceCertificateOrderImpl wrapModel(AppServiceCertificateOrderInn if (inner == null) { return null; } - return new AppServiceCertificateOrderImpl(inner.getName(), inner, this.manager()); + return new AppServiceCertificateOrderImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java index 622e831941e5..e4b322d21ea5 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceCertificatesImpl.java @@ -52,7 +52,7 @@ protected AppServiceCertificateImpl wrapModel(CertificateInner inner) { if (inner == null) { return null; } - return new AppServiceCertificateImpl(inner.getName(), inner, this.manager()); + return new AppServiceCertificateImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java index 76797561a5ad..178ac1dfd671 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainImpl.java @@ -34,7 +34,7 @@ class AppServiceDomainImpl AppServiceDomainImpl(String name, DomainInner innerObject, AppServiceManager manager) { super(name, innerObject, manager); - inner().setLocation("global"); + inner().withLocation("global"); if (inner().managedHostNames() != null) { this.hostNameMap = inner().managedHostNames().stream().collect(Collectors.toMap(HostName::name, Function.identity())); diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java index 93005685a36e..4169bac6bb60 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceDomainsImpl.java @@ -32,7 +32,7 @@ protected AppServiceDomainImpl wrapModel(DomainInner inner) { if (inner == null) { return null; } - return new AppServiceDomainImpl(inner.getName(), inner, this.manager()); + return new AppServiceDomainImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java index 5089d2648b0f..727727ecbb2d 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServicePlansImpl.java @@ -29,7 +29,7 @@ protected AppServicePlanImpl wrapModel(AppServicePlanInner inner) { if (inner == null) { return null; } - return new AppServicePlanImpl(inner.getName(), inner, this.manager()); + return new AppServicePlanImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java index f3eff551370a..9f85665ea1f9 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotBaseImpl.java @@ -54,7 +54,7 @@ abstract class DeploymentSlotBaseImpl< this.name = name.replaceAll(".*/", ""); this.parent = parent; inner().withServerFarmId(parent.appServicePlanId()); - inner().setLocation(regionName()); + inner().withLocation(regionName()); } @Override diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java index 3624c2ac8062..204a1fd5bc32 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/DeploymentSlotsImpl.java @@ -53,11 +53,11 @@ protected PagedFlux wrapPageAsync(PagedFlux innerPage this .inner() .getConfigurationSlotAsync( - siteInner.resourceGroup(), parent.name(), siteInner.getName()), + siteInner.resourceGroup(), parent.name(), siteInner.name()), this .inner() .getDiagnosticLogsConfigurationSlotAsync( - siteInner.resourceGroup(), parent.name(), siteInner.getName()), + siteInner.resourceGroup(), parent.name(), siteInner.name()), (siteConfigResourceInner, logsConfigInner) -> this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner))); } @@ -132,6 +132,6 @@ private DeploymentSlotImpl wrapModel( if (inner == null) { return null; } - return new DeploymentSlotImpl(inner.getName(), inner, siteConfig, logConfig, parent); + return new DeploymentSlotImpl(inner.name(), inner, siteConfig, logConfig, parent); } } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java index c9424c46eb7c..698e2cf85559 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppsImpl.java @@ -87,7 +87,7 @@ private FunctionAppImpl wrapModel( if (inner == null) { return null; } - return new FunctionAppImpl(inner.getName(), inner, siteConfig, logConfig, this.manager()); + return new FunctionAppImpl(inner.name(), inner, siteConfig, logConfig, this.manager()); } @Override @@ -100,11 +100,11 @@ protected PagedFlux wrapPageAsync(PagedFlux innerPage) { && Arrays.asList(siteInner.kind().split(",")).contains("functionapp")) { return Mono .zip( - this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.getName()), + this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.name()), this .inner() .getDiagnosticLogsConfigurationAsync( - siteInner.resourceGroup(), siteInner.getName()), + siteInner.resourceGroup(), siteInner.name()), (siteConfigResourceInner, logsConfigInner) -> this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner)); } else { diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java index 78d7dcd0bf81..d7cc051a52df 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionDeploymentSlotsImpl.java @@ -56,11 +56,11 @@ protected PagedFlux wrapPageAsync(PagedFlux i this .inner() .getConfigurationSlotAsync( - siteInner.resourceGroup(), parent.name(), siteInner.getName()), + siteInner.resourceGroup(), parent.name(), siteInner.name()), this .inner() .getDiagnosticLogsConfigurationSlotAsync( - siteInner.resourceGroup(), parent.name(), siteInner.getName()), + siteInner.resourceGroup(), parent.name(), siteInner.name()), (siteConfigResourceInner, logsConfigInner) -> this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner))); } @@ -135,6 +135,6 @@ private FunctionDeploymentSlotImpl wrapModel( if (inner == null) { return null; } - return new FunctionDeploymentSlotImpl(inner.getName(), inner, siteConfig, logConfig, parent); + return new FunctionDeploymentSlotImpl(inner.name(), inner, siteConfig, logConfig, parent); } } diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java index 54bd9f35e882..04c4ea16ec15 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/HostNameBindingImpl.java @@ -45,7 +45,7 @@ class HostNameBindingImpl wrapPageAsync(PagedFlux innerPage) { if (siteInner.kind() == null || Arrays.asList(siteInner.kind().split(",")).contains("app")) { return Mono .zip( - this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.getName()), + this.inner().getConfigurationAsync(siteInner.resourceGroup(), siteInner.name()), this .inner() .getDiagnosticLogsConfigurationAsync( - siteInner.resourceGroup(), siteInner.getName()), + siteInner.resourceGroup(), siteInner.name()), (siteConfigResourceInner, logsConfigInner) -> this.wrapModel(siteInner, siteConfigResourceInner, logsConfigInner)); } else { diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java index 93c0313b9ff5..1b536baa2ee9 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/models/OperationInner.java @@ -68,7 +68,7 @@ public final class OperationInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java index 1eac9d20969a..cb7849fc6248 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/AppRole.java @@ -60,7 +60,7 @@ public final class AppRole { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java index 87d7d27c6543..b9e0ef828f30 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/OAuth2Permission.java @@ -117,7 +117,7 @@ public OAuth2Permission withAdminConsentDisplayName(String adminConsentDisplayNa * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java index 98c5386a895a..94a44ac8a28d 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/ResourceAccess.java @@ -39,7 +39,7 @@ public final class ResourceAccess { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java index 3fabf6493164..c20c4402d853 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/implementation/RoleAssignmentImpl.java @@ -43,7 +43,7 @@ class RoleAssignmentImpl extends CreatableImpl assignableScopes() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java index ca4ddc100323..5bd8224a2e79 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ClassicAdministratorInner.java @@ -47,7 +47,7 @@ public class ClassicAdministratorInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java index 255dbbc36f31..9f3d6e3f028c 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/ProviderOperationsMetadataInner.java @@ -54,7 +54,7 @@ public final class ProviderOperationsMetadataInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java index 8973dd009461..d937ab343863 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleAssignmentInner.java @@ -59,7 +59,7 @@ public class RoleAssignmentInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java index 13c8d2129d49..bbcf499d88f4 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/management/graphrbac/models/RoleDefinitionInner.java @@ -66,7 +66,7 @@ public class RoleDefinitionInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java index 2c370feaf941..1fd2afbe0bd7 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ApiEntityReference.java @@ -23,7 +23,7 @@ public final class ApiEntityReference { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java index 9f28cf6a8e4b..478bf8b866b0 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/CreationSource.java @@ -63,7 +63,7 @@ public CreationSourceType type() { public String sourceId() { if (this.type() == CreationSourceType.FROM_OS_DISK_IMAGE || this.type() == CreationSourceType.FROM_DATA_DISK_IMAGE) { - return this.creationData.imageReference().getId(); + return this.creationData.imageReference().id(); } if (this.type() == CreationSourceType.IMPORTED_FROM_VHD) { return this.creationData.sourceUri(); diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java index dc0880a77ccb..c3e464fc5800 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ImageDiskReference.java @@ -30,7 +30,7 @@ public final class ImageDiskReference { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java index aca452a7754f..f163ad897e4b 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/ManagedArtifact.java @@ -21,7 +21,7 @@ public final class ManagedArtifact { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java index c5026e106650..9a0e3d72958a 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SourceVault.java @@ -21,7 +21,7 @@ public final class SourceVault { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java index 1953b621b139..f86bdf81a475 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/SubResourceReadOnly.java @@ -21,7 +21,7 @@ public class SubResourceReadOnly { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java index e2ac377cef81..e33cde28bf68 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetImpl.java @@ -63,7 +63,7 @@ public Set virtualMachineIds() { if (idOfVMsInSet == null) { idOfVMsInSet = new HashSet<>(); for (SubResource resource : this.inner().virtualMachines()) { - idOfVMsInSet.add(resource.getId()); + idOfVMsInSet.add(resource.id()); } } return Collections.unmodifiableSet(idOfVMsInSet); @@ -71,7 +71,7 @@ public Set virtualMachineIds() { @Override public ProximityPlacementGroup proximityPlacementGroup() { - ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().getId()); + ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().id()); ProximityPlacementGroupInner plgInner = manager().inner().proximityPlacementGroups().getByResourceGroup(id.resourceGroupName(), id.name()); if (plgInner == null) { @@ -135,7 +135,7 @@ public AvailabilitySetImpl withSku(AvailabilitySetSkuTypes skuType) { @Override public AvailabilitySetImpl withProximityPlacementGroup(String proximityPlacementGroupId) { - this.inner().withProximityPlacementGroup(new SubResource().setId(proximityPlacementGroupId)); + this.inner().withProximityPlacementGroup(new SubResource().withId(proximityPlacementGroupId)); this.newProximityPlacementGroupType = null; this.newProximityPlacementGroupName = null; return this; @@ -190,7 +190,7 @@ private Mono createNewProximityPlacementGroupAsync() { if (this.newProximityPlacementGroupName != null && !this.newProximityPlacementGroupName.isEmpty()) { ProximityPlacementGroupInner plgInner = new ProximityPlacementGroupInner(); plgInner.withProximityPlacementGroupType(this.newProximityPlacementGroupType); - plgInner.setLocation(this.inner().getLocation()); + plgInner.withLocation(this.inner().location()); return this .manager() .inner() @@ -198,7 +198,7 @@ private Mono createNewProximityPlacementGroupAsync() { .createOrUpdateAsync(this.resourceGroupName(), this.newProximityPlacementGroupName, plgInner) .map( createdPlgInner -> { - this.inner().withProximityPlacementGroup(new SubResource().setId(createdPlgInner.getId())); + this.inner().withProximityPlacementGroup(new SubResource().withId(createdPlgInner.id())); return this; }); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java index 0b2af4512a4a..5a9382b768c1 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/AvailabilitySetsImpl.java @@ -71,6 +71,6 @@ protected AvailabilitySetImpl wrapModel(AvailabilitySetInner availabilitySetInne if (availabilitySetInner == null) { return null; } - return new AvailabilitySetImpl(availabilitySetInner.getName(), availabilitySetInner, this.manager()); + return new AvailabilitySetImpl(availabilitySetInner.name(), availabilitySetInner, this.manager()); } } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java index c50f690976bd..d2cd4a7fa8f1 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/CustomImageDataDiskImpl.java @@ -47,19 +47,19 @@ public CustomImageDataDiskImpl fromVhd(String sourceVhdUrl) { @Override public CustomImageDataDiskImpl fromSnapshot(String sourceSnapshotId) { - this.inner().withSnapshot(new SubResource().setId(sourceSnapshotId)); + this.inner().withSnapshot(new SubResource().withId(sourceSnapshotId)); return this; } @Override public CustomImageDataDiskImpl fromManagedDisk(String sourceManagedDiskId) { - this.inner().withManagedDisk(new SubResource().setId(sourceManagedDiskId)); + this.inner().withManagedDisk(new SubResource().withId(sourceManagedDiskId)); return this; } @Override public CustomImageDataDiskImpl fromManagedDisk(Disk sourceManagedDisk) { - this.inner().withManagedDisk(new SubResource().setId(sourceManagedDisk.id())); + this.inner().withManagedDisk(new SubResource().withId(sourceManagedDisk.id())); return this; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java index 5ca4bb40aaf4..2bd5f52307f6 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/DisksImpl.java @@ -56,7 +56,7 @@ protected DiskImpl wrapModel(DiskInner inner) { if (inner == null) { return null; } - return new DiskImpl(inner.getName(), inner, this.manager()); + return new DiskImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java index f902922d9f53..e4a7a9aabbdd 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/EncryptionSettings.java @@ -64,7 +64,7 @@ DiskEncryptionSettings storageProfileEncryptionSettings() { keyEncryptionKey = new KeyVaultKeyReference(); keyEncryptionKey.withKeyUrl(config.keyEncryptionKeyUrl()); if (config.keyEncryptionKeyVaultId() != null) { - keyEncryptionKey.withSourceVault(new SubResource().setId(config.keyEncryptionKeyVaultId())); + keyEncryptionKey.withSourceVault(new SubResource().withId(config.keyEncryptionKeyVaultId())); } } DiskEncryptionSettings diskEncryptionSettings = new DiskEncryptionSettings(); @@ -73,7 +73,7 @@ DiskEncryptionSettings storageProfileEncryptionSettings() { .withKeyEncryptionKey(keyEncryptionKey) .withDiskEncryptionKey(new KeyVaultSecretReference()) .diskEncryptionKey() - .withSourceVault(new SubResource().setId(config.keyVaultId())); + .withSourceVault(new SubResource().withId(config.keyVaultId())); return diskEncryptionSettings; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java index 08b8bd99653c..ad25e03324d2 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleriesImpl.java @@ -97,7 +97,7 @@ public GalleryImpl define(String name) { @Override protected GalleryImpl wrapModel(GalleryInner inner) { - return new GalleryImpl(inner.getName(), inner, manager()); + return new GalleryImpl(inner.name(), inner, manager()); } @Override diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java index e77a97c40d60..73234fdf4bd1 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageImpl.java @@ -47,14 +47,14 @@ class GalleryImageImpl extends CreatableUpdatableImpl getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -161,7 +161,7 @@ public String eula() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -171,12 +171,12 @@ public GalleryImageIdentifier identifier() { @Override public String location() { - return this.inner().getLocation(); + return this.inner().location(); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override @@ -216,12 +216,12 @@ public String releaseNoteUri() { @Override public Map tags() { - return this.inner().getTags(); + return this.inner().tags(); } @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override @@ -240,13 +240,13 @@ public GalleryImageImpl withExistingGallery(Gallery gallery) { @Override public GalleryImageImpl withLocation(String location) { - this.inner().setLocation(location); + this.inner().withLocation(location); return this; } @Override public GalleryImageImpl withLocation(Region location) { - this.inner().setLocation(location.toString()); + this.inner().withLocation(location.toString()); return this; } @@ -473,7 +473,7 @@ public GalleryImageImpl withReleaseNoteUri(String releaseNoteUri) { @Override public GalleryImageImpl withTags(Map tags) { - this.inner().setTags(tags); + this.inner().withTags(tags); return this; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java index bf82f8b0e2c9..fd0a538a061c 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImageVersionImpl.java @@ -42,15 +42,15 @@ class GalleryImageVersionImpl } GalleryImageVersionImpl(GalleryImageVersionInner inner, ComputeManager manager) { - super(inner.getName(), inner); + super(inner.name(), inner); this.manager = manager; // Set resource name - this.galleryImageVersionName = inner.getName(); + this.galleryImageVersionName = inner.name(); // resource ancestor names - this.resourceGroupName = getValueFromIdByName(inner.getId(), "resourceGroups"); - this.galleryName = getValueFromIdByName(inner.getId(), "galleries"); - this.galleryImageName = getValueFromIdByName(inner.getId(), "images"); - this.galleryImageVersionName = getValueFromIdByName(inner.getId(), "versions"); + this.resourceGroupName = getValueFromIdByName(inner.id(), "resourceGroups"); + this.galleryName = getValueFromIdByName(inner.id(), "galleries"); + this.galleryImageName = getValueFromIdByName(inner.id(), "images"); + this.galleryImageVersionName = getValueFromIdByName(inner.id(), "versions"); // } @@ -97,22 +97,22 @@ protected Mono getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override public String location() { - return this.inner().getLocation(); + return this.inner().location(); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override @@ -170,12 +170,12 @@ public GalleryImageVersionStorageProfile storageProfile() { @Override public Map tags() { - return this.inner().getTags(); + return this.inner().tags(); } @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override @@ -189,13 +189,13 @@ public GalleryImageVersionImpl withExistingImage( @Override public GalleryImageVersionImpl withLocation(String location) { - this.inner().setLocation(location); + this.inner().withLocation(location); return this; } @Override public DefinitionStages.WithSource withLocation(Region location) { - this.inner().setLocation(location.toString()); + this.inner().withLocation(location.toString()); return this; } @@ -349,7 +349,7 @@ public GalleryImageVersionImpl withoutExcludedFromLatest() { @Override public GalleryImageVersionImpl withTags(Map tags) { - this.inner().setTags(tags); + this.inner().withTags(tags); return this; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java index 29329753a469..7e79c6c46b0e 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/GalleryImpl.java @@ -43,7 +43,7 @@ protected Mono getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java index fb89a06f1ffd..33fd0bb3d49b 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java @@ -116,7 +116,7 @@ private Mono retrieveExtensionWithInstanceViewAsyn return computeManager .inner() .virtualMachineExtensions() - .getAsync(rgName, vmName, extension.getName(), "instanceView") + .getAsync(rgName, vmName, extension.name(), "instanceView") .onErrorResume(e -> Mono.empty()); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java index 95ea67146c66..861cc12918a1 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProximityPlacementGroupImpl.java @@ -43,7 +43,7 @@ public List availabilitySetIds() { @Override public String location() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -53,7 +53,7 @@ public String resourceGroupName() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -68,7 +68,7 @@ private List getStringListFromSubResourceList(List subList) stringList = new ArrayList<>(); Iterator iter = subList.iterator(); while (iter.hasNext()) { - stringList.add(iter.next().getId()); + stringList.add(iter.next().id()); } } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java index aaa6b5b280a3..86e941e0678d 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/ProxyEncryptionMonitorImpl.java @@ -86,16 +86,16 @@ public Mono refreshAsync() { self.resolvedEncryptionMonitor = (osType() == OperatingSystemTypes.LINUX) ? new LinuxDiskVolumeNoAADEncryptionMonitorImpl( - virtualMachine.getId(), computeManager) + virtualMachine.id(), computeManager) : new WindowsVolumeNoAADEncryptionMonitorImpl( - virtualMachine.getId(), computeManager); + virtualMachine.id(), computeManager); } else { self.resolvedEncryptionMonitor = (osType() == OperatingSystemTypes.LINUX) ? new LinuxDiskVolumeLegacyEncryptionMonitorImpl( - virtualMachine.getId(), computeManager) + virtualMachine.id(), computeManager) : new WindowsVolumeLegacyEncryptionMonitorImpl( - virtualMachine.getId(), computeManager); + virtualMachine.id(), computeManager); } return self.resolvedEncryptionMonitor.refreshAsync(); }) diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java index 2aec864b7110..36cc5d90e4d9 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/SnapshotsImpl.java @@ -58,7 +58,7 @@ protected SnapshotImpl wrapModel(SnapshotInner inner) { if (inner == null) { return null; } - return new SnapshotImpl(inner.getName(), inner, this.manager()); + return new SnapshotImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java index 8b9c50b385cf..3ed371b9cef9 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VMSSPatchPayload.java @@ -27,7 +27,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s updateParameter.withPlan(scaleSet.inner().plan()); updateParameter.withSinglePlacementGroup(scaleSet.inner().singlePlacementGroup()); updateParameter.withSku(scaleSet.inner().sku()); - updateParameter.withTags(scaleSet.inner().getTags()); + updateParameter.withTags(scaleSet.inner().tags()); updateParameter.withUpgradePolicy(scaleSet.inner().upgradePolicy()); updateParameter.withAdditionalCapabilities(scaleSet.inner().additionalCapabilities()); // @@ -103,7 +103,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s nicPatchConfig.withName(nicConfig.name()); nicPatchConfig.withNetworkSecurityGroup(nicConfig.networkSecurityGroup()); nicPatchConfig.withPrimary(nicConfig.primary()); - nicPatchConfig.setId(nicConfig.getId()); + nicPatchConfig.withId(nicConfig.id()); if (nicConfig.ipConfigurations() != null) { nicPatchConfig .withIpConfigurations(new ArrayList()); @@ -120,7 +120,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s patchIpConfig.withPrimary(ipConfig.primary()); patchIpConfig.withPrivateIPAddressVersion(ipConfig.privateIPAddressVersion()); patchIpConfig.withSubnet(ipConfig.subnet()); - patchIpConfig.setId(ipConfig.getId()); + patchIpConfig.withId(ipConfig.id()); if (ipConfig.publicIPAddressConfiguration() != null) { patchIpConfig .withPublicIPAddressConfiguration( @@ -141,7 +141,7 @@ static VirtualMachineScaleSetUpdate preparePatchPayload(VirtualMachineScaleSet s for (SubResource asg : ipConfig.applicationSecurityGroups()) { patchIpConfig .applicationSecurityGroups() - .add(new SubResource().setId(asg.getId())); + .add(new SubResource().withId(asg.id())); } } nicPatchConfig.ipConfigurations().add(patchIpConfig); diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java index 7c78629bec8d..2e0d9b76d281 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImageImpl.java @@ -51,7 +51,7 @@ public String sourceVirtualMachineId() { if (this.inner().sourceVirtualMachine() == null) { return null; } - return this.inner().sourceVirtualMachine().getId(); + return this.inner().sourceVirtualMachine().id(); } @Override @@ -76,7 +76,7 @@ public Map dataDiskImages() { @Override public VirtualMachineCustomImageImpl fromVirtualMachine(String virtualMachineId) { - this.inner().withSourceVirtualMachine(new SubResource().setId(virtualMachineId)); + this.inner().withSourceVirtualMachine(new SubResource().withId(virtualMachineId)); return this; } @@ -108,7 +108,7 @@ public VirtualMachineCustomImageImpl withWindowsFromSnapshot( .ensureOsDiskImage() .withOsState(osState) .withOsType(OperatingSystemTypes.WINDOWS) - .withSnapshot(new SubResource().setId(sourceSnapshotId)); + .withSnapshot(new SubResource().withId(sourceSnapshotId)); return this; } @@ -119,7 +119,7 @@ public VirtualMachineCustomImageImpl withLinuxFromSnapshot( .ensureOsDiskImage() .withOsState(osState) .withOsType(OperatingSystemTypes.LINUX) - .withSnapshot(new SubResource().setId(sourceSnapshotId)); + .withSnapshot(new SubResource().withId(sourceSnapshotId)); return this; } @@ -143,7 +143,7 @@ public VirtualMachineCustomImageImpl withWindowsFromDisk( .ensureOsDiskImage() .withOsState(osState) .withOsType(OperatingSystemTypes.WINDOWS) - .withManagedDisk(new SubResource().setId(sourceManagedDiskId)); + .withManagedDisk(new SubResource().withId(sourceManagedDiskId)); return this; } @@ -154,7 +154,7 @@ public VirtualMachineCustomImageImpl withLinuxFromDisk( .ensureOsDiskImage() .withOsState(osState) .withOsType(OperatingSystemTypes.LINUX) - .withManagedDisk(new SubResource().setId(sourceManagedDiskId)); + .withManagedDisk(new SubResource().withId(sourceManagedDiskId)); return this; } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java index 23f95d694ae8..265d366bfaee 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineCustomImagesImpl.java @@ -29,7 +29,7 @@ protected VirtualMachineCustomImageImpl wrapModel(ImageInner inner) { if (inner == null) { return null; } - return new VirtualMachineCustomImageImpl(inner.getName(), inner, this.manager()); + return new VirtualMachineCustomImageImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java index d2a7a3dbaf6e..1cbd302fe4e0 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineDataDiskImpl.java @@ -51,7 +51,7 @@ public String id() { if (this.inner().managedDisk() == null) { return null; } - return this.inner().managedDisk().getId(); + return this.inner().managedDisk().id(); } @Override diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java index 7bab06f80ac5..27eb6a92b08d 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java @@ -22,12 +22,12 @@ class VirtualMachineExtensionImageImpl extends WrapperImpl getInstanceViewAsync() { @Override public Map tags() { - Map tags = this.inner().getTags(); + Map tags = this.inner().tags(); if (tags == null) { tags = new TreeMap<>(); } @@ -178,23 +178,23 @@ public VirtualMachineExtensionImpl withVersion(String extensionImageVersionName) @Override public final VirtualMachineExtensionImpl withTags(Map tags) { - this.inner().setTags(new HashMap<>(tags)); + this.inner().withTags(new HashMap<>(tags)); return this; } @Override public final VirtualMachineExtensionImpl withTag(String key, String value) { - if (this.inner().getTags() == null) { - this.inner().setTags(new HashMap<>()); + if (this.inner().tags() == null) { + this.inner().withTags(new HashMap<>()); } - this.inner().getTags().put(key, value); + this.inner().tags().put(key, value); return this; } @Override public final VirtualMachineExtensionImpl withoutTag(String key) { - if (this.inner().getTags() != null) { - this.inner().getTags().remove(key); + if (this.inner().tags() != null) { + this.inner().tags().remove(key); } return this; } @@ -209,9 +209,9 @@ public VirtualMachineImpl attach() { protected Mono getInnerAsync() { String name; if (this.isReference()) { - name = ResourceUtils.nameFromResourceId(this.inner().getId()); + name = ResourceUtils.nameFromResourceId(this.inner().id()); } else { - name = this.inner().getName(); + name = this.inner().name(); } return this.client.getAsync(this.parent().resourceGroupName(), this.parent().name(), name); } @@ -235,7 +235,7 @@ public Mono createResourceAsync() { public Mono updateResourceAsync() { this.nullifySettingsIfEmpty(); if (this.isReference()) { - String extensionName = ResourceUtils.nameFromResourceId(this.inner().getId()); + String extensionName = ResourceUtils.nameFromResourceId(this.inner().id()); return this .client .getAsync(this.parent().resourceGroupName(), this.parent().name(), extensionName) @@ -281,7 +281,7 @@ public Mono deleteResourceAsync() { * on a specific VM will return fully expanded extension details. */ public boolean isReference() { - return this.inner().getName() == null; + return this.inner().name() == null; } // Helper methods diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java index 79bcb3bd7d18..fc5c5da3b070 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineExtensionsImpl.java @@ -116,17 +116,17 @@ protected List listChildResources() { List childResources = new ArrayList<>(); if (getParent().inner().resources() != null) { for (VirtualMachineExtensionInner inner : getParent().inner().resources()) { - if (inner.getName() == null) { + if (inner.name() == null) { // This extension exists in the parent VM extension collection as a reference id. - inner.setLocation(getParent().regionName()); + inner.withLocation(getParent().regionName()); childResources .add( new VirtualMachineExtensionImpl( - ResourceUtils.nameFromResourceId(inner.getId()), this.getParent(), inner, this.client)); + ResourceUtils.nameFromResourceId(inner.id()), this.getParent(), inner, this.client)); } else { // This extension exists in the parent VM as a fully blown object childResources - .add(new VirtualMachineExtensionImpl(inner.getName(), this.getParent(), inner, this.client)); + .add(new VirtualMachineExtensionImpl(inner.name(), this.getParent(), inner, this.client)); } } } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java index d61088a9809c..0e6cb0f61e5e 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImageImpl.java @@ -50,7 +50,7 @@ public String id() { if (this.inner() == null) { return null; } - return this.inner().getId(); + return this.inner().id(); } @Override 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 83939d07ba78..ab623fcc926d 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 @@ -606,7 +606,7 @@ public VirtualMachineImpl withLatestLinuxImage(String publisher, String offer, S @Override public VirtualMachineImpl withWindowsCustomImage(String customImageId) { ImageReference imageReferenceInner = new ImageReference(); - imageReferenceInner.setId(customImageId); + imageReferenceInner.withId(customImageId); this.inner().storageProfile().osDisk().withCreateOption(DiskCreateOptionTypes.FROM_IMAGE); this.inner().storageProfile().withImageReference(imageReferenceInner); this.inner().osProfile().withWindowsConfiguration(new WindowsConfiguration()); @@ -624,7 +624,7 @@ public VirtualMachineImpl withWindowsGalleryImageVersion(String galleryImageVers @Override public VirtualMachineImpl withLinuxCustomImage(String customImageId) { ImageReference imageReferenceInner = new ImageReference(); - imageReferenceInner.setId(customImageId); + imageReferenceInner.withId(customImageId); this.inner().storageProfile().osDisk().withCreateOption(DiskCreateOptionTypes.FROM_IMAGE); this.inner().storageProfile().withImageReference(imageReferenceInner); this.inner().osProfile().withLinuxConfiguration(new LinuxConfiguration()); @@ -651,7 +651,7 @@ public VirtualMachineImpl withSpecializedOSUnmanagedDisk(String osDiskUrl, Opera @Override public VirtualMachineImpl withSpecializedOSDisk(Disk disk, OperatingSystemTypes osType) { ManagedDiskParameters diskParametersInner = new ManagedDiskParameters(); - diskParametersInner.setId(disk.id()); + diskParametersInner.withId(disk.id()); this.inner().storageProfile().osDisk().withCreateOption(DiskCreateOptionTypes.ATTACH); this.inner().storageProfile().osDisk().withManagedDisk(diskParametersInner); this.inner().storageProfile().osDisk().withOsType(osType); @@ -967,7 +967,7 @@ public VirtualMachineImpl withNewDataDisk( public VirtualMachineImpl withExistingDataDisk(Disk disk) { throwIfManagedDiskDisabled(ManagedUnmanagedDiskErrors.VM_BOTH_UNMANAGED_AND_MANAGED_DISK_NOT_ALLOWED); ManagedDiskParameters managedDiskParameters = new ManagedDiskParameters(); - managedDiskParameters.setId(disk.id()); + managedDiskParameters.withId(disk.id()); this .managedDataDisks .existingDisksToAttach @@ -979,7 +979,7 @@ public VirtualMachineImpl withExistingDataDisk(Disk disk) { public VirtualMachineImpl withExistingDataDisk(Disk disk, int lun, CachingTypes cachingType) { throwIfManagedDiskDisabled(ManagedUnmanagedDiskErrors.VM_BOTH_UNMANAGED_AND_MANAGED_DISK_NOT_ALLOWED); ManagedDiskParameters managedDiskParameters = new ManagedDiskParameters(); - managedDiskParameters.setId(disk.id()); + managedDiskParameters.withId(disk.id()); this .managedDataDisks .existingDisksToAttach @@ -991,7 +991,7 @@ public VirtualMachineImpl withExistingDataDisk(Disk disk, int lun, CachingTypes public VirtualMachineImpl withExistingDataDisk(Disk disk, int newSizeInGB, int lun, CachingTypes cachingType) { throwIfManagedDiskDisabled(ManagedUnmanagedDiskErrors.VM_BOTH_UNMANAGED_AND_MANAGED_DISK_NOT_ALLOWED); ManagedDiskParameters managedDiskParameters = new ManagedDiskParameters(); - managedDiskParameters.setId(disk.id()); + managedDiskParameters.withId(disk.id()); this .managedDataDisks .existingDisksToAttach @@ -1086,7 +1086,7 @@ public VirtualMachineImpl withNewAvailabilitySet(Creatable crea @Override public VirtualMachineImpl withProximityPlacementGroup(String proximityPlacementGroupId) { - this.inner().withProximityPlacementGroup(new SubResource().setId(proximityPlacementGroupId)); + this.inner().withProximityPlacementGroup(new SubResource().withId(proximityPlacementGroupId)); // clear the new setting newProximityPlacementGroupName = null; return this; @@ -1158,7 +1158,7 @@ public VirtualMachineImpl withoutSecondaryNetworkInterface(String name) { for (NetworkInterfaceReference nicReference : this.inner().networkProfile().networkInterfaces()) { idx++; if (!nicReference.primary() - && name.equalsIgnoreCase(ResourceUtils.nameFromResourceId(nicReference.getId()))) { + && name.equalsIgnoreCase(ResourceUtils.nameFromResourceId(nicReference.id()))) { this.inner().networkProfile().networkInterfaces().remove(idx); break; } @@ -1401,7 +1401,7 @@ public String osDiskId() { if (!isManagedDiskEnabled()) { return null; } - return this.storageProfile().osDisk().managedDisk().getId(); + return this.storageProfile().osDisk().managedDisk().id(); } @Override @@ -1448,7 +1448,7 @@ public String getPrimaryPublicIPAddressId() { public List networkInterfaceIds() { List nicIds = new ArrayList<>(); for (NetworkInterfaceReference nicRef : inner().networkProfile().networkInterfaces()) { - nicIds.add(nicRef.getId()); + nicIds.add(nicRef.id()); } return nicIds; } @@ -1459,7 +1459,7 @@ public String primaryNetworkInterfaceId() { String primaryNicRefId = null; if (nicRefs.size() == 1) { // One NIC so assume it to be primary - primaryNicRefId = nicRefs.get(0).getId(); + primaryNicRefId = nicRefs.get(0).id(); } else if (nicRefs.size() == 0) { // No NICs so null primaryNicRefId = null; @@ -1467,13 +1467,13 @@ public String primaryNetworkInterfaceId() { // Find primary interface as flagged by Azure for (NetworkInterfaceReference nicRef : inner().networkProfile().networkInterfaces()) { if (nicRef.primary() != null && nicRef.primary()) { - primaryNicRefId = nicRef.getId(); + primaryNicRefId = nicRef.id(); break; } } // If Azure didn't flag any NIC as primary then assume the first one if (primaryNicRefId == null) { - primaryNicRefId = nicRefs.get(0).getId(); + primaryNicRefId = nicRefs.get(0).id(); } } return primaryNicRefId; @@ -1482,7 +1482,7 @@ public String primaryNetworkInterfaceId() { @Override public String availabilitySetId() { if (inner().availabilitySet() != null) { - return inner().availabilitySet().getId(); + return inner().availabilitySet().id(); } return null; } @@ -1499,7 +1499,7 @@ public String licenseType() { @Override public ProximityPlacementGroup proximityPlacementGroup() { - ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().getId()); + ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().id()); ProximityPlacementGroupInner plgInner = manager().inner().proximityPlacementGroups().getByResourceGroup(id.resourceGroupName(), id.name()); if (plgInner == null) { @@ -1723,7 +1723,7 @@ public Mono updateResourceAsync() { updateParameter.withAvailabilitySet(this.inner().availabilitySet()); updateParameter.withLicenseType(this.inner().licenseType()); updateParameter.withZones(this.inner().zones()); - updateParameter.withTags(this.inner().getTags()); + updateParameter.withTags(this.inner().tags()); updateParameter.withProximityPlacementGroup(this.inner().proximityPlacementGroup()); updateParameter.withPriority(this.inner().priority()); this.virtualMachineMsiHandler.handleExternalIdentities(updateParameter); @@ -1945,7 +1945,7 @@ private Mono createNewProximityPlacementGroupAsync() { if (this.newProximityPlacementGroupName != null && !this.newProximityPlacementGroupName.isEmpty()) { ProximityPlacementGroupInner plgInner = new ProximityPlacementGroupInner(); plgInner.withProximityPlacementGroupType(this.newProximityPlacementGroupType); - plgInner.setLocation(this.inner().getLocation()); + plgInner.withLocation(this.inner().location()); return this .manager() .inner() @@ -1953,7 +1953,7 @@ private Mono createNewProximityPlacementGroupAsync() { .createOrUpdateAsync(this.resourceGroupName(), this.newProximityPlacementGroupName, plgInner) .map( createdPlgInner -> { - this.inner().withProximityPlacementGroup(new SubResource().setId(createdPlgInner.getId())); + this.inner().withProximityPlacementGroup(new SubResource().withId(createdPlgInner.id())); return this; }); } @@ -1973,7 +1973,7 @@ private void handleNetworkSettings() { if (primaryNetworkInterface != null) { NetworkInterfaceReference nicReference = new NetworkInterfaceReference(); nicReference.withPrimary(true); - nicReference.setId(primaryNetworkInterface.id()); + nicReference.withId(primaryNetworkInterface.id()); this.inner().networkProfile().networkInterfaces().add(nicReference); } } @@ -1985,14 +1985,14 @@ private void handleNetworkSettings() { this.taskResult(creatableSecondaryNetworkInterfaceKey); NetworkInterfaceReference nicReference = new NetworkInterfaceReference(); nicReference.withPrimary(false); - nicReference.setId(secondaryNetworkInterface.id()); + nicReference.withId(secondaryNetworkInterface.id()); this.inner().networkProfile().networkInterfaces().add(nicReference); } for (NetworkInterface secondaryNetworkInterface : this.existingSecondaryNetworkInterfacesToAssociate) { NetworkInterfaceReference nicReference = new NetworkInterfaceReference(); nicReference.withPrimary(false); - nicReference.setId(secondaryNetworkInterface.id()); + nicReference.withId(secondaryNetworkInterface.id()); this.inner().networkProfile().networkInterfaces().add(nicReference); } } @@ -2014,7 +2014,7 @@ private void handleAvailabilitySettings() { this.inner().withAvailabilitySet(new SubResource()); } - this.inner().availabilitySet().setId(availabilitySet.id()); + this.inner().availabilitySet().withId(availabilitySet.id()); } } @@ -2086,7 +2086,7 @@ private boolean isOSDiskAttachedUnmanaged(OSDisk osDisk) { private boolean isOSDiskAttachedManaged(OSDisk osDisk) { return osDisk.createOption() == DiskCreateOptionTypes.ATTACH && osDisk.managedDisk() != null - && osDisk.managedDisk().getId() != null; + && osDisk.managedDisk().id() != null; } /** @@ -2125,7 +2125,7 @@ private boolean isOSDiskFromPlatformImage(StorageProfile storageProfile) { */ private boolean isOsDiskFromCustomImage(StorageProfile storageProfile) { ImageReference imageReference = storageProfile.imageReference(); - return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.getId() != null; + return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.id() != null; } /** @@ -2218,7 +2218,7 @@ public String principalId() { @Override public String resourceId() { if (inner() != null) { - return inner().getId(); + return inner().id(); } else { return null; } @@ -2340,7 +2340,7 @@ private void setAttachableNewDataDisks(Callable nextLun) throws Excepti dataDisk.withLun(nextLun.call()); } dataDisk.withManagedDisk(new ManagedDiskParameters()); - dataDisk.managedDisk().setId(managedDisk.id()); + dataDisk.managedDisk().withId(managedDisk.id()); if (dataDisk.caching() == null) { dataDisk.withCaching(getDefaultCachingType()); } 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 c0d465643607..79777d02e29f 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 @@ -366,7 +366,7 @@ public int capacity() { @Override public Network getPrimaryNetwork() throws IOException { - String subnetId = primaryNicDefaultIPConfiguration().subnet().getId(); + String subnetId = primaryNicDefaultIPConfiguration().subnet().id(); String virtualNetworkId = ResourceUtils.parentResourceIdFromResourceId(subnetId); return this.networkManager.networks().getById(virtualNetworkId); } @@ -515,7 +515,7 @@ public boolean isAcceleratedNetworkingEnabled() { public String networkSecurityGroupId() { VirtualMachineScaleSetNetworkConfiguration nicConfig = primaryNicConfiguration(); if (nicConfig.networkSecurityGroup() != null) { - return nicConfig.networkSecurityGroup().getId(); + return nicConfig.networkSecurityGroup().id(); } else { return null; } @@ -537,7 +537,7 @@ public List applicationGatewayBackendAddressPoolsIds() { List result = new ArrayList<>(); if (backendPools != null) { for (SubResource backendPool : backendPools) { - result.add(backendPool.getId()); + result.add(backendPool.id()); } } return result; @@ -549,7 +549,7 @@ public List applicationSecurityGroupIds() { List asgIds = new ArrayList<>(); if (nicIpConfig.applicationSecurityGroups() != null) { for (SubResource asg : nicIpConfig.applicationSecurityGroups()) { - asgIds.add(asg.getId()); + asgIds.add(asg.id()); } } return asgIds; @@ -562,7 +562,7 @@ public Boolean doNotRunExtensionsOnOverprovisionedVMs() { @Override public ProximityPlacementGroup proximityPlacementGroup() { - ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().getId()); + ResourceId id = ResourceId.fromString(inner().proximityPlacementGroup().id()); ProximityPlacementGroupInner plgInner = manager().inner().proximityPlacementGroups().getByResourceGroup(id.resourceGroupName(), id.name()); if (plgInner == null) { @@ -713,7 +713,7 @@ public VirtualMachineScaleSetImpl withExistingPrimaryInternalLoadBalancer(LoadBa this.primaryInternalLoadBalancer, this.primaryNicDefaultIPConfiguration()); } else { String vmNicVnetId = - ResourceUtils.parentResourceIdFromResourceId(primaryNicDefaultIPConfiguration().subnet().getId()); + ResourceUtils.parentResourceIdFromResourceId(primaryNicDefaultIPConfiguration().subnet().id()); if (!vmNicVnetId.equalsIgnoreCase(lbNetworkId)) { throw logger.logExceptionAsError(new IllegalArgumentException( "Virtual network associated with scale set virtual machines" @@ -827,7 +827,7 @@ public VirtualMachineScaleSetImpl withSpecificWindowsImageVersion(ImageReference @Override public VirtualMachineScaleSetImpl withWindowsCustomImage(String customImageId) { ImageReference imageReferenceInner = new ImageReference(); - imageReferenceInner.setId(customImageId); + imageReferenceInner.withId(customImageId); this .inner() .virtualMachineProfile() @@ -891,7 +891,7 @@ public VirtualMachineScaleSetImpl withSpecificLinuxImageVersion(ImageReference i @Override public VirtualMachineScaleSetImpl withLinuxCustomImage(String customImageId) { ImageReference imageReferenceInner = new ImageReference(); - imageReferenceInner.setId(customImageId); + imageReferenceInner.withId(customImageId); this .inner() .virtualMachineProfile() @@ -1907,12 +1907,12 @@ private Mono loadCurrentPrimaryLoadBalancersIfAvaila VirtualMachineScaleSetIPConfiguration ipConfig = primaryNicDefaultIPConfiguration(); if (!ipConfig.loadBalancerBackendAddressPools().isEmpty()) { firstLoadBalancerId = - ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerBackendAddressPools().get(0).getId()); + ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerBackendAddressPools().get(0).id()); } if (firstLoadBalancerId == null && !ipConfig.loadBalancerInboundNatPools().isEmpty()) { firstLoadBalancerId = - ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerInboundNatPools().get(0).getId()); + ResourceUtils.parentResourceIdFromResourceId(ipConfig.loadBalancerInboundNatPools().get(0).id()); } if (firstLoadBalancerId == null) { @@ -1944,18 +1944,18 @@ private Mono loadCurrentPrimaryLoadBalancersIfAvaila String secondLoadBalancerId = null; for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) { - if (!subResource.getId().toLowerCase(Locale.ROOT) + if (!subResource.id().toLowerCase(Locale.ROOT) .startsWith(firstLoadBalancerId.toLowerCase(Locale.ROOT))) { - secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.getId()); + secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.id()); break; } } if (secondLoadBalancerId == null) { for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) { - if (!subResource.getId().toLowerCase(Locale.ROOT) + if (!subResource.id().toLowerCase(Locale.ROOT) .startsWith(firstLoadBalancerId.toLowerCase(Locale.ROOT))) { - secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.getId()); + secondLoadBalancerId = ResourceUtils.parentResourceIdFromResourceId(subResource.id()); break; } } @@ -2028,13 +2028,13 @@ private static void associateBackEndsToIpConfiguration( String backendPoolId = mergePath(loadBalancerId, "backendAddressPools", backendName); boolean found = false; for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) { - if (subResource.getId().equalsIgnoreCase(backendPoolId)) { + if (subResource.id().equalsIgnoreCase(backendPoolId)) { found = true; break; } } if (!found) { - backendSubResourcesToAssociate.add(new SubResource().setId(backendPoolId)); + backendSubResourcesToAssociate.add(new SubResource().withId(backendPoolId)); } } @@ -2050,13 +2050,13 @@ private static void associateInboundNATPoolsToIpConfiguration( String inboundNatPoolId = mergePath(loadBalancerId, "inboundNatPools", inboundNatPool); boolean found = false; for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) { - if (subResource.getId().equalsIgnoreCase(inboundNatPoolId)) { + if (subResource.id().equalsIgnoreCase(inboundNatPoolId)) { found = true; break; } } if (!found) { - inboundNatPoolSubResourcesToAssociate.add(new SubResource().setId(inboundNatPoolId)); + inboundNatPoolSubResourcesToAssociate.add(new SubResource().withId(inboundNatPoolId)); } } @@ -2073,7 +2073,7 @@ private static Map getBackendsAssociatedWithIpConfi for (LoadBalancerBackend lbBackend : lbBackends.values()) { String backendId = mergePath(loadBalancerId, "backendAddressPools", lbBackend.name()); for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) { - if (subResource.getId().equalsIgnoreCase(backendId)) { + if (subResource.id().equalsIgnoreCase(backendId)) { attachedBackends.put(lbBackend.name(), lbBackend); } } @@ -2089,7 +2089,7 @@ private static Map getInboundNatPoolsAssocia for (LoadBalancerInboundNatPool lbInboundNatPool : lbInboundNatPools.values()) { String inboundNatPoolId = mergePath(loadBalancerId, "inboundNatPools", lbInboundNatPool.name()); for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) { - if (subResource.getId().equalsIgnoreCase(inboundNatPoolId)) { + if (subResource.id().equalsIgnoreCase(inboundNatPoolId)) { attachedInboundNatPools.put(lbInboundNatPool.name(), lbInboundNatPool); } } @@ -2130,7 +2130,7 @@ private static void removeAllBackendAssociationFromIpConfiguration( LoadBalancer loadBalancer, VirtualMachineScaleSetIPConfiguration ipConfig) { List toRemove = new ArrayList<>(); for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) { - if (subResource.getId().toLowerCase(Locale.ROOT) + if (subResource.id().toLowerCase(Locale.ROOT) .startsWith(loadBalancer.id().toLowerCase(Locale.ROOT) + "/")) { toRemove.add(subResource); } @@ -2145,7 +2145,7 @@ private static void removeAllInboundNatPoolAssociationFromIpConfiguration( LoadBalancer loadBalancer, VirtualMachineScaleSetIPConfiguration ipConfig) { List toRemove = new ArrayList<>(); for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) { - if (subResource.getId().toLowerCase(Locale.ROOT) + if (subResource.id().toLowerCase(Locale.ROOT) .startsWith(loadBalancer.id().toLowerCase(Locale.ROOT) + "/")) { toRemove.add(subResource); } @@ -2162,7 +2162,7 @@ private static void removeBackendsFromIpConfiguration( for (String backendName : backendNames) { String backendPoolId = mergePath(loadBalancerId, "backendAddressPools", backendName); for (SubResource subResource : ipConfig.loadBalancerBackendAddressPools()) { - if (subResource.getId().equalsIgnoreCase(backendPoolId)) { + if (subResource.id().equalsIgnoreCase(backendPoolId)) { toRemove.add(subResource); break; } @@ -2180,7 +2180,7 @@ private static void removeInboundNatPoolsFromIpConfiguration( for (String natPoolName : inboundNatPoolNames) { String inboundNatPoolId = mergePath(loadBalancerId, "inboundNatPools", natPoolName); for (SubResource subResource : ipConfig.loadBalancerInboundNatPools()) { - if (subResource.getId().equalsIgnoreCase(inboundNatPoolId)) { + if (subResource.id().equalsIgnoreCase(inboundNatPoolId)) { toRemove.add(subResource); break; } @@ -2232,7 +2232,7 @@ public String principalId() { @Override public String resourceId() { if (inner() != null) { - return inner().getId(); + return inner().id(); } else { return null; } @@ -2288,7 +2288,7 @@ private boolean isOSDiskFromImage(VirtualMachineScaleSetOSDisk osDisk) { */ private boolean isOsDiskFromCustomImage(VirtualMachineScaleSetStorageProfile storageProfile) { ImageReference imageReference = storageProfile.imageReference(); - return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.getId() != null; + return isOSDiskFromImage(storageProfile.osDisk()) && imageReference != null && imageReference.id() != null; } /** @@ -2458,14 +2458,14 @@ public VirtualMachineScaleSetImpl withoutIpForwarding() { @Override public VirtualMachineScaleSetImpl withExistingNetworkSecurityGroup(NetworkSecurityGroup networkSecurityGroup) { VirtualMachineScaleSetNetworkConfiguration nicConfig = this.primaryNicConfiguration(); - nicConfig.withNetworkSecurityGroup(new SubResource().setId(networkSecurityGroup.id())); + nicConfig.withNetworkSecurityGroup(new SubResource().withId(networkSecurityGroup.id())); return this; } @Override public VirtualMachineScaleSetImpl withExistingNetworkSecurityGroupId(String networkSecurityGroupId) { VirtualMachineScaleSetNetworkConfiguration nicConfig = this.primaryNicConfiguration(); - nicConfig.withNetworkSecurityGroup(new SubResource().setId(networkSecurityGroupId)); + nicConfig.withNetworkSecurityGroup(new SubResource().withId(networkSecurityGroupId)); return this; } @@ -2496,13 +2496,13 @@ public VirtualMachineScaleSetImpl withExistingApplicationGatewayBackendPool(Stri } boolean found = false; for (SubResource backendPool : nicIpConfig.applicationGatewayBackendAddressPools()) { - if (backendPool.getId().equalsIgnoreCase(backendPoolId)) { + if (backendPool.id().equalsIgnoreCase(backendPoolId)) { found = true; break; } } if (!found) { - nicIpConfig.applicationGatewayBackendAddressPools().add(new SubResource().setId(backendPoolId)); + nicIpConfig.applicationGatewayBackendAddressPools().add(new SubResource().withId(backendPoolId)); } return this; } @@ -2517,7 +2517,7 @@ public VirtualMachineScaleSetImpl withoutApplicationGatewayBackendPool(String ba int index = -1; for (SubResource backendPool : nicIpConfig.applicationGatewayBackendAddressPools()) { index = index + 1; - if (backendPool.getId().equalsIgnoreCase(backendPoolId)) { + if (backendPool.id().equalsIgnoreCase(backendPoolId)) { foundIndex = index; break; } @@ -2543,13 +2543,13 @@ public VirtualMachineScaleSetImpl withExistingApplicationSecurityGroupId(String } boolean found = false; for (SubResource asg : nicIpConfig.applicationSecurityGroups()) { - if (asg.getId().equalsIgnoreCase(applicationSecurityGroupId)) { + if (asg.id().equalsIgnoreCase(applicationSecurityGroupId)) { found = true; break; } } if (!found) { - nicIpConfig.applicationSecurityGroups().add(new SubResource().setId(applicationSecurityGroupId)); + nicIpConfig.applicationSecurityGroups().add(new SubResource().withId(applicationSecurityGroupId)); } return this; } @@ -2564,7 +2564,7 @@ public VirtualMachineScaleSetImpl withoutApplicationSecurityGroup(String applica int index = -1; for (SubResource asg : nicIpConfig.applicationSecurityGroups()) { index = index + 1; - if (asg.getId().equalsIgnoreCase(applicationSecurityGroupId)) { + if (asg.id().equalsIgnoreCase(applicationSecurityGroupId)) { foundIndex = index; break; } @@ -2578,7 +2578,7 @@ public VirtualMachineScaleSetImpl withoutApplicationSecurityGroup(String applica @Override public VirtualMachineScaleSetImpl withProximityPlacementGroup(String proximityPlacementGroupId) { - this.inner().withProximityPlacementGroup(new SubResource().setId(proximityPlacementGroupId)); + this.inner().withProximityPlacementGroup(new SubResource().withId(proximityPlacementGroupId)); this.newProximityPlacementGroupName = null; return this; } @@ -2612,7 +2612,7 @@ private void createNewProximityPlacementGroup() { if (this.newProximityPlacementGroupName != null && !this.newProximityPlacementGroupName.isEmpty()) { ProximityPlacementGroupInner plgInner = new ProximityPlacementGroupInner(); plgInner.withProximityPlacementGroupType(this.newProximityPlacementGroupType); - plgInner.setLocation(this.inner().getLocation()); + plgInner.withLocation(this.inner().location()); plgInner = this .manager() @@ -2620,7 +2620,7 @@ private void createNewProximityPlacementGroup() { .proximityPlacementGroups() .createOrUpdate(this.resourceGroupName(), this.newProximityPlacementGroupName, plgInner); - this.inner().withProximityPlacementGroup((new SubResource().setId(plgInner.getId()))); + this.inner().withProximityPlacementGroup((new SubResource().withId(plgInner.id()))); } } } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java index c8cd3bb7d045..548dd01fd40d 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMImpl.java @@ -91,17 +91,17 @@ class VirtualMachineScaleSetVMImpl @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String regionName() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -111,15 +111,15 @@ public Region region() { @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override public Map tags() { - if (this.inner().getTags() == null) { + if (this.inner().tags() == null) { return Collections.unmodifiableMap(new LinkedHashMap<>()); } - return Collections.unmodifiableMap(this.inner().getTags()); + return Collections.unmodifiableMap(this.inner().tags()); } @Override @@ -164,7 +164,7 @@ public boolean isOSBasedOnPlatformImage() { @Override public boolean isOSBasedOnCustomImage() { ImageReference imageReference = this.inner().storageProfile().imageReference(); - if (imageReference != null && imageReference.getId() != null) { + if (imageReference != null && imageReference.id() != null) { return true; } return false; @@ -207,7 +207,7 @@ public VirtualMachineImage getOSPlatformImage() { public VirtualMachineCustomImage getOSCustomImage() { if (this.isOSBasedOnCustomImage()) { ImageReference imageReference = this.inner().storageProfile().imageReference(); - return this.computeManager.virtualMachineCustomImages().getById(imageReference.getId()); + return this.computeManager.virtualMachineCustomImages().getById(imageReference.id()); } return null; } @@ -236,7 +236,7 @@ public String osUnmanagedDiskVhdUri() { @Override public String osDiskId() { if (this.storageProfile().osDisk().managedDisk() != null) { - return this.storageProfile().osDisk().managedDisk().getId(); + return this.storageProfile().osDisk().managedDisk().id(); } return null; } @@ -346,7 +346,7 @@ public String bootDiagnosticStorageAccountUri() { @Override public String availabilitySetId() { if (this.inner().availabilitySet() != null) { - return this.inner().availabilitySet().getId(); + return this.inner().availabilitySet().id(); } return null; } @@ -355,7 +355,7 @@ public String availabilitySetId() { public List networkInterfaceIds() { List resourceIds = new ArrayList<>(); for (NetworkInterfaceReference reference : this.inner().networkProfile().networkInterfaces()) { - resourceIds.add(reference.getId()); + resourceIds.add(reference.id()); } return Collections.unmodifiableList(resourceIds); } @@ -364,7 +364,7 @@ public List networkInterfaceIds() { public String primaryNetworkInterfaceId() { for (NetworkInterfaceReference reference : this.inner().networkProfile().networkInterfaces()) { if (reference.primary() != null && reference.primary()) { - return reference.getId(); + return reference.id(); } } return null; @@ -377,7 +377,7 @@ public Map extensions() { for (VirtualMachineExtensionInner extensionInner : this.inner().resources()) { extensions .put( - extensionInner.getName(), + extensionInner.name(), new VirtualMachineScaleSetVMInstanceExtensionImpl(extensionInner, this)); } } @@ -594,7 +594,7 @@ public Update withExistingDataDisk( ManagedDiskParameters managedDiskParameters = new ManagedDiskParameters().withStorageAccountType(storageAccountTypes); - managedDiskParameters.setId(dataDisk.id()); + managedDiskParameters.withId(dataDisk.id()); DataDisk attachDataDisk = new DataDisk() diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java index 0ae1ec81d947..93272d6c30f5 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java @@ -28,7 +28,7 @@ class VirtualMachineScaleSetVMInstanceExtensionImpl @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override @@ -38,7 +38,7 @@ public String publisherName() { @Override public String typeName() { - return this.inner().getType(); + return this.inner().type(); } @Override @@ -73,10 +73,10 @@ public VirtualMachineExtensionInstanceView instanceView() { @Override public Map tags() { - if (this.inner().getTags() == null) { + if (this.inner().tags() == null) { return Collections.unmodifiableMap(new LinkedHashMap()); } - return Collections.unmodifiableMap(this.inner().getTags()); + return Collections.unmodifiableMap(this.inner().tags()); } private void initializeSettings() { 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 3d96554fef50..cb7ea815f11e 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 @@ -216,6 +216,6 @@ protected VirtualMachineScaleSetImpl wrapModel(VirtualMachineScaleSetInner inner return null; } return new VirtualMachineScaleSetImpl( - inner.getName(), inner, this.manager(), this.storageManager, this.networkManager, this.rbacManager); + inner.name(), inner, this.manager(), this.storageManager, this.networkManager, this.rbacManager); } } 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 94d02d9cc112..671427cc1b1f 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 @@ -221,7 +221,7 @@ protected VirtualMachineImpl wrapModel(VirtualMachineInner virtualMachineInner) return null; } return new VirtualMachineImpl( - virtualMachineInner.getName(), + virtualMachineInner.name(), virtualMachineInner, this.manager(), this.storageManager, diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java index 8fe6c4402fbe..b3e6b5c11524 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/models/RunCommandDocumentBaseInner.java @@ -66,7 +66,7 @@ public RunCommandDocumentBaseInner withSchema(String schema) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } 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 cf6b61dd9172..d7def390e163 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 @@ -319,8 +319,8 @@ public void canCreateImageFromManagedDisk() { Assertions.assertNotNull(diskImage.managedDisk()); Assertions .assertTrue( - diskImage.managedDisk().getId().equalsIgnoreCase(managedDataDisk1.id()) - || diskImage.managedDisk().getId().equalsIgnoreCase(managedDataDisk2.id())); + diskImage.managedDisk().id().equalsIgnoreCase(managedDataDisk1.id()) + || diskImage.managedDisk().id().equalsIgnoreCase(managedDataDisk2.id())); } computeManager.disks().deleteById(managedOsDisk.id()); computeManager.disks().deleteById(managedDataDisk1.id()); diff --git a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java index c3714a38dfb6..bbc63e625f64 100644 --- a/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java +++ b/sdk/compute/mgmt/src/test/java/com/azure/management/compute/VirtualMachineManagedDiskOperationsTests.java @@ -327,7 +327,7 @@ public void canCreateVirtualMachineFromCustomImageWithManagedDisks() { Assertions.assertEquals(customImage.dataDiskImages().size(), 5); for (ImageDataDisk imageDataDisk : customImage.dataDiskImages().values()) { Assertions.assertNull(imageDataDisk.blobUri()); - Assertions.assertNotNull(imageDataDisk.managedDisk().getId()); + Assertions.assertNotNull(imageDataDisk.managedDisk().id()); } // Create virtual machine from the custom image 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 b6fbd1a33133..e4ff23004460 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 @@ -694,13 +694,13 @@ public void canUpdateTagsOnVM() { // checking to see if withTag correctly update virtualMachine.update().withTag("test", "testValue").apply(); - Assertions.assertEquals("testValue", virtualMachine.inner().getTags().get("test")); + Assertions.assertEquals("testValue", virtualMachine.inner().tags().get("test")); // checking to see if withTags correctly updates Map testTags = new HashMap(); testTags.put("testTag", "testValue"); virtualMachine.update().withTags(testTags).apply(); - Assertions.assertEquals(testTags, virtualMachine.inner().getTags()); + Assertions.assertEquals(testTags, virtualMachine.inner().tags()); } @Test 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 4666017bc830..58331207f86c 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 @@ -464,7 +464,7 @@ public void canCreateVirtualMachineScaleSetWithSecret() throws Exception { group .add( new VaultSecretGroup() - .withSourceVault(new SubResource().setId(vault.id())) + .withSourceVault(new SubResource().withId(vault.id())) .withVaultCertificates(certs)); VirtualMachineScaleSet virtualMachineScaleSet = diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java index 7bc28a9c7237..92391bc7a873 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/EventContent.java @@ -60,7 +60,7 @@ public final class EventContent { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java index 963b55bf6375..e11944327f73 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/ImageUpdateTrigger.java @@ -35,7 +35,7 @@ public final class ImageUpdateTrigger { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java index 3fc6fd0a3124..33cc41487fe4 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/Request.java @@ -48,7 +48,7 @@ public final class Request { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java index 62eed4c80397..c23e1a4c5d75 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/SourceTriggerDescriptor.java @@ -57,7 +57,7 @@ public final class SourceTriggerDescriptor { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java index b63a84dbe63d..cc02d34456da 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/StorageAccountProperties.java @@ -21,7 +21,7 @@ public final class StorageAccountProperties { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } 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 dd900ebbe96f..5cd90baa498e 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 @@ -45,7 +45,7 @@ public PagedFlux listAsync() { return this .inner() .listAsync() - .mapPage(inner -> new RegistryImpl(inner.getName(), inner, this.manager(), this.storageManager)); + .mapPage(inner -> new RegistryImpl(inner.name(), inner, this.manager(), this.storageManager)); } @Override @@ -89,7 +89,7 @@ protected RegistryImpl wrapModel(RegistryInner containerServiceInner) { } return new RegistryImpl( - containerServiceInner.getName(), containerServiceInner, this.manager(), this.storageManager); + containerServiceInner.name(), containerServiceInner, this.manager(), this.storageManager); } @Override diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java index 5725f0437f41..0e23d3345111 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryDockerTaskStepImpl.java @@ -178,7 +178,7 @@ public DockerTaskStep inner() { } private boolean isInCreateMode() { - if (this.taskImpl.inner().getId() == null) { + if (this.taskImpl.inner().id() == null) { return true; } return false; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java index 5c6907d23385..883582f3b0bf 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryEncodedTaskStepImpl.java @@ -143,7 +143,7 @@ public EncodedTaskStep inner() { } private boolean isInCreateMode() { - if (this.taskImpl.inner().getId() == null) { + if (this.taskImpl.inner().id() == null) { return true; } return false; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java index 4de000d9ee32..085a5223e849 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryFileTaskStepImpl.java @@ -143,7 +143,7 @@ public FileTaskStep inner() { } private boolean isInCreateMode() { - if (this.taskImpl.inner().getId() == null) { + if (this.taskImpl.inner().id() == null) { return true; } return false; 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 c56772440db1..0a3f8b7ac1ca 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 @@ -75,7 +75,7 @@ public Mono createResourceAsync() { .createAsync(self.resourceGroupName(), self.name(), self.inner()) .map(innerToFluentMap(this)); } else { - updateParameters.withTags(inner().getTags()); + updateParameters.withTags(inner().tags()); return manager() .inner() .registries() @@ -116,7 +116,7 @@ public String storageAccountName() { return null; } - return ResourceUtils.nameFromResourceId(this.inner().storageAccount().getId()); + return ResourceUtils.nameFromResourceId(this.inner().storageAccount().id()); } @Override @@ -125,7 +125,7 @@ public String storageAccountId() { return null; } - return this.inner().storageAccount().getId(); + return this.inner().storageAccount().id(); } @Override diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java index b2b303948061..5abc6813d426 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistrySourceTriggerImpl.java @@ -31,7 +31,7 @@ class RegistrySourceTriggerImpl RegistrySourceTriggerImpl(String sourceTriggerName, RegistryTaskImpl registryTaskImpl, boolean creation) { if (creation) { this.registryTaskImpl = registryTaskImpl; - if (registryTaskImpl.inner().getId() == null) { + if (registryTaskImpl.inner().id() == null) { this.inner = new SourceTrigger(); this.inner.withSourceRepository(new SourceProperties()); this.inner.withName(sourceTriggerName); @@ -263,7 +263,7 @@ public SourceTrigger inner() { } private boolean isInCreateMode() { - if (this.registryTaskImpl.inner().getId() == null) { + if (this.registryTaskImpl.inner().id() == null) { return true; } return false; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java index 5b2f3f42859a..6b04e2a142c5 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/RegistryTaskImpl.java @@ -64,22 +64,22 @@ class RegistryTaskImpl implements RegistryTask, RegistryTask.Definition, Registr @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override public String regionName() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -89,7 +89,7 @@ public Region region() { @Override public Map tags() { - return this.inner().getTags(); + return this.inner().tags(); } @Override @@ -184,11 +184,11 @@ public Map sourceTriggers() { RegistryTaskImpl(ContainerRegistryManager registryManager, TaskInner inner) { this.tasksInner = registryManager.inner().tasks(); - this.taskName = inner.getName(); + this.taskName = inner.name(); this.inner = inner; - this.resourceGroupName = ResourceUtils.groupFromResourceId(this.inner.getId()); + this.resourceGroupName = ResourceUtils.groupFromResourceId(this.inner.id()); this.registryName = - ResourceUtils.nameFromResourceId(ResourceUtils.parentResourceIdFromResourceId(this.inner.getId())); + ResourceUtils.nameFromResourceId(ResourceUtils.parentResourceIdFromResourceId(this.inner.id())); this.taskUpdateParameters = new TaskUpdateParameters(); setTaskUpdateParameterTriggers(); } @@ -217,13 +217,13 @@ public RegistryDockerTaskStep.DefinitionStages.Blank defineDockerTaskStep() { @Override public DefinitionStages.Platform withLocation(String location) { - this.inner.setLocation(location); + this.inner.withLocation(location); return this; } @Override public DefinitionStages.Platform withLocation(Region location) { - this.inner.setLocation(location.toString()); + this.inner.withLocation(location.toString()); return this; } @@ -541,7 +541,7 @@ public Mono applyAsync() { } private boolean isInCreateMode() { - if (this.inner().getId() == null) { + if (this.inner().id() == null) { return true; } return false; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java index 005b21612ab2..5d03d29927ac 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhookImpl.java @@ -97,17 +97,17 @@ private void initCreateUpdateParams() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override public String regionName() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -117,7 +117,7 @@ public Region region() { @Override public Map tags() { - Map tags = this.inner().getTags(); + Map tags = this.inner().tags(); if (tags == null) { tags = new TreeMap<>(); } @@ -186,7 +186,7 @@ public String ping() { .inner() .webhooks() .ping(this.resourceGroupName, this.registryName, name()) - .getId(); + .id(); } @Override @@ -196,7 +196,7 @@ public Mono pingAsync() { .inner() .webhooks() .pingAsync(this.resourceGroupName, this.registryName, name()) - .map(eventInfoInner -> eventInfoInner.getId()); + .map(eventInfoInner -> eventInfoInner.id()); } @Override @@ -344,7 +344,7 @@ public WebhookImpl withTags(Map tags) { if (tags != null) { this.tags = null; ensureValidTags(); - for (Map.Entry entry : inner().getTags().entrySet()) { + for (Map.Entry entry : inner().tags().entrySet()) { this.tags.put(entry.getKey(), entry.getValue()); } } @@ -404,7 +404,7 @@ public WebhookImpl withCustomHeaders(Map customHeaders) { if (customHeaders != null) { this.customHeaders = null; ensureValidCustomHeaders(); - for (Map.Entry entry : inner().getTags().entrySet()) { + for (Map.Entry entry : inner().tags().entrySet()) { this.customHeaders.put(entry.getKey(), entry.getValue()); } } diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java index cccaff707455..277451833d40 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/implementation/WebhooksClientImpl.java @@ -77,12 +77,12 @@ public PagedFlux listAsync(final String resourceGroupName, final String inner -> { if (self.containerRegistry != null) { return new WebhookImpl( - inner.getName(), self.containerRegistry, inner, self.containerRegistryManager); + inner.name(), self.containerRegistry, inner, self.containerRegistryManager); } else { return new WebhookImpl( resourceGroupName, registryName, - inner.getName(), + inner.name(), inner, self.containerRegistryManager); } diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java index 9aa1c24f1084..324e68030612 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/management/containerregistry/models/EventInfoInner.java @@ -21,7 +21,7 @@ public class EventInfoInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java index 0fc40365bb67..11d13661395e 100644 --- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java +++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/ResourceReference.java @@ -21,7 +21,7 @@ public final class ResourceReference { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java index 06c20a40e579..d7d602baa992 100644 --- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java +++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/implementation/KubernetesClustersImpl.java @@ -38,7 +38,7 @@ public PagedIterable list() { @Override public PagedFlux listAsync() { - return this.inner().listAsync().mapPage(inner -> new KubernetesClusterImpl(inner.getName(), inner, manager())); + return this.inner().listAsync().mapPage(inner -> new KubernetesClusterImpl(inner.name(), inner, manager())); } @Override @@ -76,7 +76,7 @@ protected KubernetesClusterImpl wrapModel(ManagedClusterInner inner) { return null; } - return new KubernetesClusterImpl(inner.getName(), inner, this.manager()); + return new KubernetesClusterImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java index 287806cfbc64..027a9dc115fe 100644 --- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java +++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolAvailableVersionsInner.java @@ -43,7 +43,7 @@ public class AgentPoolAvailableVersionsInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java index 288bedd6c9c6..dc4ee7d1a5a1 100644 --- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java +++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/AgentPoolUpgradeProfileInner.java @@ -57,7 +57,7 @@ public class AgentPoolUpgradeProfileInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java index 98bc9aab5a21..67cc47a9be10 100644 --- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java +++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/ManagedClusterUpgradeProfileInner.java @@ -49,7 +49,7 @@ public class ManagedClusterUpgradeProfileInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java index 7a226cdeab55..b3e273979030 100644 --- a/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java +++ b/sdk/containerservice/mgmt/src/main/java/com/azure/management/containerservice/models/OrchestratorVersionProfileListResultInner.java @@ -43,7 +43,7 @@ public class OrchestratorVersionProfileListResultInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java index 87ec1e1b9eb2..4a241df47564 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraKeyspaceResource.java @@ -21,7 +21,7 @@ public class CassandraKeyspaceResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java index e5cc7347aeb4..3d038a2d050b 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/CassandraTableResource.java @@ -33,7 +33,7 @@ public class CassandraTableResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java index 7576fb818683..e68d39963554 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/FailoverPolicy.java @@ -38,7 +38,7 @@ public final class FailoverPolicy { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java index 539defbacbf8..c44f7680c506 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinDatabaseResource.java @@ -21,7 +21,7 @@ public class GremlinDatabaseResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java index e63ffa241fcb..3331c9213fb6 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/GremlinGraphResource.java @@ -55,7 +55,7 @@ public class GremlinGraphResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java index fe250b9d70b3..c2fae3d758da 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/Location.java @@ -66,7 +66,7 @@ public final class Location { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java index 82af5b494984..4e858fd88557 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBCollectionResource.java @@ -35,7 +35,7 @@ public class MongoDBCollectionResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java index 562f02637bff..4f9a945bc1ca 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/MongoDBDatabaseResource.java @@ -21,7 +21,7 @@ public class MongoDBDatabaseResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java index f256a91303b4..02c85c1bbbb8 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/PrivateEndpointProperty.java @@ -21,7 +21,7 @@ public final class PrivateEndpointProperty { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java index fb2a9a808360..ae613526a70b 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlContainerResource.java @@ -55,7 +55,7 @@ public class SqlContainerResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java index b46ddc9b7c8b..87da722cf4d0 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlDatabaseResource.java @@ -21,7 +21,7 @@ public class SqlDatabaseResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java index b1407ba08244..1f68ba968806 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlStoredProcedureResource.java @@ -27,7 +27,7 @@ public class SqlStoredProcedureResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java index bc89b7f6ea7c..04b125729729 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlTriggerResource.java @@ -39,7 +39,7 @@ public class SqlTriggerResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java index ab6b5fd588f9..63044fb55c66 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/SqlUserDefinedFunctionResource.java @@ -27,7 +27,7 @@ public class SqlUserDefinedFunctionResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java index 3a8394c448ad..c6597e3c0e9a 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/TableResource.java @@ -21,7 +21,7 @@ public class TableResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java index 92a5f9058dd2..55e4e1b5b557 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/VirtualNetworkRule.java @@ -30,7 +30,7 @@ public final class VirtualNetworkRule { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java index 701463b00c1c..899b5a7768df 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java @@ -452,14 +452,14 @@ public Mono createResourceAsync() { private DatabaseAccountCreateUpdateParameters createUpdateParametersInner(DatabaseAccountGetResultsInner inner) { this.ensureFailoverIsInitialized(); DatabaseAccountCreateUpdateParameters createUpdateParametersInner = new DatabaseAccountCreateUpdateParameters(); - createUpdateParametersInner.setLocation(this.regionName().toLowerCase(Locale.ROOT)); + createUpdateParametersInner.withLocation(this.regionName().toLowerCase(Locale.ROOT)); createUpdateParametersInner.withConsistencyPolicy(inner.consistencyPolicy()); // createUpdateParametersInner.withDatabaseAccountOfferType( // DatabaseAccountOfferType.STANDARD.toString()); // Enum to Constant createUpdateParametersInner.withIpRangeFilter(inner.ipRangeFilter()); createUpdateParametersInner.withKind(inner.kind()); createUpdateParametersInner.withCapabilities(inner.capabilities()); - createUpdateParametersInner.setTags(inner.getTags()); + createUpdateParametersInner.withTags(inner.tags()); createUpdateParametersInner.withEnableMultipleWriteLocations(inner.enableMultipleWriteLocations()); this .addLocationsForParameters( @@ -480,7 +480,7 @@ private DatabaseAccountCreateUpdateParameters createUpdateParametersInner(Databa private DatabaseAccountUpdateParameters updateParametersInner(DatabaseAccountGetResultsInner inner) { this.ensureFailoverIsInitialized(); DatabaseAccountUpdateParameters updateParameters = new DatabaseAccountUpdateParameters(); - updateParameters.withTags(inner.getTags()); + updateParameters.withTags(inner.tags()); updateParameters.withLocation(this.regionName().toLowerCase(Locale.ROOT)); updateParameters.withConsistencyPolicy(inner.consistencyPolicy()); updateParameters.withIpRangeFilter(inner.ipRangeFilter()); @@ -649,7 +649,7 @@ private Map ensureVirtualNetworkRules() { this.virtualNetworkRulesMap = new HashMap<>(); if (this.inner() != null && this.inner().virtualNetworkRules() != null) { for (VirtualNetworkRule virtualNetworkRule : this.inner().virtualNetworkRules()) { - this.virtualNetworkRulesMap.put(virtualNetworkRule.getId(), virtualNetworkRule); + this.virtualNetworkRulesMap.put(virtualNetworkRule.id(), virtualNetworkRule); } } } @@ -685,7 +685,7 @@ public CosmosDBAccountImpl withVirtualNetworkRules(List virt } this.inner().withIsVirtualNetworkFilterEnabled(true); for (VirtualNetworkRule vnetRule : virtualNetworkRules) { - this.virtualNetworkRulesMap.put(vnetRule.getId(), vnetRule); + this.virtualNetworkRulesMap.put(vnetRule.id(), vnetRule); } return this; @@ -734,7 +734,7 @@ static class CreateUpdateLocationParameters implements HasLocations { @Override public String location() { - return parameters.getLocation(); + return parameters.location(); } @Override diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java index a82f4c72104e..aacedda42d9e 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountsImpl.java @@ -40,7 +40,7 @@ public PagedFlux listAsync() { return this .inner() .listAsync() - .mapPage(inner -> new CosmosDBAccountImpl(inner.getName(), inner, this.manager())); + .mapPage(inner -> new CosmosDBAccountImpl(inner.name(), inner, this.manager())); } @Override @@ -83,7 +83,7 @@ protected CosmosDBAccountImpl wrapModel(DatabaseAccountGetResultsInner container return null; } - return new CosmosDBAccountImpl(containerServiceInner.getName(), containerServiceInner, this.manager()); + return new CosmosDBAccountImpl(containerServiceInner.name(), containerServiceInner, this.manager()); } @Override diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java index 7e6495d1744c..05a50d285d75 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionImpl.java @@ -32,7 +32,7 @@ public class PrivateEndpointConnectionImpl @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java index f91935717abc..683b835263da 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateEndpointConnectionsImpl.java @@ -71,7 +71,7 @@ public PagedFlux listAsync() { .mapPage( inner -> { PrivateEndpointConnectionImpl childResource = - new PrivateEndpointConnectionImpl(inner.getName(), self.getParent(), inner, client); + new PrivateEndpointConnectionImpl(inner.name(), self.getParent(), inner, client); self.addPrivateEndpointConnection(childResource); return childResource; }); @@ -85,7 +85,7 @@ public Mono getImplAsync(String name) { .map( inner -> { PrivateEndpointConnectionImpl childResource = - new PrivateEndpointConnectionImpl(inner.getName(), getParent(), inner, client); + new PrivateEndpointConnectionImpl(inner.name(), getParent(), inner, client); self.addPrivateEndpointConnection(childResource); return childResource; }); diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java index 0d2e546ddae4..acbafb106d69 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/management/cosmosdb/implementation/PrivateLinkResourceImpl.java @@ -16,17 +16,17 @@ public class PrivateLinkResourceImpl extends WrapperImpl imp @Override public String sqlDatabaseId() { - return this.inner().resource().getId(); + return this.inner().resource().id(); } @Override diff --git a/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java b/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java index 8ed60e0b3170..61472efc3fec 100644 --- a/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java +++ b/sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java @@ -131,7 +131,7 @@ public void canCreateSqlPrivateEndpoint() { .withPrivateLinkServiceConnections(Arrays.asList(privateLinkServiceConnection)) .withSubnet(network.subnets().get(subnetName).inner()); - privateEndpoint.setLocation(region.toString()); + privateEndpoint.withLocation(region.toString()); privateEndpoint = networkManager.inner().privateEndpoints().createOrUpdate(rgName, pedName, privateEndpoint); cosmosDBAccount diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java index 549c62039225..df08f53739e4 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/ARecordSetsImpl.java @@ -64,6 +64,6 @@ protected PagedFlux listInternAsync(String recordSetNameSuffix, Inte @Override protected ARecordSetImpl wrapModel(RecordSetInner inner) { - return new ARecordSetImpl(inner.getName(), this.dnsZone, inner); + return new ARecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java index 7efce959c930..3cf58b8ff8e4 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/AaaaRecordSetsImpl.java @@ -60,6 +60,6 @@ protected AaaaRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new AaaaRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new AaaaRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java index c1763cead4fa..110504008c32 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CNameRecordSetsImpl.java @@ -67,6 +67,6 @@ protected CNameRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new CNameRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new CNameRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java index 08314ac8f2ef..2bf5bc840987 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/CaaRecordSetsImpl.java @@ -67,6 +67,6 @@ protected CaaRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new CaaRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new CaaRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java index 9ae13011bac8..765cbc12677a 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsRecordSetImpl.java @@ -53,7 +53,7 @@ protected DnsRecordSetImpl(String name, String type, final DnsZoneImpl parent, f @Override public String id() { - return inner().getId(); + return inner().id(); } @Override @@ -399,6 +399,6 @@ DnsRecordSetImpl withETagOnDelete(String eTagValue) { } private boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java index 20e8308acc21..7e4eb38559a4 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZoneImpl.java @@ -80,7 +80,7 @@ public List registrationVirtualNetworkIds() { List list = new ArrayList<>(); if (this.inner().registrationVirtualNetworks() != null) { for (SubResource sb : this.inner().registrationVirtualNetworks()) { - list.add(sb.getId()); + list.add(sb.id()); } } return list; @@ -91,7 +91,7 @@ public List resolutionVirtualNetworkIds() { List list = new ArrayList<>(); if (this.inner().resolutionVirtualNetworks() != null) { for (SubResource sb : this.inner().resolutionVirtualNetworks()) { - list.add(sb.getId()); + list.add(sb.id()); } } return list; @@ -177,7 +177,7 @@ public SoaRecordSet getSoaRecordSet() { if (inner == null) { return null; } - return new SoaRecordSetImpl(inner.getName(), this, inner); + return new SoaRecordSetImpl(inner.name(), this, inner); } // Setters @@ -471,28 +471,28 @@ private PagedIterable listRecordSetsIntern(String recordSetSuffix, .recordSets() .listByDnsZoneAsync(this.resourceGroupName(), this.name(), pageSize, recordSetSuffix), inner -> { - DnsRecordSet recordSet = new DnsRecordSetImpl(inner.getName(), inner.getType(), self, inner); + DnsRecordSet recordSet = new DnsRecordSetImpl(inner.name(), inner.type(), self, inner); switch (recordSet.recordType()) { case A: - return Mono.just(new ARecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new ARecordSetImpl(inner.name(), self, inner)); case AAAA: - return Mono.just(new AaaaRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new AaaaRecordSetImpl(inner.name(), self, inner)); case CAA: - return Mono.just(new CaaRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new CaaRecordSetImpl(inner.name(), self, inner)); case CNAME: - return Mono.just(new CNameRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new CNameRecordSetImpl(inner.name(), self, inner)); case MX: - return Mono.just(new MXRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new MXRecordSetImpl(inner.name(), self, inner)); case NS: - return Mono.just(new NSRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new NSRecordSetImpl(inner.name(), self, inner)); case PTR: - return Mono.just(new PtrRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new PtrRecordSetImpl(inner.name(), self, inner)); case SOA: - return Mono.just(new SoaRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new SoaRecordSetImpl(inner.name(), self, inner)); case SRV: - return Mono.just(new SrvRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new SrvRecordSetImpl(inner.name(), self, inner)); case TXT: - return Mono.just(new TxtRecordSetImpl(inner.getName(), self, inner)); + return Mono.just(new TxtRecordSetImpl(inner.name(), self, inner)); default: return Mono.just(recordSet); } @@ -524,12 +524,12 @@ public DnsZoneImpl withPrivateAccess( this.inner().withResolutionVirtualNetworks(new ArrayList<>()); for (String rvnId : registrationVirtualNetworkIds) { SubResource sb = new SubResource(); - sb.setId(rvnId); + sb.withId(rvnId); this.inner().registrationVirtualNetworks().add(sb); } for (String rvnId : resolutionVirtualNetworkIds) { SubResource sb = new SubResource(); - sb.setId(rvnId); + sb.withId(rvnId); this.inner().resolutionVirtualNetworks().add(sb); } return this; diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java index 46613c162410..28bdba3d5949 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/DnsZonesImpl.java @@ -33,12 +33,12 @@ protected DnsZoneImpl wrapModel(ZoneInner inner) { if (inner == null) { return null; } - return new DnsZoneImpl(inner.getName(), inner, this.manager()); + return new DnsZoneImpl(inner.name(), inner, this.manager()); } private DnsZoneImpl setDefaults(DnsZoneImpl dnsZone) { // Zone location must be 'global' irrespective of region of the resource group it resides. - dnsZone.inner().setLocation("global"); + dnsZone.inner().withLocation("global"); return dnsZone; } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java index 9d67b1ddf85c..ab112979f7df 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/MXRecordSetsImpl.java @@ -79,6 +79,6 @@ protected MXRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new MXRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new MXRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java index c902c67ab29e..f7d4760904cb 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/NSRecordSetsImpl.java @@ -67,6 +67,6 @@ protected NSRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new NSRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new NSRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java index a101d69f1345..0d304872be86 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/PtrRecordSetsImpl.java @@ -67,6 +67,6 @@ protected PtrRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new PtrRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new PtrRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java index a932de0b0151..9de6bc7f4a72 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/SrvRecordSetsImpl.java @@ -67,6 +67,6 @@ protected SrvRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new SrvRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new SrvRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java index 8b42bff465de..5684f0401766 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/management/dns/implementation/TxtRecordSetsImpl.java @@ -67,6 +67,6 @@ protected TxtRecordSetImpl wrapModel(RecordSetInner inner) { if (inner == null) { return null; } - return new TxtRecordSetImpl(inner.getName(), this.dnsZone, inner); + return new TxtRecordSetImpl(inner.name(), this.dnsZone, inner); } } diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java index 1f9795b0de54..499ad395d957 100644 --- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java +++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/PrivateEndpoint.java @@ -21,7 +21,7 @@ public final class PrivateEndpoint { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } } diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java index 6f6b146dcec1..d13bf02f4065 100644 --- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java +++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/VirtualNetworkRule.java @@ -23,7 +23,7 @@ public final class VirtualNetworkRule { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java index e4e8fc560b2c..dda4da1166e2 100644 --- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java +++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/DeletedVaultImpl.java @@ -23,7 +23,7 @@ public String name() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java index 668e74608b07..328802b04196 100644 --- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java +++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultImpl.java @@ -348,7 +348,7 @@ public Mono createResourceAsync() { VaultCreateOrUpdateParameters parameters = new VaultCreateOrUpdateParameters(); parameters.withLocation(regionName()); parameters.withProperties(inner().properties()); - parameters.withTags(inner().getTags()); + parameters.withTags(inner().tags()); parameters.properties().withAccessPolicies(new ArrayList<>()); for (AccessPolicy accessPolicy : accessPolicies) { parameters.properties().accessPolicies().add(accessPolicy.inner()); diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java index 2fd9b3f07537..ac39cc8de0af 100644 --- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java +++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/implementation/VaultsImpl.java @@ -76,7 +76,7 @@ protected VaultImpl wrapModel(VaultInner vaultInner) { if (vaultInner == null) { return null; } - return new VaultImpl(vaultInner.getName(), vaultInner, this.manager(), graphRbacManager); + return new VaultImpl(vaultInner.name(), vaultInner, this.manager(), graphRbacManager); } @Override @@ -148,7 +148,7 @@ public Mono recoverSoftDeletedVaultAsync( .withTenantId(UUID.fromString(tenantId))); return inner() .createOrUpdateAsync(resourceGroupName, vaultName, parameters) - .map(inner -> (Vault) new VaultImpl(inner.getId(), inner, manager, graphRbacManager)); + .map(inner -> (Vault) new VaultImpl(inner.id(), inner, manager, graphRbacManager)); }); } } diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java index c7e60f408fe5..36568c80826b 100644 --- a/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java +++ b/sdk/keyvault/mgmt/src/main/java/com/azure/management/keyvault/models/DeletedVaultInner.java @@ -40,7 +40,7 @@ public final class DeletedVaultInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java index c0d984ed403d..c3b2a428872c 100644 --- a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java +++ b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentitesImpl.java @@ -34,7 +34,7 @@ protected IdentityImpl wrapModel(IdentityInner inner) { if (inner == null) { return null; } else { - return new IdentityImpl(inner.getName(), inner, this.manager()); + return new IdentityImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java index 479487263bfc..1959ab45d286 100644 --- a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java +++ b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/management/msi/implementation/IdentityImpl.java @@ -136,8 +136,8 @@ public String principalId() { @Override public String resourceId() { Objects.requireNonNull(inner()); - Objects.requireNonNull(inner().getId()); - return inner().getId(); + Objects.requireNonNull(inner().id()); + return inner().id(); } }; } diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java b/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java index 360b59a1b5e6..735dea496d8b 100644 --- a/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java +++ b/sdk/management/azure/src/test/java/com/azure/management/TestUtils.java @@ -72,7 +72,7 @@ public static void print(VirtualMachine resource) { storageProfile.append("\n\t\t\tLun: ").append(disk.lun()); if (resource.isManagedDiskEnabled()) { if (disk.managedDisk() != null) { - storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().getId()); + storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().id()); } } else { if (disk.vhd().uri() != null) { diff --git a/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java b/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java index c9bb68fed106..b1cfb13d91ab 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java +++ b/sdk/management/samples/src/main/java/com/azure/management/cosmosdb/samples/CreateCosmosDBTableWithVirtualNetworkRule.java @@ -86,7 +86,7 @@ public static boolean runSample(Azure azure) { System.out.println("CosmosDB Virtual Network Rules:"); for (VirtualNetworkRule vnetRule : vnetRules) { - System.out.println("\t" + vnetRule.getId()); + System.out.println("\t" + vnetRule.id()); } @@ -105,7 +105,7 @@ public static boolean runSample(Azure azure) { System.out.println("CosmosDB Virtual Network Rules:"); for (VirtualNetworkRule vnetRule : vnetRules) { - System.out.println("\t" + vnetRule.getId()); + System.out.println("\t" + vnetRule.id()); } cosmosDBAccount.update() diff --git a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java index eefb3eb4352b..d7e83951e007 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java +++ b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplate.java @@ -85,7 +85,7 @@ public static boolean runSample(Azure azure) { for (DeploymentOperation operation : operations) { if (operation.targetResource() != null) { String operationTxt = String.format("id:%s name:%s type: %s provisioning-state:%s code: %s msg: %s", - operation.targetResource().getId(), + operation.targetResource().id(), operation.targetResource().resourceName(), operation.targetResource().resourceType(), operation.provisioningState(), diff --git a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java index 7e53a33182c2..e57d14946b06 100644 --- a/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java +++ b/sdk/management/samples/src/main/java/com/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java @@ -77,7 +77,7 @@ public static boolean runSample(Azure azure) { // Getting created resources for (DeploymentOperation operation : operations) { if (operation.targetResource() != null) { - genericResources.add(azure.genericResources().getById(operation.targetResource().getId())); + genericResources.add(azure.genericResources().getById(operation.targetResource().id())); } } 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 2c496ef72eca..8f9fff292bb2 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 @@ -271,7 +271,7 @@ public static void print(VirtualMachine resource) { storageProfile.append("\n\t\t\tLun: ").append(disk.lun()); if (resource.isManagedDiskEnabled()) { if (disk.managedDisk() != null) { - storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().getId()); + storageProfile.append("\n\t\t\tManaged Disk Id: ").append(disk.managedDisk().id()); } } else { if (disk.vhd().uri() != null) { @@ -1591,7 +1591,7 @@ public static void print(SqlFailoverGroup failoverGroup) { builder.append("\n\tPartner Servers: "); for (PartnerInfo item : failoverGroup.partnerServers()) { builder - .append("\n\t\tId: ").append(item.getId()) + .append("\n\t\tId: ").append(item.id()) .append("\n\t\tLocation: ").append(item.location()) .append("\n\t\tReplication role: ").append(item.replicationRole()); } @@ -1914,10 +1914,10 @@ public static void print(VirtualMachineCustomImage image) { builder.append("\n\t\tSource virtual machine: ").append(image.sourceVirtualMachineId()); } if (image.osDiskImage().managedDisk() != null) { - builder.append("\n\t\tSource managed disk: ").append(image.osDiskImage().managedDisk().getId()); + builder.append("\n\t\tSource managed disk: ").append(image.osDiskImage().managedDisk().id()); } if (image.osDiskImage().snapshot() != null) { - builder.append("\n\t\tSource snapshot: ").append(image.osDiskImage().snapshot().getId()); + builder.append("\n\t\tSource snapshot: ").append(image.osDiskImage().snapshot().id()); } if (image.osDiskImage().blobUri() != null) { builder.append("\n\t\tSource un-managed vhd: ").append(image.osDiskImage().blobUri()); @@ -1931,10 +1931,10 @@ public static void print(VirtualMachineCustomImage image) { builder.append("\n\t\tSource virtual machine: ").append(image.sourceVirtualMachineId()); } if (diskImage.managedDisk() != null) { - builder.append("\n\t\tSource managed disk: ").append(diskImage.managedDisk().getId()); + builder.append("\n\t\tSource managed disk: ").append(diskImage.managedDisk().id()); } if (diskImage.snapshot() != null) { - builder.append("\n\t\tSource snapshot: ").append(diskImage.snapshot().getId()); + builder.append("\n\t\tSource snapshot: ").append(diskImage.snapshot().id()); } if (diskImage.blobUri() != null) { builder.append("\n\t\tSource un-managed vhd: ").append(diskImage.blobUri()); @@ -2484,12 +2484,12 @@ public static void print(Topology resource) { StringBuilder sb = new StringBuilder().append("Topology: ").append(resource.id()) .append("\n\tTopology parameters: ") .append("\n\t\tResource group: ").append(resource.topologyParameters().targetResourceGroupName()) - .append("\n\t\tVirtual network: ").append(resource.topologyParameters().targetVirtualNetwork() == null ? "" : resource.topologyParameters().targetVirtualNetwork().getId()) - .append("\n\t\tSubnet id: ").append(resource.topologyParameters().targetSubnet() == null ? "" : resource.topologyParameters().targetSubnet().getId()) + .append("\n\t\tVirtual network: ").append(resource.topologyParameters().targetVirtualNetwork() == null ? "" : resource.topologyParameters().targetVirtualNetwork().id()) + .append("\n\t\tSubnet id: ").append(resource.topologyParameters().targetSubnet() == null ? "" : resource.topologyParameters().targetSubnet().id()) .append("\n\tCreated time: ").append(resource.createdTime()) .append("\n\tLast modified time: ").append(resource.lastModifiedTime()); for (TopologyResource tr : resource.resources().values()) { - sb.append("\n\tTopology resource: ").append(tr.getId()) + sb.append("\n\tTopology resource: ").append(tr.id()) .append("\n\t\tName: ").append(tr.name()) .append("\n\t\tLocation: ").append(tr.location()) .append("\n\t\tAssociations:"); @@ -2526,7 +2526,7 @@ public static void print(SecurityGroupView resource) { StringBuilder sb = new StringBuilder().append("Security group view: ") .append("\n\tVirtual machine id: ").append(resource.vmId()); for (SecurityGroupNetworkInterface sgni : resource.networkInterfaces().values()) { - sb.append("\n\tSecurity group network interface:").append(sgni.getId()) + sb.append("\n\tSecurity group network interface:").append(sgni.id()) .append("\n\t\tSecurity group network interface:") .append("\n\t\tEffective security rules:"); for (EffectiveNetworkSecurityRule rule : sgni.securityRuleAssociations().effectiveSecurityRules()) { @@ -2540,10 +2540,10 @@ public static void print(SecurityGroupView resource) { .append("\n\t\t\tDestination port range: ").append(rule.destinationPortRange()) .append("\n\t\t\tProtocol: ").append(rule.protocol()); } - sb.append("\n\t\tSubnet:").append(sgni.securityRuleAssociations().subnetAssociation().getId()); + sb.append("\n\t\tSubnet:").append(sgni.securityRuleAssociations().subnetAssociation().id()); printSecurityRule(sb, sgni.securityRuleAssociations().subnetAssociation().securityRules()); if (sgni.securityRuleAssociations().networkInterfaceAssociation() != null) { - sb.append("\n\t\tNetwork interface:").append(sgni.securityRuleAssociations().networkInterfaceAssociation().getId()); + sb.append("\n\t\tNetwork interface:").append(sgni.securityRuleAssociations().networkInterfaceAssociation().id()); printSecurityRule(sb, sgni.securityRuleAssociations().networkInterfaceAssociation().securityRules()); } sb.append("\n\t\tDefault security rules:"); diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java index a59738f3457a..a75ad434657d 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/MetricAlertStatus.java @@ -59,7 +59,7 @@ public MetricAlertStatus withName(String name) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java index 3fc7187dea30..04d2324ec642 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/WorkspaceInfo.java @@ -35,7 +35,7 @@ public class WorkspaceInfo { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java index 48c4e695f455..971b20f2d43e 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupImpl.java @@ -219,7 +219,7 @@ public ActionGroupImpl withShortName(String shortName) { @Override public Mono createResourceAsync() { - this.inner().setLocation("global"); + this.inner().withLocation("global"); return this .manager() .inner() diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java index 7ef366c1c035..9cd2e378293a 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActionGroupsImpl.java @@ -30,7 +30,7 @@ protected ActionGroupImpl wrapModel(ActionGroupResourceInner inner) { if (inner == null) { return null; } - return new ActionGroupImpl(inner.getName(), inner, this.manager()); + return new ActionGroupImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java index 37013a82ec6c..bf50906ab693 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertImpl.java @@ -74,7 +74,7 @@ public String description() { @Override public Mono createResourceAsync() { - this.inner().setLocation("global"); + this.inner().withLocation("global"); ActivityLogAlertAllOfCondition condition = new ActivityLogAlertAllOfCondition(); condition.withAllOf(new ArrayList()); for (Map.Entry cds : conditions.entrySet()) { diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java index e4eebfc5b79b..5bdd998918e5 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/ActivityLogAlertsImpl.java @@ -29,7 +29,7 @@ protected ActivityLogAlertImpl wrapModel(ActivityLogAlertResourceInner inner) { if (inner == null) { return null; } - return new ActivityLogAlertImpl(inner.getName(), inner, this.manager()); + return new ActivityLogAlertImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java index 008ced1effd1..50f7c73ef022 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/AutoscaleSettingsImpl.java @@ -29,7 +29,7 @@ protected AutoscaleSettingImpl wrapModel(AutoscaleSettingResourceInner inner) { if (inner == null) { return null; } - return new AutoscaleSettingImpl(inner.getName(), inner, this.manager()); + return new AutoscaleSettingImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java index 2d31e7b7cfb7..af59325dc9f0 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingImpl.java @@ -161,7 +161,7 @@ public DiagnosticSettingImpl withoutMetrics() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -212,7 +212,7 @@ public MonitorManager manager() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -241,11 +241,11 @@ public void setInner(DiagnosticSettingsResourceInner inner) { if (!isInCreateMode()) { this.resourceId = inner - .getId() + .id() .substring( 0, - this.inner().getId().length() - - (DiagnosticSettingImpl.DIAGNOSTIC_SETTINGS_URI + this.inner().getName()).length()); + this.inner().id().length() + - (DiagnosticSettingImpl.DIAGNOSTIC_SETTINGS_URI + this.inner().name()).length()); for (MetricSettings ms : this.inner().metrics()) { this.metricSet.put(ms.category(), ms); } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java index efd24cf7c1a0..b21ae17eb3bd 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/DiagnosticSettingsCategoryImpl.java @@ -18,7 +18,7 @@ class DiagnosticSettingsCategoryImpl extends WrapperImpl listByResourceAsync(String resourceId) { .diagnosticSettings() .listAsync(resourceId) .map(DiagnosticSettingsResourceCollectionInner::value)) - .mapPage(inner -> new DiagnosticSettingImpl(inner.getName(), inner, this.manager())); + .mapPage(inner -> new DiagnosticSettingImpl(inner.name(), inner, this.manager())); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java index 4557b9b25a7a..1cb605f19c41 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/EventDataImpl.java @@ -58,7 +58,7 @@ public String description() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java index 6316d7cb6aa8..35078dc29e74 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertImpl.java @@ -101,7 +101,7 @@ public Mono createResourceAsync() { new IllegalArgumentException("Static condition and dynamic condition cannot co-exist")); } - this.inner().setLocation("global"); + this.inner().withLocation("global"); if (!this.conditions.isEmpty()) { if (!multipleResource) { MetricAlertSingleResourceMultipleMetricCriteria crit = diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java index 0a2da869df80..aef7e374cca4 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricAlertsImpl.java @@ -32,7 +32,7 @@ protected MetricAlertImpl wrapModel(MetricAlertResourceInner inner) { if (inner == null) { return null; } - return new MetricAlertImpl(inner.getName(), inner, this.manager()); + return new MetricAlertImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java index 97ef35b8fd51..2f897ce58922 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricDefinitionImpl.java @@ -99,7 +99,7 @@ public List metricAvailabilities() { } public String id() { - return this.inner.getId(); + return this.inner.id(); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java index 6f4b8975b3dd..f40a60cedce1 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/implementation/MetricImpl.java @@ -22,7 +22,7 @@ class MetricImpl extends WrapperImpl implements Metric { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java index 5f70473329ae..ca21e1fa6dc5 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/BaselineResponseInner.java @@ -81,7 +81,7 @@ public class BaselineResponseInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java index 40808393d774..b78e8aca30c7 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/EventDataInner.java @@ -224,7 +224,7 @@ public String description() { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java index f66e391aa295..28971f47342f 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricDefinitionInner.java @@ -245,7 +245,7 @@ public MetricDefinitionInner withMetricAvailabilities(List m * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java index 770c6b2dfb1d..198289668474 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricInner.java @@ -49,7 +49,7 @@ public final class MetricInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java index 7b662135df64..25e6eab34463 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/MetricNamespaceInner.java @@ -40,7 +40,7 @@ public final class MetricNamespaceInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java index 491d10cc0c44..096e87fc58e2 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/management/monitor/models/SingleMetricBaselineInner.java @@ -67,7 +67,7 @@ public class SingleMetricBaselineInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java index bf544faa65b3..c3bcdbce7a8a 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/ApplicationGatewayFirewallRuleSet.java @@ -129,7 +129,7 @@ public ApplicationGatewayFirewallRuleSet withRuleGroups(List authenticationCe } else { for (SubResource ref : this.inner().authenticationCertificates()) { ApplicationGatewayAuthenticationCertificate cert = - this.parent().authenticationCertificates().get(ResourceUtils.nameFromResourceId(ref.getId())); + this.parent().authenticationCertificates().get(ResourceUtils.nameFromResourceId(ref.id())); if (cert != null) { certs.put(cert.name(), cert); } @@ -65,7 +65,7 @@ public String name() { @Override public ApplicationGatewayProbe probe() { if (this.parent().probes() != null && this.inner().probe() != null) { - return this.parent().probes().get(ResourceUtils.nameFromResourceId(this.inner().probe().getId())); + return this.parent().probes().get(ResourceUtils.nameFromResourceId(this.inner().probe().id())); } else { return null; } @@ -165,7 +165,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl withProbe(String name) { if (name == null) { return this.withoutProbe(); } else { - SubResource probeRef = new SubResource().setId(this.parent().futureResourceId() + "/probes/" + name); + SubResource probeRef = new SubResource().withId(this.parent().futureResourceId() + "/probes/" + name); this.inner().withProbe(probeRef); return this; } @@ -230,14 +230,14 @@ public ApplicationGatewayBackendHttpConfigurationImpl withAuthenticationCertific return this; } SubResource certRef = - new SubResource().setId(this.parent().futureResourceId() + "/authenticationCertificates/" + name); + new SubResource().withId(this.parent().futureResourceId() + "/authenticationCertificates/" + name); List refs = this.inner().authenticationCertificates(); if (refs == null) { refs = new ArrayList<>(); this.inner().withAuthenticationCertificates(refs); } for (SubResource ref : refs) { - if (ref.getId().equalsIgnoreCase(certRef.getId())) { + if (ref.id().equalsIgnoreCase(certRef.id())) { return this; } } @@ -295,7 +295,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl withoutAuthenticationCerti return this; } for (SubResource ref : this.inner().authenticationCertificates()) { - if (ResourceUtils.nameFromResourceId(ref.getId()).equalsIgnoreCase(name)) { + if (ResourceUtils.nameFromResourceId(ref.id()).equalsIgnoreCase(name)) { this.inner().authenticationCertificates().remove(ref); break; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java index 3f899870bada..f9e10bd9200a 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendImpl.java @@ -53,8 +53,8 @@ public Map backendNicIPConfigurationNames() { final Map ipConfigNames = new TreeMap<>(); if (this.inner().backendIPConfigurations() != null) { for (NetworkInterfaceIPConfigurationInner inner : this.inner().backendIPConfigurations()) { - String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.getId()); - String ipConfigName = ResourceUtils.nameFromResourceId(inner.getId()); + String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.id()); + String ipConfigName = ResourceUtils.nameFromResourceId(inner.id()); ipConfigNames.put(nicId, ipConfigName); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java index 868d360f0c96..8d0b59471672 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendServerHealthImpl.java @@ -43,7 +43,7 @@ public NicIPConfiguration getNetworkInterfaceIPConfiguration() { if (this.inner().ipConfiguration() == null) { return null; } - String nicIPConfigId = this.inner().ipConfiguration().getId(); + String nicIPConfigId = this.inner().ipConfiguration().id(); if (nicIPConfigId == null) { return null; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java index 9669db6e0e5a..9350f5eee784 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayFrontendImpl.java @@ -31,7 +31,7 @@ class ApplicationGatewayFrontendImpl public String networkId() { SubResource subnetRef = this.inner().subnet(); if (subnetRef != null) { - return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId()); + return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id()); } else { return null; } @@ -41,7 +41,7 @@ public String networkId() { public String subnetName() { SubResource subnetRef = this.inner().subnet(); if (subnetRef != null) { - return ResourceUtils.nameFromResourceId(subnetRef.getId()); + return ResourceUtils.nameFromResourceId(subnetRef.id()); } else { return null; } @@ -65,7 +65,7 @@ public String name() { @Override public String publicIPAddressId() { if (this.inner().publicIPAddress() != null) { - return this.inner().publicIPAddress().getId(); + return this.inner().publicIPAddress().id(); } else { return null; } @@ -90,7 +90,7 @@ public ApplicationGatewayFrontendImpl withExistingSubnet(Network network, String @Override public ApplicationGatewayFrontendImpl withExistingSubnet(String parentNetworkResourceId, String subnetName) { - SubResource subnetRef = new SubResource().setId(parentNetworkResourceId + "/subnets/" + subnetName); + SubResource subnetRef = new SubResource().withId(parentNetworkResourceId + "/subnets/" + subnetName); this.inner().withSubnet(subnetRef); // Ensure this frontend is not public @@ -105,7 +105,7 @@ public ApplicationGatewayFrontendImpl withExistingPublicIPAddress(PublicIPAddres @Override public ApplicationGatewayFrontendImpl withExistingPublicIPAddress(String resourceId) { - SubResource pipRef = new SubResource().setId(resourceId); + SubResource pipRef = new SubResource().withId(resourceId); this.inner().withPublicIPAddress(pipRef); this.withoutSubnet(); // Ensure no conflicting public and private settings return this; diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java index 8e4056553592..8c7b507523bc 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayIPConfigurationImpl.java @@ -43,7 +43,7 @@ public ApplicationGatewayIPConfigurationImpl withExistingSubnet(Network network, @Override public ApplicationGatewayIPConfigurationImpl withExistingSubnet(String networkId, String subnetName) { - SubResource subnetRef = new SubResource().setId(networkId + "/subnets/" + subnetName); + SubResource subnetRef = new SubResource().withId(networkId + "/subnets/" + subnetName); this.inner().withSubnet(subnetRef); return this; } @@ -59,7 +59,7 @@ public ApplicationGatewayImpl attach() { public String networkId() { SubResource subnetRef = this.inner().subnet(); if (subnetRef != null) { - return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId()); + return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id()); } else { return null; } @@ -69,7 +69,7 @@ public String networkId() { public String subnetName() { SubResource subnetRef = this.inner().subnet(); if (subnetRef != null) { - return ResourceUtils.nameFromResourceId(subnetRef.getId()); + return ResourceUtils.nameFromResourceId(subnetRef.id()); } else { return null; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java index f0fb7e065399..9392f5499df6 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java @@ -124,7 +124,7 @@ protected Mono applyTagsToInnerAsync() { .manager() .inner() .applicationGateways() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + .updateTagsAsync(resourceGroupName(), name(), inner().tags()); } // Helpers @@ -310,7 +310,7 @@ protected void beforeCreating() { // Clear deleted probe references ref = config.inner().probe(); - if (ref != null && !this.probes().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.probes().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { config.inner().withProbe(null); } @@ -321,7 +321,7 @@ protected void beforeCreating() { certRefs = new ArrayList<>(certRefs); for (SubResource certRef : certRefs) { if (certRef != null - && !this.authCertificates.containsKey(ResourceUtils.nameFromResourceId(certRef.getId()))) { + && !this.authCertificates.containsKey(ResourceUtils.nameFromResourceId(certRef.id()))) { config.inner().authenticationCertificates().remove(certRef); } } @@ -335,7 +335,7 @@ protected void beforeCreating() { // Clear deleted listener references ref = redirect.inner().targetListener(); - if (ref != null && !this.listeners.containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.listeners.containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { redirect.inner().withTargetListener(null); } } @@ -347,19 +347,19 @@ protected void beforeCreating() { // Clear deleted frontend references ref = listener.inner().frontendIPConfiguration(); - if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { listener.inner().withFrontendIPConfiguration(null); } // Clear deleted frontend port references ref = listener.inner().frontendPort(); - if (ref != null && !this.frontendPorts().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.frontendPorts().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { listener.inner().withFrontendPort(null); } // Clear deleted SSL certificate references ref = listener.inner().sslCertificate(); - if (ref != null && !this.sslCertificates().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.sslCertificates().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { listener.inner().withSslCertificate(null); } } @@ -371,25 +371,25 @@ protected void beforeCreating() { // Clear deleted redirect configs ref = rule.inner().redirectConfiguration(); - if (ref != null && !this.redirectConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.redirectConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { rule.inner().withRedirectConfiguration(null); } // Clear deleted backends ref = rule.inner().backendAddressPool(); - if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { rule.inner().withBackendAddressPool(null); } // Clear deleted backend HTTP configs ref = rule.inner().backendHttpSettings(); - if (ref != null && !this.backendConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.backendConfigs.containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { rule.inner().withBackendHttpSettings(null); } // Clear deleted frontend HTTP listeners ref = rule.inner().httpListener(); - if (ref != null && !this.listeners().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.listeners().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { rule.inner().withHttpListener(null); } } @@ -406,7 +406,7 @@ protected SubResource ensureBackendRef(String name) { } // Return backend reference - return new SubResource().setId(this.futureResourceId() + "/backendAddressPools/" + backend.name()); + return new SubResource().withId(this.futureResourceId() + "/backendAddressPools/" + backend.name()); } protected ApplicationGatewayBackendImpl ensureUniqueBackend() { @@ -919,7 +919,7 @@ public ApplicationGatewayUrlPathMapImpl definePathBasedRoutingRule(String name) this.urlPathMaps, ApplicationGatewayUrlPathMapInner.class, ApplicationGatewayUrlPathMapImpl.class); - SubResource ref = new SubResource().setId(futureResourceId() + "/urlPathMaps/" + name); + SubResource ref = new SubResource().withId(futureResourceId() + "/urlPathMaps/" + name); // create corresponding request routing rule ApplicationGatewayRequestRoutingRuleInner inner = new ApplicationGatewayRequestRoutingRuleInner() @@ -944,7 +944,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl defineBackendHttpConfigura this.backendConfigs, ApplicationGatewayBackendHttpSettings.class, ApplicationGatewayBackendHttpConfigurationImpl.class); - if (config.inner().getId() == null) { + if (config.inner().id() == null) { return config.withPort(80); // Default port } else { return config; @@ -1504,7 +1504,7 @@ public String networkId() { if (subnetRef == null) { return null; } else { - return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId()); + return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id()); } } @@ -1514,7 +1514,7 @@ public String subnetName() { if (subnetRef == null) { return null; } else { - return ResourceUtils.nameFromResourceId(subnetRef.getId()); + return ResourceUtils.nameFromResourceId(subnetRef.id()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java index 38ae3042ce8b..4a04b92c6950 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java @@ -94,7 +94,7 @@ public ApplicationGatewaySslCertificate sslCertificate() { return null; } - String name = ResourceUtils.nameFromResourceId(certRef.getId()); + String name = ResourceUtils.nameFromResourceId(certRef.id()); return this.parent().sslCertificates().get(name); } @@ -118,7 +118,7 @@ public int frontendPortNumber() { @Override public String frontendPortName() { if (this.inner().frontendPort() != null) { - return ResourceUtils.nameFromResourceId(this.inner().frontendPort().getId()); + return ResourceUtils.nameFromResourceId(this.inner().frontendPort().id()); } else { return null; } @@ -130,7 +130,7 @@ public ApplicationGatewayFrontend frontend() { if (frontendInner == null) { return null; } else { - final String frontendName = ResourceUtils.nameFromResourceId(frontendInner.getId()); + final String frontendName = ResourceUtils.nameFromResourceId(frontendInner.id()); return this.parent().frontends().get(frontendName); } } @@ -147,7 +147,7 @@ public ApplicationGatewayImpl attach() { private ApplicationGatewayListenerImpl withFrontend(String name) { SubResource frontendRef = - new SubResource().setId(this.parent().futureResourceId() + "/frontendIPConfigurations/" + name); + new SubResource().withId(this.parent().futureResourceId() + "/frontendIPConfigurations/" + name); this.inner().withFrontendIPConfiguration(frontendRef); return this; } @@ -156,7 +156,7 @@ private ApplicationGatewayListenerImpl withFrontend(String name) { @Override public ApplicationGatewayListenerImpl withFrontendPort(String name) { - SubResource portRef = new SubResource().setId(this.parent().futureResourceId() + "/frontendPorts/" + name); + SubResource portRef = new SubResource().withId(this.parent().futureResourceId() + "/frontendPorts/" + name); this.inner().withFrontendPort(portRef); return this; } @@ -176,7 +176,7 @@ public ApplicationGatewayListenerImpl withFrontendPort(int portNumber) { @Override public ApplicationGatewayListenerImpl withSslCertificate(String name) { - SubResource certRef = new SubResource().setId(this.parent().futureResourceId() + "/sslCertificates/" + name); + SubResource certRef = new SubResource().withId(this.parent().futureResourceId() + "/sslCertificates/" + name); this.inner().withSslCertificate(certRef); return this; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java index 4fd99e46df85..10aba2b2f67e 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayPathRuleImpl.java @@ -47,7 +47,7 @@ public ApplicationGatewayUrlPathMapImpl attach() { public ApplicationGatewayPathRuleImpl toBackendHttpConfiguration(String name) { SubResource httpConfigRef = new SubResource() - .setId(this.parent().parent().futureResourceId() + "/backendHttpSettingsCollection/" + name); + .withId(this.parent().parent().futureResourceId() + "/backendHttpSettingsCollection/" + name); this.inner().withBackendHttpSettings(httpConfigRef); return this; } @@ -64,7 +64,7 @@ public ApplicationGatewayPathRuleImpl withRedirectConfiguration(String name) { this.inner().withRedirectConfiguration(null); } else { SubResource ref = - new SubResource().setId(this.parent().parent().futureResourceId() + "/redirectConfigurations/" + name); + new SubResource().withId(this.parent().parent().futureResourceId() + "/redirectConfigurations/" + name); this.inner().withRedirectConfiguration(ref); } return this; @@ -74,7 +74,7 @@ public ApplicationGatewayPathRuleImpl withRedirectConfiguration(String name) { public ApplicationGatewayBackend backend() { SubResource backendRef = this.inner().backendAddressPool(); if (backendRef != null) { - String backendName = ResourceUtils.nameFromResourceId(backendRef.getId()); + String backendName = ResourceUtils.nameFromResourceId(backendRef.id()); return this.parent().parent().backends().get(backendName); } else { return null; @@ -85,7 +85,7 @@ public ApplicationGatewayBackend backend() { public ApplicationGatewayBackendHttpConfiguration backendHttpConfiguration() { SubResource configRef = this.inner().backendHttpSettings(); if (configRef != null) { - String configName = ResourceUtils.nameFromResourceId(configRef.getId()); + String configName = ResourceUtils.nameFromResourceId(configRef.id()); return this.parent().parent().backendHttpConfigurations().get(configName); } else { return null; @@ -98,7 +98,7 @@ public ApplicationGatewayRedirectConfiguration redirectConfiguration() { if (ref == null) { return null; } else { - return this.parent().parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.getId())); + return this.parent().parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.id())); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java index a158adaadf49..467efdb43cd3 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRedirectConfigurationImpl.java @@ -47,7 +47,7 @@ public ApplicationGatewayListener targetListener() { return null; } - String name = ResourceUtils.nameFromResourceId(ref.getId()); + String name = ResourceUtils.nameFromResourceId(ref.id()); return this.parent().listeners().get(name); } @@ -61,7 +61,7 @@ public Map requestRoutingRules() { Map rules = new TreeMap<>(); if (null != this.inner().requestRoutingRules()) { for (SubResource ruleRef : this.inner().requestRoutingRules()) { - String ruleName = ResourceUtils.nameFromResourceId(ruleRef.getId()); + String ruleName = ResourceUtils.nameFromResourceId(ruleRef.id()); ApplicationGatewayRequestRoutingRule rule = this.parent().requestRoutingRules().get(ruleName); if (null != rule) { rules.put(ruleName, rule); @@ -104,7 +104,7 @@ public ApplicationGatewayRedirectConfigurationImpl withTargetListener(String nam if (name == null) { this.inner().withTargetListener(null); } else { - SubResource ref = new SubResource().setId(this.parent().futureResourceId() + "/httpListeners/" + name); + SubResource ref = new SubResource().withId(this.parent().futureResourceId() + "/httpListeners/" + name); this.inner().withTargetListener(ref).withTargetUrl(null); } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java index 37effeceddfe..fea4caec247d 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java @@ -56,7 +56,7 @@ public Collection backendAddresses() { public ApplicationGatewayUrlPathMap urlPathMap() { SubResource urlMapRef = this.inner().urlPathMap(); if (urlMapRef != null) { - String urlMapName = ResourceUtils.nameFromResourceId(urlMapRef.getId()); + String urlMapName = ResourceUtils.nameFromResourceId(urlMapRef.id()); return this.parent().urlPathMaps().get(urlMapName); } else { return null; @@ -131,7 +131,7 @@ public ApplicationGatewayRequestRoutingRuleType ruleType() { public ApplicationGatewayBackend backend() { SubResource backendRef = this.inner().backendAddressPool(); if (backendRef != null) { - String backendName = ResourceUtils.nameFromResourceId(backendRef.getId()); + String backendName = ResourceUtils.nameFromResourceId(backendRef.id()); return this.parent().backends().get(backendName); } else { return null; @@ -142,7 +142,7 @@ public ApplicationGatewayBackend backend() { public ApplicationGatewayBackendHttpConfigurationImpl backendHttpConfiguration() { SubResource configRef = this.inner().backendHttpSettings(); if (configRef != null) { - String configName = ResourceUtils.nameFromResourceId(configRef.getId()); + String configName = ResourceUtils.nameFromResourceId(configRef.id()); return (ApplicationGatewayBackendHttpConfigurationImpl) this.parent().backendHttpConfigurations().get(configName); } else { @@ -154,7 +154,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl backendHttpConfiguration() public ApplicationGatewayListenerImpl listener() { SubResource listenerRef = this.inner().httpListener(); if (listenerRef != null) { - String listenerName = ResourceUtils.nameFromResourceId(listenerRef.getId()); + String listenerName = ResourceUtils.nameFromResourceId(listenerRef.id()); return (ApplicationGatewayListenerImpl) this.parent().listeners().get(listenerName); } else { return null; @@ -167,7 +167,7 @@ public ApplicationGatewayRedirectConfiguration redirectConfiguration() { if (ref == null) { return null; } else { - return this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.getId())); + return this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(ref.id())); } } @@ -209,7 +209,7 @@ public ApplicationGatewayRequestRoutingRuleImpl fromFrontendHttpsPort(int portNu @Override public ApplicationGatewayRequestRoutingRuleImpl toBackendHttpConfiguration(String name) { SubResource httpConfigRef = - new SubResource().setId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name); + new SubResource().withId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name); this.inner().withBackendHttpSettings(httpConfigRef); return this; } @@ -248,7 +248,7 @@ public ApplicationGatewayRequestRoutingRuleImpl withoutCookieBasedAffinity() { @Override public ApplicationGatewayRequestRoutingRuleImpl fromListener(String name) { - SubResource listenerRef = new SubResource().setId(this.parent().futureResourceId() + "/HTTPListeners/" + name); + SubResource listenerRef = new SubResource().withId(this.parent().futureResourceId() + "/HTTPListeners/" + name); this.inner().withHttpListener(listenerRef); return this; } @@ -396,7 +396,7 @@ public ApplicationGatewayRequestRoutingRuleImpl withRedirectConfiguration(String this.inner().withRedirectConfiguration(null); } else { SubResource ref = - new SubResource().setId(this.parent().futureResourceId() + "/redirectConfigurations/" + name); + new SubResource().withId(this.parent().futureResourceId() + "/redirectConfigurations/" + name); this.inner().withRedirectConfiguration(ref).withBackendAddressPool(null).withBackendHttpSettings(null); } return this; @@ -415,7 +415,7 @@ public ApplicationGatewayRequestRoutingRuleImpl withoutRedirectConfiguration() { this.inner().withUrlPathMap(null); } else { SubResource ref = - new SubResource().setId(this.parent().futureResourceId() + "/urlPathMaps/" + urlPathMapName); + new SubResource().withId(this.parent().futureResourceId() + "/urlPathMaps/" + urlPathMapName); this.inner().withUrlPathMap(ref); } return this; diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java index f4233a17ab27..e791f7c24d37 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java @@ -56,7 +56,7 @@ public Map pathRules() { public ApplicationGatewayBackend defaultBackend() { SubResource backendRef = this.inner().defaultBackendAddressPool(); return (backendRef != null) - ? this.parent().backends().get(ResourceUtils.nameFromResourceId(backendRef.getId())) + ? this.parent().backends().get(ResourceUtils.nameFromResourceId(backendRef.id())) : null; } @@ -67,7 +67,7 @@ public ApplicationGatewayBackendHttpConfiguration defaultBackendHttpConfiguratio ? this .parent() .backendHttpConfigurations() - .get(ResourceUtils.nameFromResourceId(backendHttpConfigRef.getId())) + .get(ResourceUtils.nameFromResourceId(backendHttpConfigRef.id())) : null; } @@ -75,7 +75,7 @@ public ApplicationGatewayBackendHttpConfiguration defaultBackendHttpConfiguratio public ApplicationGatewayRedirectConfiguration defaultRedirectConfiguration() { SubResource redirectRef = this.inner().defaultRedirectConfiguration(); return (redirectRef != null) - ? this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(redirectRef.getId())) + ? this.parent().redirectConfigurations().get(ResourceUtils.nameFromResourceId(redirectRef.id())) : null; } @@ -89,7 +89,7 @@ public ApplicationGatewayImpl attach() { @Override public ApplicationGatewayUrlPathMapImpl toBackendHttpConfiguration(String name) { SubResource httpConfigRef = - new SubResource().setId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name); + new SubResource().withId(this.parent().futureResourceId() + "/backendHttpSettingsCollection/" + name); this.inner().withDefaultBackendHttpSettings(httpConfigRef); return this; } @@ -113,7 +113,7 @@ public ApplicationGatewayUrlPathMapImpl withRedirectConfiguration(String name) { this.inner().withDefaultRedirectConfiguration(null); } else { SubResource ref = - new SubResource().setId(this.parent().futureResourceId() + "/redirectConfigurations/" + name); + new SubResource().withId(this.parent().futureResourceId() + "/redirectConfigurations/" + name); this .inner() .withDefaultRedirectConfiguration(ref) @@ -140,7 +140,7 @@ ApplicationGatewayUrlPathMapImpl withPathRule(ApplicationGatewayPathRuleImpl pat @Override public ApplicationGatewayUrlPathMapImpl fromListener(String name) { - SubResource listenerRef = new SubResource().setId(this.parent().futureResourceId() + "/HTTPListeners/" + name); + SubResource listenerRef = new SubResource().withId(this.parent().futureResourceId() + "/HTTPListeners/" + name); parent().requestRoutingRules().get(this.name()).inner().withHttpListener(listenerRef); return this; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java index d3337f05cfd0..d867fa906967 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewaysImpl.java @@ -41,7 +41,7 @@ protected ApplicationGatewayImpl wrapModel(String name) { @Override protected ApplicationGatewayImpl wrapModel(ApplicationGatewayInner inner) { - return (inner == null) ? null : new ApplicationGatewayImpl(inner.getName(), inner, this.manager()); + return (inner == null) ? null : new ApplicationGatewayImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java index 9799910669ee..9376e0eb70f4 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationSecurityGroupsImpl.java @@ -38,6 +38,6 @@ protected ApplicationSecurityGroupImpl wrapModel(ApplicationSecurityGroupInner i if (inner == null) { return null; } - return new ApplicationSecurityGroupImpl(inner.getName(), inner, this.manager()); + return new ApplicationSecurityGroupImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java index 70afd087c86b..2b8652959751 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorImpl.java @@ -47,12 +47,12 @@ protected Mono getInnerAsync() { @Override public String location() { - return inner().getLocation(); + return inner().location(); } @Override public Map tags() { - Map tags = this.inner().getTags(); + Map tags = this.inner().tags(); if (tags == null) { tags = new TreeMap<>(); } @@ -137,7 +137,7 @@ public Mono queryAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -150,7 +150,7 @@ public Mono createResourceAsync() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java index 913ad524d5fc..c9cdb80cc1dc 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ConnectionMonitorsImpl.java @@ -46,7 +46,7 @@ protected ConnectionMonitorImpl wrapModel(String name) { } protected ConnectionMonitorImpl wrapModel(ConnectionMonitorResultInner inner) { - return (inner == null) ? null : new ConnectionMonitorImpl(inner.getName(), parent, inner, inner()); + return (inner == null) ? null : new ConnectionMonitorImpl(inner.name(), parent, inner, inner()); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java index 1f7c95ddd576..1125e542b928 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/DdosProtectionPlansImpl.java @@ -34,6 +34,6 @@ protected DdosProtectionPlanImpl wrapModel(DdosProtectionPlanInner inner) { if (inner == null) { return null; } - return new DdosProtectionPlanImpl(inner.getName(), inner, this.manager()); + return new DdosProtectionPlanImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java index afab4b6366bd..9c3ea2b8c7ab 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitImpl.java @@ -137,7 +137,7 @@ protected Mono applyTagsToInnerAsync() { .manager() .inner() .expressRouteCircuits() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + .updateTagsAsync(resourceGroupName(), name(), inner().tags()); } // Getters diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java index 6de9146ce80d..e4cb45cd78e4 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitPeeringImpl.java @@ -84,7 +84,7 @@ protected Mono getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -104,7 +104,7 @@ public Mono createResourceAsync() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java index 71f8f54ea198..9b03133c37ae 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCircuitsImpl.java @@ -33,7 +33,7 @@ protected ExpressRouteCircuitImpl wrapModel(ExpressRouteCircuitInner inner) { if (inner == null) { return null; } - return new ExpressRouteCircuitImpl(inner.getName(), inner, this.manager()); + return new ExpressRouteCircuitImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java index 8234083f77c4..106cab463dfc 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionImpl.java @@ -79,7 +79,7 @@ protected Mono applyTagsToInnerAsync() { .manager() .inner() .expressRouteCrossConnections() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + .updateTagsAsync(resourceGroupName(), name(), inner().tags()); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java index fddea2687562..11d1e7a34ef1 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionPeeringImpl.java @@ -120,7 +120,7 @@ protected Mono getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -140,7 +140,7 @@ public Mono createResourceAsync() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java index 3f1639daf5d8..a911080f3601 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ExpressRouteCrossConnectionsImpl.java @@ -27,7 +27,7 @@ protected ExpressRouteCrossConnectionImpl wrapModel(ExpressRouteCrossConnectionI if (inner == null) { return null; } - return new ExpressRouteCrossConnectionImpl(inner.getName(), inner, this.manager()); + return new ExpressRouteCrossConnectionImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java index c701802678ee..2bc5b0fc0ae5 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/Ipv6PeeringConfigImpl.java @@ -61,7 +61,7 @@ public Ipv6PeeringConfigImpl withCustomerASN(int customerASN) { @Override public Ipv6PeeringConfigImpl withRouteFilter(String routeFilterId) { - inner().withRouteFilter(new SubResource().setId(routeFilterId)); + inner().withRouteFilter(new SubResource().withId(routeFilterId)); return this; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java index 467900533164..cc297223ef38 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerBackendImpl.java @@ -41,8 +41,8 @@ public Map backendNicIPConfigurationNames() { final Map ipConfigNames = new TreeMap<>(); if (this.inner().backendIPConfigurations() != null) { for (NetworkInterfaceIPConfigurationInner inner : this.inner().backendIPConfigurations()) { - String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.getId()); - String ipConfigName = ResourceUtils.nameFromResourceId(inner.getId()); + String nicId = ResourceUtils.parentResourceIdFromResourceId(inner.id()); + String ipConfigName = ResourceUtils.nameFromResourceId(inner.id()); ipConfigNames.put(nicId, ipConfigName); } } @@ -55,7 +55,7 @@ public Map loadBalancingRules() { final Map rules = new TreeMap<>(); if (this.inner().loadBalancingRules() != null) { for (SubResource inner : this.inner().loadBalancingRules()) { - String name = ResourceUtils.nameFromResourceId(inner.getId()); + String name = ResourceUtils.nameFromResourceId(inner.id()); LoadBalancingRule rule = this.parent().loadBalancingRules().get(name); if (rule != null) { rules.put(name, rule); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java index 862236bc794d..c8180e56c20a 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java @@ -50,7 +50,7 @@ class LoadBalancerFrontendImpl extends ChildResourceImpl loadBalancingRules() { final Map rules = new TreeMap<>(); if (this.inner().loadBalancingRules() != null) { for (SubResource innerRef : this.inner().loadBalancingRules()) { - String name = ResourceUtils.nameFromResourceId(innerRef.getId()); + String name = ResourceUtils.nameFromResourceId(innerRef.id()); LoadBalancingRule rule = this.parent().loadBalancingRules().get(name); if (rule != null) { rules.put(name, rule); @@ -112,7 +112,7 @@ public Map inboundNatPools() { final Map pools = new TreeMap<>(); if (this.inner().inboundNatPools() != null) { for (SubResource innerRef : this.inner().inboundNatPools()) { - String name = ResourceUtils.nameFromResourceId(innerRef.getId()); + String name = ResourceUtils.nameFromResourceId(innerRef.id()); LoadBalancerInboundNatPool pool = this.parent().inboundNatPools().get(name); if (pool != null) { pools.put(name, pool); @@ -128,7 +128,7 @@ public Map inboundNatRules() { final Map rules = new TreeMap<>(); if (this.inner().inboundNatRules() != null) { for (SubResource innerRef : this.inner().inboundNatRules()) { - String name = ResourceUtils.nameFromResourceId(innerRef.getId()); + String name = ResourceUtils.nameFromResourceId(innerRef.id()); LoadBalancerInboundNatRule rule = this.parent().inboundNatRules().get(name); if (rule != null) { rules.put(name, rule); @@ -149,7 +149,7 @@ public LoadBalancerFrontendImpl withExistingSubnet(Network network, String subne @Override public LoadBalancerFrontendImpl withExistingSubnet(String parentNetworkResourceId, String subnetName) { SubnetInner subnetRef = new SubnetInner(); - subnetRef.setId(parentNetworkResourceId + "/subnets/" + subnetName); + subnetRef.withId(parentNetworkResourceId + "/subnets/" + subnetName); this .inner() .withSubnet(subnetRef) diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java index a1224be5b9c4..be81dba026ee 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java @@ -89,7 +89,7 @@ protected Mono getInnerAsync() { @Override protected Mono applyTagsToInnerAsync() { - return this.manager().inner().loadBalancers().updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + return this.manager().inner().loadBalancers().updateTagsAsync(resourceGroupName(), name(), inner().tags()); } // Helpers @@ -122,7 +122,7 @@ protected SubResource ensureFrontendRef(String name) { } // Return frontend reference - return new SubResource().setId(this.futureResourceId() + "/frontendIPConfigurations/" + frontend.name()); + return new SubResource().withId(this.futureResourceId() + "/frontendIPConfigurations/" + frontend.name()); } protected LoadBalancerFrontendImpl ensureUniqueFrontend() { @@ -225,7 +225,7 @@ protected void beforeCreating() { for (LoadBalancerInboundNatRule natRule : this.inboundNatRules.values()) { // Clear deleted frontend references SubResource ref = natRule.inner().frontendIPConfiguration(); - if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { natRule.inner().withFrontendIPConfiguration(null); } } @@ -239,7 +239,7 @@ protected void beforeCreating() { for (LoadBalancerInboundNatPool natPool : this.inboundNatPools.values()) { // Clear deleted frontend references SubResource ref = natPool.inner().frontendIPConfiguration(); - if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { natPool.inner().withFrontendIPConfiguration(null); } } @@ -255,22 +255,22 @@ protected void beforeCreating() { // Clear deleted frontend references ref = lbRule.inner().frontendIPConfiguration(); - if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.frontends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { lbRule.inner().withFrontendIPConfiguration(null); } // Clear deleted backend references ref = lbRule.inner().backendAddressPool(); - if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + if (ref != null && !this.backends().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { lbRule.inner().withBackendAddressPool(null); } // Clear deleted probe references ref = lbRule.inner().probe(); if (ref != null - && !this.httpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.getId())) - && !this.httpsProbes().containsKey(ResourceUtils.nameFromResourceId(ref.getId())) - && !this.tcpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.getId()))) { + && !this.httpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.id())) + && !this.httpsProbes().containsKey(ResourceUtils.nameFromResourceId(ref.id())) + && !this.tcpProbes().containsKey(ResourceUtils.nameFromResourceId(ref.id()))) { lbRule.inner().withProbe(null); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java index 6ac402483000..9ae579847a4b 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java @@ -49,7 +49,7 @@ public LoadBalancerFrontend frontend() { return this .parent() .frontends() - .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().getId())); + .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().id())); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java index 0e5ab428d9f8..5d9646e74cdc 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java @@ -39,7 +39,7 @@ public String backendNicIPConfigurationName() { if (this.inner().backendIPConfiguration() == null) { return null; } else { - return ResourceUtils.nameFromResourceId(this.inner().backendIPConfiguration().getId()); + return ResourceUtils.nameFromResourceId(this.inner().backendIPConfiguration().id()); } } @@ -53,7 +53,7 @@ public String backendNetworkInterfaceId() { if (this.inner().backendIPConfiguration() == null) { return null; } else { - return ResourceUtils.parentResourceIdFromResourceId(this.inner().backendIPConfiguration().getId()); + return ResourceUtils.parentResourceIdFromResourceId(this.inner().backendIPConfiguration().id()); } } @@ -77,7 +77,7 @@ public LoadBalancerFrontend frontend() { return this .parent() .frontends() - .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().getId())); + .get(ResourceUtils.nameFromResourceId(this.inner().frontendIPConfiguration().id())); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java index e437a0321b62..854e9c449011 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerProbeImpl.java @@ -68,7 +68,7 @@ public Map loadBalancingRules() { final Map rules = new TreeMap<>(); if (this.inner().loadBalancingRules() != null) { for (SubResource inner : this.inner().loadBalancingRules()) { - String name = ResourceUtils.nameFromResourceId(inner.getId()); + String name = ResourceUtils.nameFromResourceId(inner.id()); LoadBalancingRule rule = this.parent().loadBalancingRules().get(name); if (rule != null) { rules.put(name, rule); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java index cb29950ab144..897593da77da 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancersImpl.java @@ -36,6 +36,6 @@ protected LoadBalancerImpl wrapModel(LoadBalancerInner inner) { if (inner == null) { return null; } - return new LoadBalancerImpl(inner.getName(), inner, this.manager()); + return new LoadBalancerImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java index 11961bb51023..7ef3f366ec69 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java @@ -76,7 +76,7 @@ public LoadBalancerFrontend frontend() { if (frontendRef == null) { return null; } else { - String frontendName = ResourceUtils.nameFromResourceId(frontendRef.getId()); + String frontendName = ResourceUtils.nameFromResourceId(frontendRef.id()); return this.parent().frontends().get(frontendName); } } @@ -87,7 +87,7 @@ public LoadBalancerBackend backend() { if (backendRef == null) { return null; } else { - String backendName = ResourceUtils.nameFromResourceId(backendRef.getId()); + String backendName = ResourceUtils.nameFromResourceId(backendRef.id()); return this.parent().backends().get(backendName); } } @@ -98,7 +98,7 @@ public LoadBalancerProbe probe() { if (probeRef == null) { return null; } else { - String probeName = ResourceUtils.nameFromResourceId(probeRef.getId()); + String probeName = ResourceUtils.nameFromResourceId(probeRef.id()); if (this.parent().httpProbes().containsKey(probeName)) { return this.parent().httpProbes().get(probeName); } else if (this.parent().tcpProbes().containsKey(probeName)) { @@ -241,14 +241,14 @@ public LoadBalancingRuleImpl toBackend(String backendName) { this.parent().defineBackend(backendName).attach(); SubResource backendRef = - new SubResource().setId(this.parent().futureResourceId() + "/backendAddressPools/" + backendName); + new SubResource().withId(this.parent().futureResourceId() + "/backendAddressPools/" + backendName); this.inner().withBackendAddressPool(backendRef); return this; } @Override public LoadBalancingRuleImpl withProbe(String name) { - SubResource probeRef = new SubResource().setId(this.parent().futureResourceId() + "/probes/" + name); + SubResource probeRef = new SubResource().withId(this.parent().futureResourceId() + "/probes/" + name); this.inner().withProbe(probeRef); return this; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java index 6e9df90eb152..528699244d89 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewayImpl.java @@ -136,7 +136,7 @@ public Mono applyTagsAsync() { .manager() .inner() .localNetworkGateways() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()) + .updateTagsAsync(resourceGroupName(), name(), inner().tags()) .flatMap( inner -> { setInner(inner); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java index 70f820ba37f9..135201c7779a 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LocalNetworkGatewaysImpl.java @@ -96,6 +96,6 @@ protected LocalNetworkGatewayImpl wrapModel(LocalNetworkGatewayInner inner) { if (inner == null) { return null; } - return new LocalNetworkGatewayImpl(inner.getName(), inner, this.manager()); + return new LocalNetworkGatewayImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java index d011c2ef5ba6..3a03cf742c65 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java @@ -78,7 +78,7 @@ protected Mono getInnerAsync() { @Override protected Mono applyTagsToInnerAsync() { - return this.manager().inner().virtualNetworks().updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + return this.manager().inner().virtualNetworks().updateTagsAsync(resourceGroupName(), name(), inner().tags()); } @Override @@ -276,7 +276,7 @@ public boolean isVmProtectionEnabled() { @Override public String ddosProtectionPlanId() { - return inner().ddosProtectionPlan() == null ? null : inner().ddosProtectionPlan().getId(); + return inner().ddosProtectionPlan() == null ? null : inner().ddosProtectionPlan().id(); } @Override @@ -298,7 +298,7 @@ public NetworkImpl withNewDdosProtectionPlan() { @Override public NetworkImpl withExistingDdosProtectionPlan(String planId) { - inner().withEnableDdosProtection(true).withDdosProtectionPlan(new SubResource().setId(planId)); + inner().withEnableDdosProtection(true).withDdosProtectionPlan(new SubResource().withId(planId)); return this; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java index 701242cc857b..19eb4fbc2d4a 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java @@ -82,7 +82,7 @@ protected Mono applyTagsToInnerAsync() { .manager() .inner() .networkInterfaces() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + .updateTagsAsync(resourceGroupName(), name(), inner().tags()); } // Setters (fluent) @@ -282,7 +282,7 @@ public boolean isAcceleratedNetworkingEnabled() { @Override public String virtualMachineId() { if (this.inner().virtualMachine() != null) { - return this.inner().virtualMachine().getId(); + return this.inner().virtualMachine().id(); } else { return null; } @@ -347,7 +347,7 @@ public Map ipConfigurations() { @Override public String networkSecurityGroupId() { - return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().getId() : null; + return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().id() : null; } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java index 8e80cd7b07ff..90b028d6bcb6 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfacesImpl.java @@ -82,6 +82,6 @@ protected NetworkInterfaceImpl wrapModel(NetworkInterfaceInner inner) { if (inner == null) { return null; } - return new NetworkInterfaceImpl(inner.getName(), inner, this.manager()); + return new NetworkInterfaceImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java index 15fc5e1aa364..4408e5d57625 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkManager.java @@ -266,8 +266,8 @@ Subnet getAssociatedSubnet(SubResource subnetRef) { return null; } - String vnetId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId()); - String subnetName = ResourceUtils.nameFromResourceId(subnetRef.getId()); + String vnetId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.id()); + String subnetName = ResourceUtils.nameFromResourceId(subnetRef.id()); if (vnetId == null || subnetName == null) { return null; @@ -288,14 +288,14 @@ List listAssociatedSubnets(List subnetRefs) { if (subnetRefs != null) { for (SubnetInner subnetRef : subnetRefs) { - String networkId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId()); + String networkId = ResourceUtils.parentResourceIdFromResourceId(subnetRef.id()); Network network = networks.get(networkId.toLowerCase(Locale.ROOT)); if (network == null) { network = this.networks().getById(networkId); networks.put(networkId.toLowerCase(Locale.ROOT), network); } - String subnetName = ResourceUtils.nameFromResourceId(subnetRef.getId()); + String subnetName = ResourceUtils.nameFromResourceId(subnetRef.id()); subnets.add(network.subnets().get(subnetName)); } } @@ -311,14 +311,14 @@ Collection listAssociatedApplicationGatewayBackends( if (backendRefs != null) { for (ApplicationGatewayBackendAddressPool backendRef : backendRefs) { - String appGatewayId = ResourceUtils.parentResourceIdFromResourceId(backendRef.getId()); + String appGatewayId = ResourceUtils.parentResourceIdFromResourceId(backendRef.id()); ApplicationGateway appGateway = appGateways.get(appGatewayId.toLowerCase(Locale.ROOT)); if (appGateway == null) { appGateway = this.applicationGateways().getById(appGatewayId); appGateways.put(appGatewayId.toLowerCase(Locale.ROOT), appGateway); } - String backendName = ResourceUtils.nameFromResourceId(backendRef.getId()); + String backendName = ResourceUtils.nameFromResourceId(backendRef.id()); backends.add(appGateway.backends().get(backendName)); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java index f3858609a5bb..83933c6b7e9a 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java @@ -67,7 +67,7 @@ public String name() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -85,7 +85,7 @@ public List remoteAddressSpaces() { @Override public String remoteNetworkId() { - return (this.inner().remoteVirtualNetwork() != null) ? this.inner().remoteVirtualNetwork().getId() : null; + return (this.inner().remoteVirtualNetwork() != null) ? this.inner().remoteVirtualNetwork().id() : null; } @Override @@ -121,7 +121,7 @@ public NetworkPeeringImpl withoutAccessFromEitherNetwork() { @Override public NetworkPeeringImpl withRemoteNetwork(String resourceId) { - SubResource networkRef = new SubResource().setId(resourceId); + SubResource networkRef = new SubResource().withId(resourceId); this.inner().withRemoteVirtualNetwork(networkRef); return this; } @@ -263,7 +263,7 @@ protected Mono createChildResourceAsync() { SubResource networkRef = inner.remoteVirtualNetwork(); if (localPeering.isSameSubscription()) { // Update the remote network only if it is in the same subscription - return localPeering.manager().networks().getByIdAsync(networkRef.getId()); + return localPeering.manager().networks().getByIdAsync(networkRef.id()); } else { // Otherwise, skip this return Mono.empty(); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java index d4425a5b8add..efbfb9497388 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupImpl.java @@ -93,7 +93,7 @@ protected Mono applyTagsToInnerAsync() { .manager() .inner() .networkSecurityGroups() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + .updateTagsAsync(resourceGroupName(), name(), inner().tags()); } @Override @@ -131,7 +131,7 @@ public Set networkInterfaceIds() { Set ids = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); if (this.inner().networkInterfaces() != null) { for (NetworkInterfaceInner inner : this.inner().networkInterfaces()) { - ids.add(inner.getId()); + ids.add(inner.id()); } } return Collections.unmodifiableSet(ids); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java index 3d4f4866b479..419d96463b18 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityGroupsImpl.java @@ -62,6 +62,6 @@ protected NetworkSecurityGroupImpl wrapModel(NetworkSecurityGroupInner inner) { if (inner == null) { return null; } - return new NetworkSecurityGroupImpl(inner.getName(), inner, this.manager()); + return new NetworkSecurityGroupImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java index 4fad44f80f23..fa1c845785a4 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkSecurityRuleImpl.java @@ -35,12 +35,12 @@ class NetworkSecurityRuleImpl super(inner, parent); if (inner.sourceApplicationSecurityGroups() != null) { for (ApplicationSecurityGroupInner asg : inner.sourceApplicationSecurityGroups()) { - sourceAsgs.put(asg.getId(), asg); + sourceAsgs.put(asg.id(), asg); } } if (inner.destinationApplicationSecurityGroups() != null) { for (ApplicationSecurityGroupInner asg : inner.destinationApplicationSecurityGroups()) { - destinationAsgs.put(asg.getId(), asg); + destinationAsgs.put(asg.id(), asg); } } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java index 14d3523d1a1b..748dd1547c46 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatcherImpl.java @@ -135,7 +135,7 @@ public Mono applyTagsAsync() { .manager() .inner() .networkWatchers() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()) + .updateTagsAsync(resourceGroupName(), name(), inner().tags()) .flatMap( inner -> { setInner(inner); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java index 9570de97f077..407c68c24fb2 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkWatchersImpl.java @@ -35,6 +35,6 @@ protected NetworkWatcherImpl wrapModel(NetworkWatcherInner inner) { if (inner == null) { return null; } - return new NetworkWatcherImpl(inner.getName(), inner, this.manager()); + return new NetworkWatcherImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java index 76dca8c522a0..86d3ed37dd7d 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworksImpl.java @@ -68,6 +68,6 @@ protected NetworkImpl wrapModel(VirtualNetworkInner inner) { if (inner == null) { return null; } - return new NetworkImpl(inner.getName(), inner, this.manager()); + return new NetworkImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java index 01e7203be389..fea5125513b4 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationBaseImpl.java @@ -95,7 +95,7 @@ public String networkId() { if (subnetRef == null) { return null; } - return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId()); + return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id()); } public Network getNetwork() { @@ -112,7 +112,7 @@ public String subnetName() { if (subnetRef == null) { return null; } - return ResourceUtils.nameFromResourceId(subnetRef.getId()); + return ResourceUtils.nameFromResourceId(subnetRef.id()); } @Override @@ -132,13 +132,13 @@ public List listAssociatedLoadBalancerBackends() { final Map loadBalancers = new HashMap<>(); final List backends = new ArrayList<>(); for (BackendAddressPoolInner backendRef : backendRefs) { - String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(backendRef.getId()); + String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(backendRef.id()); LoadBalancer loadBalancer = loadBalancers.get(loadBalancerId.toLowerCase(Locale.ROOT)); if (loadBalancer == null) { loadBalancer = this.networkManager.loadBalancers().getById(loadBalancerId); loadBalancers.put(loadBalancerId.toLowerCase(Locale.ROOT), loadBalancer); } - String backendName = ResourceUtils.nameFromResourceId(backendRef.getId()); + String backendName = ResourceUtils.nameFromResourceId(backendRef.id()); backends.add(loadBalancer.backends().get(backendName)); } return Collections.unmodifiableList(backends); @@ -153,13 +153,13 @@ public List listAssociatedLoadBalancerInboundNatRule final Map loadBalancers = new HashMap<>(); final List rules = new ArrayList<>(); for (InboundNatRuleInner ref : inboundNatPoolRefs) { - String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(ref.getId()); + String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(ref.id()); LoadBalancer loadBalancer = loadBalancers.get(loadBalancerId.toLowerCase(Locale.ROOT)); if (loadBalancer == null) { loadBalancer = this.networkManager.loadBalancers().getById(loadBalancerId); loadBalancers.put(loadBalancerId.toLowerCase(Locale.ROOT), loadBalancer); } - String ruleName = ResourceUtils.nameFromResourceId(ref.getId()); + String ruleName = ResourceUtils.nameFromResourceId(ref.id()); rules.add(loadBalancer.inboundNatRules().get(ruleName)); } return Collections.unmodifiableList(rules); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java index 6a0356465266..7c251c369c6f 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NicIPConfigurationImpl.java @@ -70,7 +70,7 @@ public String publicIPAddressId() { if (this.inner().publicIPAddress() == null) { return null; } - return this.inner().publicIPAddress().getId(); + return this.inner().publicIPAddress().id(); } @Override @@ -285,13 +285,13 @@ private SubnetInner subnetToAssociate() { if (this.isInCreateMode) { if (this.creatableVirtualNetworkKey != null) { Network network = (Network) parent().createdDependencyResource(this.creatableVirtualNetworkKey); - subnetInner.setId(network.inner().subnets().get(0).getId()); + subnetInner.withId(network.inner().subnets().get(0).id()); return subnetInner; } for (SubnetInner subnet : this.existingVirtualNetworkToAssociate.inner().subnets()) { if (subnet.name().equalsIgnoreCase(this.subnetToAssociate)) { - subnetInner.setId(subnet.getId()); + subnetInner.withId(subnet.id()); return subnetInner; } } @@ -305,10 +305,10 @@ private SubnetInner subnetToAssociate() { } else { if (subnetToAssociate != null) { - int idx = this.inner().subnet().getId().lastIndexOf('/'); - subnetInner.setId(this.inner().subnet().getId().substring(0, idx + 1) + subnetToAssociate); + int idx = this.inner().subnet().id().lastIndexOf('/'); + subnetInner.withId(this.inner().subnet().id().substring(0, idx + 1) + subnetToAssociate); } else { - subnetInner.setId(this.inner().subnet().getId()); + subnetInner.withId(this.inner().subnet().id()); } return subnetInner; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java index e577008f7758..15ce6fe4b922 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureImpl.java @@ -126,7 +126,7 @@ void attachPCFilter(PCFilterImpl pcFilter) { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -139,7 +139,7 @@ public Mono createResourceAsync() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java index 9ee602f6ff9e..b203578ca8ac 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PacketCaptureStatusImpl.java @@ -23,7 +23,7 @@ public String name() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java index 4e3e9910be60..1d7830fe2dd2 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressImpl.java @@ -188,7 +188,7 @@ private boolean equalsResourceType(String resourceType) { if (ipConfig == null || resourceType == null) { return false; } else { - final String refId = this.inner().ipConfiguration().getId(); + final String refId = this.inner().ipConfiguration().id(); final String resourceType2 = ResourceUtils.resourceTypeFromResourceId(refId); return resourceType.equalsIgnoreCase(resourceType2); } @@ -202,7 +202,7 @@ public boolean hasAssignedLoadBalancer() { @Override public LoadBalancerPublicFrontend getAssignedLoadBalancerFrontend() { if (this.hasAssignedLoadBalancer()) { - final String refId = this.inner().ipConfiguration().getId(); + final String refId = this.inner().ipConfiguration().id(); final String loadBalancerId = ResourceUtils.parentResourceIdFromResourceId(refId); final LoadBalancer lb = this.myManager.loadBalancers().getById(loadBalancerId); final String frontendName = ResourceUtils.nameFromResourceId(refId); @@ -241,7 +241,7 @@ public List ipTags() { @Override public NicIPConfiguration getAssignedNetworkInterfaceIPConfiguration() { if (this.hasAssignedNetworkInterface()) { - final String refId = this.inner().ipConfiguration().getId(); + final String refId = this.inner().ipConfiguration().id(); final String parentId = ResourceUtils.parentResourceIdFromResourceId(refId); final NetworkInterface nic = this.myManager.networkInterfaces().getById(parentId); final String childName = ResourceUtils.nameFromResourceId(refId); @@ -267,7 +267,7 @@ public Mono applyTagsAsync() { .manager() .inner() .publicIPAddresses() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()) + .updateTagsAsync(resourceGroupName(), name(), inner().tags()) .flatMap( inner -> { setInner(inner); diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java index 5282c177360e..924d77b57882 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/PublicIPAddressesImpl.java @@ -42,6 +42,6 @@ protected PublicIPAddressImpl wrapModel(PublicIPAddressInner inner) { if (inner == null) { return null; } - return new PublicIPAddressImpl(inner.getId(), inner, this.manager()); + return new PublicIPAddressImpl(inner.id(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java index 03cdea3133e5..25bf55ea4684 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteFiltersImpl.java @@ -34,6 +34,6 @@ protected RouteFilterImpl wrapModel(RouteFilterInner inner) { if (inner == null) { return null; } - return new RouteFilterImpl(inner.getName(), inner, this.manager()); + return new RouteFilterImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java index 25377cdd13fb..1927f0f7f7ea 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTableImpl.java @@ -29,7 +29,7 @@ class RouteTableImpl @Override protected Mono applyTagsToInnerAsync() { - return this.manager().inner().routeTables().updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + return this.manager().inner().routeTables().updateTagsAsync(resourceGroupName(), name(), inner().tags()); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java index d2cf68e79159..cecc7121328c 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/RouteTablesImpl.java @@ -34,6 +34,6 @@ protected RouteTableImpl wrapModel(String name) { @Override protected RouteTableImpl wrapModel(RouteTableInner inner) { - return new RouteTableImpl(inner.getName(), inner, this.manager()); + return new RouteTableImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java index 8ba91fc52e25..47a8d6bcfd7b 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SecurityGroupViewImpl.java @@ -32,7 +32,7 @@ private void initializeFromInner() { List securityGroupNetworkInterfaces = this.inner().networkInterfaces(); if (securityGroupNetworkInterfaces != null) { for (SecurityGroupNetworkInterface networkInterface : securityGroupNetworkInterfaces) { - this.networkInterfaces.put(networkInterface.getId(), networkInterface); + this.networkInterfaces.put(networkInterface.id(), networkInterface); } } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java index 97e693d9d1e4..f3dbabed82ff 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/SubnetImpl.java @@ -63,12 +63,12 @@ public String name() { @Override public String networkSecurityGroupId() { - return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().getId() : null; + return (this.inner().networkSecurityGroup() != null) ? this.inner().networkSecurityGroup().id() : null; } @Override public String routeTableId() { - return (this.inner().routeTable() != null) ? this.inner().routeTable().getId() : null; + return (this.inner().routeTable() != null) ? this.inner().routeTable().id() : null; } @Override @@ -216,8 +216,8 @@ public Collection listNetworkInterfaceIPConfigurations() { } for (IPConfigurationInner ipConfigRef : ipConfigRefs) { - String nicID = ResourceUtils.parentResourceIdFromResourceId(ipConfigRef.getId()); - String ipConfigName = ResourceUtils.nameFromResourceId(ipConfigRef.getId()); + String nicID = ResourceUtils.parentResourceIdFromResourceId(ipConfigRef.id()); + String ipConfigName = ResourceUtils.nameFromResourceId(ipConfigRef.id()); // Check if NIC already cached NetworkInterface nic = nics.get(nicID.toLowerCase(Locale.ROOT)); if (nic == null) { diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java index 9770f3889b07..4ce8007422a2 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/TopologyImpl.java @@ -29,7 +29,7 @@ class TopologyImpl extends ExecutableImpl implements Topology, Topolog @Override public String id() { - return inner().getId(); + return inner().id(); } @Override @@ -57,7 +57,7 @@ private void initializeResourcesFromInner() { List topologyResources = this.inner().resources(); if (topologyResources != null) { for (TopologyResource resource : topologyResources) { - this.resources.put(resource.getId(), resource); + this.resources.put(resource.id(), resource); } } } @@ -75,7 +75,7 @@ public TopologyImpl withTargetResourceGroup(String resourceGroupName) { @Override public TopologyImpl withTargetNetwork(String networkId) { - parameters.withTargetVirtualNetwork(new SubResource().setId(networkId)); + parameters.withTargetVirtualNetwork(new SubResource().withId(networkId)); return this; } @@ -83,7 +83,7 @@ public TopologyImpl withTargetNetwork(String networkId) { public TopologyImpl withTargetSubnet(String subnetName) { parameters .withTargetSubnet( - new SubResource().setId(parameters.targetVirtualNetwork().getId() + "/subnets/" + subnetName)); + new SubResource().withId(parameters.targetVirtualNetwork().id() + "/subnets/" + subnetName)); return this; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java index 8370b5ff3ec2..a3f5367fb941 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfaceImpl.java @@ -145,7 +145,7 @@ public String networkSecurityGroupId() { if (this.inner().networkSecurityGroup() == null) { return null; } - return this.inner().networkSecurityGroup().getId(); + return this.inner().networkSecurityGroup().id(); } @Override @@ -165,7 +165,7 @@ public String virtualMachineId() { if (this.inner().virtualMachine() == null) { return null; } - return this.inner().virtualMachine().getId(); + return this.inner().virtualMachine().id(); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java index 0c2d2b903060..f67fd0c4d4d9 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualMachineScaleSetNetworkInterfacesImpl.java @@ -43,7 +43,7 @@ protected VirtualMachineScaleSetNetworkInterfaceImpl wrapModel(NetworkInterfaceI return null; } return new VirtualMachineScaleSetNetworkInterfaceImpl( - inner.getName(), this.scaleSetName, this.resourceGroupName, inner, this.manager()); + inner.name(), this.scaleSetName, this.resourceGroupName, inner, this.manager()); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java index 9bc335d62b9b..157e72a67ecf 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionImpl.java @@ -53,7 +53,7 @@ public String virtualNetworkGateway1Id() { if (inner().virtualNetworkGateway1() == null) { return null; } - return inner().virtualNetworkGateway1().getId(); + return inner().virtualNetworkGateway1().id(); } @Override @@ -61,7 +61,7 @@ public String virtualNetworkGateway2Id() { if (inner().virtualNetworkGateway2() == null) { return null; } - return inner().virtualNetworkGateway2().getId(); + return inner().virtualNetworkGateway2().id(); } @Override @@ -69,7 +69,7 @@ public String localNetworkGateway2Id() { if (inner().localNetworkGateway2() == null) { return null; } - return inner().localNetworkGateway2().getId(); + return inner().localNetworkGateway2().id(); } @Override @@ -109,7 +109,7 @@ public long ingressBytesTransferred() { @Override public String peerId() { - return inner().peer() == null ? null : inner().peer().getId(); + return inner().peer() == null ? null : inner().peer().id(); } @Override @@ -147,7 +147,7 @@ public VirtualNetworkGatewayConnectionImpl withVNetToVNet() { @Override public VirtualNetworkGatewayConnectionImpl withExpressRoute(String circuitId) { inner().withConnectionType(VirtualNetworkGatewayConnectionType.EXPRESS_ROUTE); - inner().withPeer(new SubResource().setId(circuitId)); + inner().withPeer(new SubResource().withId(circuitId)); return this; } @@ -231,7 +231,7 @@ public Mono applyTagsAsync() { .manager() .inner() .virtualNetworkGatewayConnections() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()) + .updateTagsAsync(resourceGroupName(), name(), inner().tags()) .flatMap(inner -> refreshAsync()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java index f6eac50f91a6..6f1bfb55f425 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayConnectionsImpl.java @@ -46,7 +46,7 @@ protected VirtualNetworkGatewayConnectionImpl wrapModel(VirtualNetworkGatewayCon if (inner == null) { return null; } - return new VirtualNetworkGatewayConnectionImpl(inner.getName(), parent, inner); + return new VirtualNetworkGatewayConnectionImpl(inner.name(), parent, inner); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java index 8c1906cc9aa8..b890c3ca041a 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationImpl.java @@ -35,7 +35,7 @@ public String name() { @Override public String publicIPAddressId() { if (this.inner().publicIPAddress() != null) { - return this.inner().publicIPAddress().getId(); + return this.inner().publicIPAddress().id(); } else { return null; } @@ -45,7 +45,7 @@ public String publicIPAddressId() { public String networkId() { SubResource subnetRef = this.inner().subnet(); if (subnetRef != null) { - return ResourceUtils.parentResourceIdFromResourceId(subnetRef.getId()); + return ResourceUtils.parentResourceIdFromResourceId(subnetRef.id()); } else { return null; } @@ -55,7 +55,7 @@ public String networkId() { public String subnetName() { SubResource subnetRef = this.inner().subnet(); if (subnetRef != null) { - return ResourceUtils.nameFromResourceId(subnetRef.getId()); + return ResourceUtils.nameFromResourceId(subnetRef.id()); } else { return null; } @@ -73,7 +73,7 @@ public Subnet getSubnet() { @Override public VirtualNetworkGatewayIPConfigurationImpl withExistingSubnet(String networkId, String subnetName) { - SubResource subnetRef = new SubResource().setId(networkId + "/subnets/" + subnetName); + SubResource subnetRef = new SubResource().withId(networkId + "/subnets/" + subnetName); this.inner().withSubnet(subnetRef); return this; } @@ -100,7 +100,7 @@ public VirtualNetworkGatewayIPConfigurationImpl withExistingPublicIPAddress(Publ @Override public VirtualNetworkGatewayIPConfigurationImpl withExistingPublicIPAddress(String resourceId) { - SubResource pipRef = new SubResource().setId(resourceId); + SubResource pipRef = new SubResource().withId(resourceId); this.inner().withPublicIPAddress(pipRef); return this; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java index 7dc501ac7a4b..bf26fbe74694 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java @@ -200,7 +200,7 @@ public PagedFlux listConnectionsAsync() { PagedFlux connectionInners = this.manager().inner().virtualNetworkGateways().listConnectionsAsync(this.resourceGroupName(), this.name()); return PagedConverter - .flatMapPage(connectionInners, connectionInner -> connections().getByIdAsync(connectionInner.getId())); + .flatMapPage(connectionInners, connectionInner -> connections().getByIdAsync(connectionInner.id())); } @Override @@ -227,7 +227,7 @@ protected Mono applyTagsToInnerAsync() { .manager() .inner() .virtualNetworkGateways() - .updateTagsAsync(resourceGroupName(), name(), inner().getTags()); + .updateTagsAsync(resourceGroupName(), name(), inner().tags()); } @Override @@ -260,7 +260,7 @@ public boolean activeActive() { @Override public String gatewayDefaultSiteResourceId() { - return inner().gatewayDefaultSite() == null ? null : inner().gatewayDefaultSite().getId(); + return inner().gatewayDefaultSite() == null ? null : inner().gatewayDefaultSite().id(); } @Override diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java index 24923e8f85f3..2772b1270440 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewaysImpl.java @@ -97,6 +97,6 @@ protected VirtualNetworkGatewayImpl wrapModel(VirtualNetworkGatewayInner inner) if (inner == null) { return null; } - return new VirtualNetworkGatewayImpl(inner.getName(), inner, this.manager()); + return new VirtualNetworkGatewayImpl(inner.name(), inner, this.manager()); } } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java index 60f84e8300a5..93c1af52470c 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayAvailableSslOptionsInner.java @@ -136,7 +136,7 @@ public ApplicationGatewayAvailableSslOptionsInner withAvailableProtocols( * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java index 3dac33bd1bd9..c92d7efd0a94 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationGatewayInner.java @@ -838,7 +838,7 @@ public ApplicationGatewayInner withCustomErrorConfigurations( * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java index d81017374049..198c2ee28d90 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/ApplicationSecurityGroupInner.java @@ -75,7 +75,7 @@ public String provisioningState() { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java index a393a441948a..5d953b6097f9 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailableDelegationInner.java @@ -66,7 +66,7 @@ public AvailableDelegationInner withName(String name) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java index 94c98256d373..ef435f15a8f5 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AvailablePrivateEndpointTypeInner.java @@ -59,7 +59,7 @@ public AvailablePrivateEndpointTypeInner withName(String name) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java index c700c3caf246..b27f01862a95 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallFqdnTagInner.java @@ -70,7 +70,7 @@ public String fqdnTagName() { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java index eb1d64ea9439..1a5e6433fadd 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/AzureFirewallInner.java @@ -290,7 +290,7 @@ public HubIPAddresses hubIpAddresses() { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java index c3a52620f4f2..b1e0b11c7455 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BastionHostInner.java @@ -110,7 +110,7 @@ public ProvisioningState provisioningState() { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java index c8e1f0ce0caf..154862a94669 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/BgpServiceCommunityInner.java @@ -78,7 +78,7 @@ public BgpServiceCommunityInner withBgpCommunities(List bgpCommuni * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java index 26848c9e5300..99d95032af5d 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/DdosCustomPolicyInner.java @@ -121,7 +121,7 @@ public DdosCustomPolicyInner withProtocolCustomSettings(List vpnSiteLinks) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java index 18d705578e38..19a2d278a9e6 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java +++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/models/WebApplicationFirewallPolicyInner.java @@ -152,7 +152,7 @@ public WebApplicationFirewallPolicyResourceState resourceState() { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java index cf0d5f16cb21..7578a39b4e29 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/BasicDependency.java @@ -33,7 +33,7 @@ public final class BasicDependency { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java index f636c27fd251..dfb21e44e232 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/Dependency.java @@ -60,7 +60,7 @@ public Dependency withDependsOn(List dependsOn) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java index 168aba8a328b..b62f0dafbba4 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/TargetResource.java @@ -33,7 +33,7 @@ public final class TargetResource { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java index b036e5091249..7295805d5419 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/IndependentChildResourceImpl.java @@ -50,7 +50,7 @@ protected IndependentChildResourceImpl(String name, InnerModelT innerObject, Man @Override public String regionName() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -60,7 +60,7 @@ public Region region() { @Override public Map tags() { - Map tags = this.inner().getTags(); + Map tags = this.inner().tags(); if (tags == null) { tags = new TreeMap<>(); } @@ -70,7 +70,7 @@ public Map tags() { @Override public String id() { if (this.inner() != null) { - return this.inner().getId(); + return this.inner().id(); } return null; @@ -78,15 +78,15 @@ public String id() { @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override public String name() { - if (this.inner().getName() == null) { + if (this.inner().name() == null) { return super.name(); } else { - return this.inner().getName(); + return this.inner().name(); } } @@ -102,7 +102,7 @@ public String name() { */ @SuppressWarnings("unchecked") public final FluentModelImplT withTags(Map tags) { - this.inner().setTags(new HashMap<>(tags)); + this.inner().withTags(new HashMap<>(tags)); return (FluentModelImplT) this; } @@ -115,10 +115,10 @@ public final FluentModelImplT withTags(Map tags) { */ @SuppressWarnings("unchecked") public final FluentModelImplT withTag(String key, String value) { - if (this.inner().getTags() == null) { - this.inner().setTags(new HashMap()); + if (this.inner().tags() == null) { + this.inner().withTags(new HashMap()); } - this.inner().getTags().put(key, value); + this.inner().tags().put(key, value); return (FluentModelImplT) this; } @@ -130,8 +130,8 @@ public final FluentModelImplT withTag(String key, String value) { */ @SuppressWarnings("unchecked") public final FluentModelImplT withoutTag(String key) { - if (this.inner().getTags() != null) { - this.inner().getTags().remove(key); + if (this.inner().tags() != null) { + this.inner().tags().remove(key); } return (FluentModelImplT) this; } @@ -141,12 +141,12 @@ public final FluentModelImplT withoutTag(String key) { */ @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override public FluentModelImplT withExistingParentResource(FluentParentModelT existingParentResource) { - this.inner().setLocation(existingParentResource.regionName()); + this.inner().withLocation(existingParentResource.regionName()); return super.withExistingParentResource(existingParentResource); } } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java index 8e329c389111..819399ed09b1 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java @@ -35,8 +35,8 @@ public abstract class ResourceImpl< Resource { protected ResourceImpl(String name, InnerModelT innerObject) { super(name, innerObject); - if (innerObject.getTags() == null) { - innerObject.setTags(new TreeMap()); + if (innerObject.tags() == null) { + innerObject.withTags(new TreeMap()); } } @@ -46,7 +46,7 @@ protected ResourceImpl(String name, InnerModelT innerObject) { @Override public String regionName() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -56,7 +56,7 @@ public Region region() { @Override public Map tags() { - Map tags = this.inner().getTags(); + Map tags = this.inner().tags(); if (tags == null) { tags = new TreeMap<>(); } @@ -65,20 +65,20 @@ public Map tags() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override public String name() { - if (this.inner().getName() == null) { + if (this.inner().name() == null) { return super.name(); } else { - return this.inner().getName(); + return this.inner().name(); } } @@ -94,7 +94,7 @@ public String name() { */ @SuppressWarnings("unchecked") public final FluentModelImplT withTags(Map tags) { - this.inner().setTags(new HashMap<>(tags)); + this.inner().withTags(new HashMap<>(tags)); return (FluentModelImplT) this; } @@ -107,10 +107,10 @@ public final FluentModelImplT withTags(Map tags) { */ @SuppressWarnings("unchecked") public final FluentModelImplT withTag(String key, String value) { - if (this.inner().getTags() == null) { - this.inner().setTags(new HashMap()); + if (this.inner().tags() == null) { + this.inner().withTags(new HashMap()); } - this.inner().getTags().put(key, value); + this.inner().tags().put(key, value); return (FluentModelImplT) this; } @@ -122,8 +122,8 @@ public final FluentModelImplT withTag(String key, String value) { */ @SuppressWarnings("unchecked") public final FluentModelImplT withoutTag(String key) { - if (this.inner().getTags() != null) { - this.inner().getTags().remove(key); + if (this.inner().tags() != null) { + this.inner().tags().remove(key); } return (FluentModelImplT) this; } @@ -140,7 +140,7 @@ public final FluentModelImplT withoutTag(String key) { */ @SuppressWarnings("unchecked") public final FluentModelImplT withRegion(String regionName) { - this.inner().setLocation(regionName); + this.inner().withLocation(regionName); return (FluentModelImplT) this; } @@ -159,7 +159,7 @@ public final FluentModelImplT withRegion(Region region) { */ @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } protected List innersFromWrappers(Collection> wrappers) { diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java index 3191129708b0..243eeee89c01 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentImpl.java @@ -57,7 +57,7 @@ public final class DeploymentImpl extends DeploymentImpl(DeploymentExtendedInner innerModel, String name, final ResourceManager resourceManager) { super(name, innerModel); - this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.getId()); + this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.id()); this.resourceManager = resourceManager; this.objectMapper = new ObjectMapper(); this.deploymentWhatIf = new DeploymentWhatIf(); @@ -354,7 +354,7 @@ protected Mono getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -364,7 +364,7 @@ public ResourceManager manager() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java index 033c0fa6bd78..536bb3daa98e 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentOperationImpl.java @@ -28,8 +28,8 @@ final class DeploymentOperationImpl extends DeploymentOperationImpl(DeploymentOperationInner innerModel, final DeploymentOperationsInner client) { super(innerModel); this.client = client; - this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.getId()); - this.deploymentName = ResourceUtils.extractFromResourceId(innerModel.getId(), "deployments"); + this.resourceGroupName = ResourceUtils.groupFromResourceId(innerModel.id()); + this.deploymentName = ResourceUtils.extractFromResourceId(innerModel.id(), "deployments"); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java index 880f4656f0d6..1704c8928718 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/DeploymentsImpl.java @@ -32,7 +32,7 @@ final class DeploymentsImpl @Override public PagedIterable list() { return this.manager().inner().deployments().list() - .mapPage(inner -> new DeploymentImpl(inner, inner.getName(), resourceManager)); + .mapPage(inner -> new DeploymentImpl(inner, inner.name(), resourceManager)); } @Override @@ -49,7 +49,7 @@ public Deployment getByName(String name) { @Override public Mono getByNameAsync(String name) { return this.manager().inner().deployments().getAtTenantScopeAsync(name) - .map(inner -> new DeploymentImpl(inner, inner.getName(), this.resourceManager)); + .map(inner -> new DeploymentImpl(inner, inner.name(), this.resourceManager)); } @Override @@ -91,7 +91,7 @@ protected DeploymentImpl createFluentModel(String name) { } protected DeploymentImpl createFluentModel(DeploymentExtendedInner deploymentExtendedInner) { - return new DeploymentImpl(deploymentExtendedInner, deploymentExtendedInner.getName(), this.resourceManager); + return new DeploymentImpl(deploymentExtendedInner, deploymentExtendedInner.name(), this.resourceManager); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java index 88afbd6c6223..df8387dcadc5 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourceImpl.java @@ -36,9 +36,9 @@ final class GenericResourceImpl GenericResourceInner innerModel, final ResourceManager resourceManager) { super(key, innerModel, resourceManager); - resourceProviderNamespace = ResourceUtils.resourceProviderFromResourceId(innerModel.getId()); - resourceType = ResourceUtils.resourceTypeFromResourceId(innerModel.getId()); - parentResourcePath = ResourceUtils.parentRelativePathFromResourceId(innerModel.getId()); + resourceProviderNamespace = ResourceUtils.resourceProviderFromResourceId(innerModel.id()); + resourceType = ResourceUtils.resourceTypeFromResourceId(innerModel.id()); + parentResourcePath = ResourceUtils.parentRelativePathFromResourceId(innerModel.id()); } @Override @@ -152,7 +152,7 @@ public Mono createResourceAsync() { .flatMap(provider -> { String id; if (!isInCreateMode()) { - id = inner().getId(); + id = inner().id(); } else { id = ResourceUtils.constructResourceId( serviceClient.getSubscriptionId(), @@ -171,7 +171,7 @@ public Mono createResourceAsync() { .flatMap(api -> { String name = this.name(); if (!isInCreateMode()) { - name = ResourceUtils.nameFromResourceId(inner().getId()); + name = ResourceUtils.nameFromResourceId(inner().id()); } return resourceClient.createOrUpdateAsync( resourceGroupName(), diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java index 60df73ed7f51..a3cb3b729e76 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/GenericResourcesImpl.java @@ -193,11 +193,11 @@ protected GenericResourceImpl wrapModel(GenericResourceInner inner) { if (inner == null) { return null; } - return new GenericResourceImpl(inner.getId(), inner, this.manager()) - .withExistingResourceGroup(ResourceUtils.groupFromResourceId(inner.getId())) - .withProviderNamespace(ResourceUtils.resourceProviderFromResourceId(inner.getId())) - .withResourceType(ResourceUtils.resourceTypeFromResourceId(inner.getId())) - .withParentResourceId(ResourceUtils.parentResourceIdFromResourceId(inner.getId())); + return new GenericResourceImpl(inner.id(), inner, this.manager()) + .withExistingResourceGroup(ResourceUtils.groupFromResourceId(inner.id())) + .withProviderNamespace(ResourceUtils.resourceProviderFromResourceId(inner.id())) + .withResourceType(ResourceUtils.resourceTypeFromResourceId(inner.id())) + .withParentResourceId(ResourceUtils.parentResourceIdFromResourceId(inner.id())); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java index 2cbaf359c964..a670289bb8e7 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentImpl.java @@ -44,12 +44,12 @@ public String scope() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override public String type() { - return inner().getType(); + return inner().type(); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java index 3696b4f454f6..3d83d49b1756 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyAssignmentsImpl.java @@ -58,7 +58,7 @@ protected PolicyAssignmentImpl wrapModel(PolicyAssignmentInner inner) { if (inner == null) { return null; } - return new PolicyAssignmentImpl(inner.getName(), inner, client); + return new PolicyAssignmentImpl(inner.name(), inner, client); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java index 37584fda6c90..be163bb760bf 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/PolicyDefinitionImpl.java @@ -53,7 +53,7 @@ public Object policyRule() { @Override public String id() { - return inner().getId(); + return inner().id(); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java index ff9c11a4c342..e40729d809b9 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupImpl.java @@ -44,7 +44,7 @@ public String provisioningState() { @Override public String regionName() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -54,7 +54,7 @@ public Region region() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -64,7 +64,7 @@ public String type() { @Override public Map tags() { - Map tags = this.inner().getTags(); + Map tags = this.inner().tags(); if (tags == null) { tags = new HashMap<>(); } @@ -87,7 +87,7 @@ public Mono exportTemplateAsync(ResourceGroupExportTe @Override public ResourceGroupImpl withRegion(String regionName) { - this.inner().setLocation(regionName); + this.inner().withLocation(regionName); return this; } @@ -98,30 +98,30 @@ public ResourceGroupImpl withRegion(Region region) { @Override public ResourceGroupImpl withTags(Map tags) { - this.inner().setTags(new HashMap<>(tags)); + this.inner().withTags(new HashMap<>(tags)); return this; } @Override public ResourceGroupImpl withTag(String key, String value) { - if (this.inner().getTags() == null) { - this.inner().setTags(new HashMap()); + if (this.inner().tags() == null) { + this.inner().withTags(new HashMap()); } - this.inner().getTags().put(key, value); + this.inner().tags().put(key, value); return this; } @Override public ResourceGroupImpl withoutTag(String key) { - this.inner().getTags().remove(key); + this.inner().tags().remove(key); return this; } @Override public Mono createResourceAsync() { ResourceGroupInner params = new ResourceGroupInner(); - params.setLocation(this.inner().getLocation()); - params.setTags(this.inner().getTags()); + params.withLocation(this.inner().location()); + params.withTags(this.inner().tags()); return client.createOrUpdateAsync(this.name(), params) .map(innerToFluentMap(this)); } @@ -133,7 +133,7 @@ public Mono updateResourceAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java index e75795b2b55a..72f772e9c63c 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/implementation/ResourceGroupsImpl.java @@ -90,7 +90,7 @@ protected ResourceGroupImpl wrapModel(ResourceGroupInner inner) { if (inner == null) { return null; } - return new ResourceGroupImpl(inner, inner.getName(), serviceClient); + return new ResourceGroupImpl(inner, inner.name(), serviceClient); } @Override diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java index c535c2ad935b..e24bd33b50fd 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/DeploymentOperationInner.java @@ -34,7 +34,7 @@ public final class DeploymentOperationInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java index 213373fee01f..72d18c684ec4 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/FeatureResultInner.java @@ -80,7 +80,7 @@ public FeatureResultInner withProperties(FeatureProperties properties) { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java index 6c82458f051e..f980dd73cf68 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/LocationInner.java @@ -53,7 +53,7 @@ public final class LocationInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java index fcc06c0b84a6..3bc3567821c2 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/PolicyDefinitionInner.java @@ -75,7 +75,7 @@ public class PolicyDefinitionInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java index 176173233309..9558ce968533 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/ProviderInner.java @@ -47,7 +47,7 @@ public final class ProviderInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java index 71b7d6d68623..c8745b2582ca 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/SubscriptionInner.java @@ -58,7 +58,7 @@ public final class SubscriptionInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java index 2529089f5785..1f6984aeada6 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagDetailsInner.java @@ -42,7 +42,7 @@ public final class TagDetailsInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java index 955fb2a42aac..d99535444fd9 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TagValueInner.java @@ -34,7 +34,7 @@ public final class TagValueInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java index 15cbea442ec8..19257c7fc9a4 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/models/TenantIdDescriptionInner.java @@ -29,7 +29,7 @@ public final class TenantIdDescriptionInner { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java b/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java index 5b8716fe33f4..a1f3b8b896e5 100644 --- a/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java +++ b/sdk/resources/mgmt/src/test/java/com/azure/management/resources/core/ResourceGroupTaggingPolicy.java @@ -48,7 +48,7 @@ public Mono process(HttpPipelineCallContext context, HttpPipelineN return Mono.error(new RuntimeException("Failed to deserialize " + bodyStr)); } - Map tags = resourceGroupInner.getTags(); + Map tags = resourceGroupInner.tags(); if (tags == null) { tags = new HashMap<>(); } @@ -58,7 +58,7 @@ public Mono process(HttpPipelineCallContext context, HttpPipelineN if (System.getenv("ENV_JOB_NAME") != null) { tags.put("job", System.getenv("ENV_JOB_NAME")); } - resourceGroupInner.setTags(tags); + resourceGroupInner.withTags(tags); String newBody; try { newBody = adapter.serialize(resourceGroupInner, SerializerEncoding.JSON); diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java index a5698ddbfbc2..5645b42bdc0f 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PartnerInfo.java @@ -33,7 +33,7 @@ public final class PartnerInfo { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java index 391354bf5341..05bc50247c83 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/PrivateEndpointProperty.java @@ -21,7 +21,7 @@ public final class PrivateEndpointProperty { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java index c36631e7f065..ec035ba8901d 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ResourceMoveDefinition.java @@ -21,7 +21,7 @@ public final class ResourceMoveDefinition { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java index 295b987cd986..d5ea0981df88 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServerPrivateEndpointConnection.java @@ -27,7 +27,7 @@ public final class ServerPrivateEndpointConnection { * * @return the id value. */ - public String getId() { + public String id() { return this.id; } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java index 451783a4ce05..eee628ce357c 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/ServiceObjectiveCapability.java @@ -95,7 +95,7 @@ public final class ServiceObjectiveCapability { * * @return the id value. */ - public UUID getId() { + public UUID id() { return this.id; } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java index 8723ff22c6d8..9dd92556b67b 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolActivityImpl.java @@ -16,7 +16,7 @@ class ElasticPoolActivityImpl extends WrapperImpl impl protected ElasticPoolActivityImpl(ElasticPoolActivityInner innerObject) { super(innerObject); - this.resourceId = ResourceId.fromString(this.inner().getId()); + this.resourceId = ResourceId.fromString(this.inner().id()); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java index 6b89e7a5845f..fdb38c7487e0 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ElasticPoolDatabaseActivityImpl.java @@ -17,17 +17,17 @@ class ElasticPoolDatabaseActivityImpl extends WrapperImpl listDatabases() { .databases() .listByElasticPool(this.sqlServer.resourceGroupName(), this.sqlServer.name(), this.name()); for (DatabaseInner inner : databaseInners) { - databasesList.add(new SqlDatabaseImpl(inner.getName(), this.sqlServer, inner, this.manager())); + databasesList.add(new SqlDatabaseImpl(inner.name(), this.sqlServer, inner, this.manager())); } return Collections.unmodifiableList(databasesList); } @@ -127,7 +127,7 @@ public PagedFlux listDatabasesAsync() { .listByElasticPoolAsync(this.sqlServer.resourceGroupName(), this.sqlServer.name(), this.name()) .mapPage( databaseInner -> - new SqlDatabaseImpl(databaseInner.getName(), self.sqlServer, databaseInner, self.manager())); + new SqlDatabaseImpl(databaseInner.name(), self.sqlServer, databaseInner, self.manager())); } @Override @@ -140,7 +140,7 @@ public SqlDatabase getDatabase(String databaseName) { .databases() .get(this.sqlServer.resourceGroupName(), this.sqlServer.name(), databaseName); - return new SqlDatabaseImpl(databaseInner.getName(), this.sqlServer, databaseInner, this.manager()); + return new SqlDatabaseImpl(databaseInner.name(), this.sqlServer, databaseInner, this.manager()); } @Override @@ -154,7 +154,7 @@ public Mono getDatabaseAsync(String databaseName) { .getAsync(this.sqlServer.resourceGroupName(), this.sqlServer.name(), databaseName) .map( databaseInner -> - new SqlDatabaseImpl(databaseInner.getName(), self.sqlServer, databaseInner, self.manager())); + new SqlDatabaseImpl(databaseInner.name(), self.sqlServer, databaseInner, self.manager())); } @Override @@ -175,12 +175,12 @@ public List listMetrics() { @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java index b98eb7001c15..3e93e5827fb1 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ReplicationLinkImpl.java @@ -30,7 +30,7 @@ protected ReplicationLinkImpl( this.resourceGroupName = resourceGroupName; this.sqlServerName = sqlServerName; this.sqlServerManager = sqlServerManager; - this.resourceId = ResourceId.fromString(this.inner().getId()); + this.resourceId = ResourceId.fromString(this.inner().id()); } @Override @@ -154,12 +154,12 @@ public Mono forceFailoverAllowDataLossAsync() { @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java index cc45a134bc05..fcb79d3b3344 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/RestorePointImpl.java @@ -20,17 +20,17 @@ protected RestorePointImpl(String resourceGroupName, String sqlServerName, Resto super(innerObject); this.resourceGroupName = resourceGroupName; this.sqlServerName = sqlServerName; - this.resourceId = ResourceId.fromString(this.inner().getId()); + this.resourceId = ResourceId.fromString(this.inner().id()); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java index 3ee2729fe00c..5b958ae2f0a2 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceObjectiveImpl.java @@ -20,12 +20,12 @@ protected ServiceObjectiveImpl(ServiceObjectiveInner innerObject, SqlServerImpl @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java index 98a52cf4a5e6..54564a920426 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/ServiceTierAdvisorImpl.java @@ -33,17 +33,17 @@ protected ServiceTierAdvisorImpl( this.resourceGroupName = resourceGroupName; this.sqlServerName = sqlServerName; this.sqlServerManager = sqlServerManager; - this.resourceId = ResourceId.fromString(this.inner().getId()); + this.resourceId = ResourceId.fromString(this.inner().id()); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override 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 4cc994d86369..4af229793edb 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 @@ -33,7 +33,7 @@ public class SqlDatabaseForElasticPoolImpl Objects.requireNonNull(sqlDatabase.inner()); this.sqlElasticPool = sqlElasticPool; this.sqlDatabase = sqlDatabase; - this.sqlDatabase.inner().setLocation(sqlElasticPool.regionName()); + this.sqlDatabase.inner().withLocation(sqlElasticPool.regionName()); this.sqlDatabase.inner().withElasticPoolId(this.sqlElasticPool.id()); this.sqlDatabase.inner().withSku(null); } 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 1b27320c054d..844c64947a16 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 @@ -166,7 +166,7 @@ class SqlDatabaseImpl extends ExternalChildResourceImpl listReplicationLinks() { for (ReplicationLinkInner inner : replicationLinkInners) { replicationLinkMap .put( - inner.getName(), + inner.name(), new ReplicationLinkImpl( this.resourceGroupName, this.sqlServerName, inner, this.sqlServerManager)); } @@ -372,7 +372,7 @@ public SqlDatabaseThreatDetectionPolicy getThreatDetectionPolicy() { .databaseThreatDetectionPolicies() .get(this.resourceGroupName, this.sqlServerName, this.name()); return policyInner != null - ? new SqlDatabaseThreatDetectionPolicyImpl(policyInner.getName(), this, policyInner, this.sqlServerManager) + ? new SqlDatabaseThreatDetectionPolicyImpl(policyInner.name(), this, policyInner, this.sqlServerManager) : null; } @@ -543,7 +543,7 @@ public Map listServiceTierAdvisors() { for (ServiceTierAdvisorInner serviceTierAdvisorInner : serviceTierAdvisorInners) { serviceTierAdvisorMap .put( - serviceTierAdvisorInner.getName(), + serviceTierAdvisorInner.name(), new ServiceTierAdvisorImpl( this.resourceGroupName, this.sqlServerName, @@ -574,7 +574,7 @@ public String parentId() { @Override public String regionName() { - return this.inner().getLocation(); + return this.inner().location(); } @Override @@ -627,7 +627,7 @@ public void beforeGroupCreateOrUpdate() { @Override public Mono createResourceAsync() { final SqlDatabaseImpl self = this; - this.inner().setLocation(this.sqlServerLocation); + this.inner().withLocation(this.sqlServerLocation); if (this.importRequestInner != null) { this.importRequestInner.withDatabaseName(this.name()); if (this.importRequestInner.edition() == null) { @@ -679,7 +679,7 @@ public Mono updateResourceAsync() { final SqlDatabaseImpl self = this; DatabaseUpdate databaseUpdateInner = new DatabaseUpdate() - .withTags(self.inner().getTags()) + .withTags(self.inner().tags()) .withCollation(self.inner().collation()) .withSourceDatabaseId(self.inner().sourceDatabaseId()) .withCreateMode(self.inner().createMode()) @@ -1061,23 +1061,23 @@ public SqlDatabaseImpl withServiceObjective(ServiceObjectiveName serviceLevelObj @Override public SqlDatabaseImpl withTags(Map tags) { - this.inner().setTags(new HashMap<>(tags)); + this.inner().withTags(new HashMap<>(tags)); return this; } @Override public SqlDatabaseImpl withTag(String key, String value) { - if (this.inner().getTags() == null) { - this.inner().setTags(new HashMap()); + if (this.inner().tags() == null) { + this.inner().withTags(new HashMap()); } - this.inner().getTags().put(key, value); + this.inner().tags().put(key, value); return this; } @Override public SqlDatabaseImpl withoutTag(String key) { - if (this.inner().getTags() != null) { - this.inner().getTags().remove(key); + if (this.inner().tags() != null) { + this.inner().tags().remove(key); } return this; } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java index fb2c20f66d1f..810efa55c586 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseImportExportResponseImpl.java @@ -20,12 +20,12 @@ protected SqlDatabaseImportExportResponseImpl(ImportExportResponseInner innerObj @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java index 1b987e883289..8a665ad973b7 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseOperationsImpl.java @@ -41,7 +41,7 @@ public SqlDatabase getBySqlServer(String resourceGroupName, String sqlServerName DatabaseInner inner = this.manager.inner().databases().get(resourceGroupName, sqlServerName, name); return (inner != null) ? new SqlDatabaseImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager) + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager) : null; } @@ -56,7 +56,7 @@ public Mono getBySqlServerAsync( .map( inner -> new SqlDatabaseImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)); + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)); } @Override @@ -66,7 +66,7 @@ public SqlDatabase getBySqlServer(SqlServer sqlServer, String name) { } DatabaseInner inner = this.manager.inner().databases().get(sqlServer.resourceGroupName(), sqlServer.name(), name); - return (inner != null) ? new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager) : null; + return (inner != null) ? new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager) : null; } @Override @@ -77,7 +77,7 @@ public Mono getBySqlServerAsync(final SqlServer sqlServer, String n .inner() .databases() .getAsync(sqlServer.resourceGroupName(), sqlServer.name(), name) - .map(inner -> new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager)); + .map(inner -> new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager)); } @Override @@ -168,7 +168,7 @@ public List listBySqlServer(String resourceGroupName, String sqlSer databasesSet .add( new SqlDatabaseImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)); + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)); } return Collections.unmodifiableList(databasesSet); } @@ -183,7 +183,7 @@ public PagedFlux listBySqlServerAsync(final String resourceGroupNam .mapPage( inner -> new SqlDatabaseImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)); + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)); } @Override @@ -192,7 +192,7 @@ public List listBySqlServer(SqlServer sqlServer) { if (sqlServer != null) { for (DatabaseInner inner : this.manager.inner().databases().listByServer(sqlServer.resourceGroupName(), sqlServer.name())) { - firewallRuleSet.add(new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager)); + firewallRuleSet.add(new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager)); } } return Collections.unmodifiableList(firewallRuleSet); @@ -206,7 +206,7 @@ public PagedFlux listBySqlServerAsync(final SqlServer sqlServer) { .databases() .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name()) .mapPage( - inner -> new SqlDatabaseImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); + inner -> new SqlDatabaseImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java index bcb4f72fd93b..1fd400a29eb9 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlDatabaseThreatDetectionPolicyImpl.java @@ -42,7 +42,7 @@ protected SqlDatabaseThreatDetectionPolicyImpl( @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override @@ -52,7 +52,7 @@ public String resourceGroupName() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java index d8f3b82ad34b..d14c03a8427f 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolImpl.java @@ -131,7 +131,7 @@ public class SqlElasticPoolImpl @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -313,7 +313,7 @@ public List listDatabases() { this.resourceGroupName, this.sqlServerName, this.sqlServerLocation, - inner.getName(), + inner.name(), inner, this.sqlServerManager)); } @@ -334,7 +334,7 @@ public PagedFlux listDatabasesAsync() { self.resourceGroupName, self.sqlServerName, self.sqlServerLocation, - databaseInner.getName(), + databaseInner.name(), databaseInner, self.sqlServerManager)); } @@ -409,7 +409,7 @@ protected Mono getInnerAsync() { @Override public Mono createResourceAsync() { final SqlElasticPoolImpl self = this; - this.inner().setLocation(this.sqlServerLocation); + this.inner().withLocation(this.sqlServerLocation); return this .sqlServerManager .inner() @@ -673,23 +673,23 @@ public SqlDatabaseForElasticPoolImpl defineDatabase(String databaseName) { @Override public SqlElasticPoolImpl withTags(Map tags) { - this.inner().setTags(new HashMap<>(tags)); + this.inner().withTags(new HashMap<>(tags)); return this; } @Override public SqlElasticPoolImpl withTag(String key, String value) { - if (this.inner().getTags() == null) { - this.inner().setTags(new HashMap()); + if (this.inner().tags() == null) { + this.inner().withTags(new HashMap()); } - this.inner().getTags().put(key, value); + this.inner().tags().put(key, value); return this; } @Override public SqlElasticPoolImpl withoutTag(String key) { - if (this.inner().getTags() != null) { - this.inner().getTags().remove(key); + if (this.inner().tags() != null) { + this.inner().tags().remove(key); } return this; } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java index e070a4ec5fa4..2194505bf24e 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlElasticPoolOperationsImpl.java @@ -40,7 +40,7 @@ public SqlElasticPool getBySqlServer(String resourceGroupName, String sqlServerN ElasticPoolInner inner = this.manager.inner().elasticPools().get(resourceGroupName, sqlServerName, name); return (inner != null) ? new SqlElasticPoolImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager) + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager) : null; } @@ -55,7 +55,7 @@ public Mono getBySqlServerAsync( .map( inner -> new SqlElasticPoolImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)); + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)); } @Override @@ -66,7 +66,7 @@ public SqlElasticPool getBySqlServer(SqlServer sqlServer, String name) { ElasticPoolInner inner = this.manager.inner().elasticPools().get(sqlServer.resourceGroupName(), sqlServer.name(), name); return (inner != null) - ? new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager) + ? new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager) : null; } @@ -78,7 +78,7 @@ public Mono getBySqlServerAsync(final SqlServer sqlServer, Strin .inner() .elasticPools() .getAsync(sqlServer.resourceGroupName(), sqlServer.name(), name) - .map(inner -> new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager)); + .map(inner -> new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager)); } @Override @@ -186,7 +186,7 @@ public List listBySqlServer(String resourceGroupName, String sql elasticPoolSet .add( new SqlElasticPoolImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)); + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)); } return Collections.unmodifiableList(elasticPoolSet); } @@ -201,7 +201,7 @@ public PagedFlux listBySqlServerAsync(final String resourceGroup .mapPage( inner -> new SqlElasticPoolImpl( - resourceGroupName, sqlServerName, inner.getLocation(), inner.getName(), inner, manager)); + resourceGroupName, sqlServerName, inner.location(), inner.name(), inner, manager)); } @Override @@ -210,7 +210,7 @@ public List listBySqlServer(SqlServer sqlServer) { if (sqlServer != null) { for (ElasticPoolInner inner : this.manager.inner().elasticPools().listByServer(sqlServer.resourceGroupName(), sqlServer.name())) { - elasticPoolSet.add(new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager)); + elasticPoolSet.add(new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager)); } } return Collections.unmodifiableList(elasticPoolSet); @@ -224,7 +224,7 @@ public PagedFlux listBySqlServerAsync(final SqlServer sqlServer) .inner() .elasticPools() .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name()) - .mapPage(inner -> new SqlElasticPoolImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, manager)); + .mapPage(inner -> new SqlElasticPoolImpl(inner.name(), (SqlServerImpl) sqlServer, inner, manager)); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java index 46144aa485fe..ae5605f9c861 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlEncryptionProtectorImpl.java @@ -41,8 +41,8 @@ public class SqlEncryptionProtectorImpl this.sqlServerManager = sqlServerManager; this.resourceGroupName = parent.resourceGroupName(); this.sqlServerName = parent.name(); - if (innerObject != null && innerObject.getName() != null) { - this.serverKeyName = innerObject.getName(); + if (innerObject != null && innerObject.name() != null) { + this.serverKeyName = innerObject.name(); } } @@ -64,8 +64,8 @@ public class SqlEncryptionProtectorImpl this.sqlServerManager = sqlServerManager; this.resourceGroupName = resourceGroupName; this.sqlServerName = sqlServerName; - if (innerObject != null && innerObject.getName() != null) { - this.serverKeyName = innerObject.getName(); + if (innerObject != null && innerObject.name() != null) { + this.serverKeyName = innerObject.name(); } } @@ -79,12 +79,12 @@ public class SqlEncryptionProtectorImpl super("", null, innerObject); Objects.requireNonNull(sqlServerManager); this.sqlServerManager = sqlServerManager; - if (innerObject != null && innerObject.getId() != null) { - if (innerObject.getName() != null) { - this.serverKeyName = innerObject.getName(); + if (innerObject != null && innerObject.id() != null) { + if (innerObject.name() != null) { + this.serverKeyName = innerObject.name(); } try { - ResourceId resourceId = ResourceId.fromString(innerObject.getId()); + ResourceId resourceId = ResourceId.fromString(innerObject.id()); this.resourceGroupName = resourceId.resourceGroupName(); this.sqlServerName = resourceId.parent().name(); } catch (NullPointerException e) { @@ -94,7 +94,7 @@ public class SqlEncryptionProtectorImpl @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -109,7 +109,7 @@ public String sqlServerName() { @Override public String parentId() { - return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId()); + return ResourceUtils.parentResourceIdFromResourceId(this.inner().id()); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java index d7d9dc7ea614..98eea2beda34 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupImpl.java @@ -91,9 +91,9 @@ public class SqlFailoverGroupImpl super(name, null, innerObject); Objects.requireNonNull(sqlServerManager); this.sqlServerManager = sqlServerManager; - if (innerObject != null && innerObject.getId() != null) { + if (innerObject != null && innerObject.id() != null) { try { - ResourceId resourceId = ResourceId.fromString(innerObject.getId()); + ResourceId resourceId = ResourceId.fromString(innerObject.id()); this.resourceGroupName = resourceId.resourceGroupName(); this.sqlServerName = resourceId.parent().name(); this.sqlServerLocation = innerObject.location(); @@ -113,7 +113,7 @@ public String resourceGroupName() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -123,7 +123,7 @@ public String sqlServerName() { @Override public String parentId() { - return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId()); + return ResourceUtils.parentResourceIdFromResourceId(this.inner().id()); } @Override @@ -241,7 +241,7 @@ protected Mono getInnerAsync() { @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java index 7ee29216d239..3604b9a49cbe 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFailoverGroupOperationsImpl.java @@ -88,7 +88,7 @@ public List listBySqlServer(String resourceGroupName, String s PagedIterable failoverGroupInners = this.sqlServerManager.inner().failoverGroups().listByServer(resourceGroupName, sqlServerName); for (FailoverGroupInner inner : failoverGroupInners) { - failoverGroups.add(new SqlFailoverGroupImpl(inner.getName(), inner, this.sqlServerManager)); + failoverGroups.add(new SqlFailoverGroupImpl(inner.name(), inner, this.sqlServerManager)); } return Collections.unmodifiableList(failoverGroups); } @@ -104,7 +104,7 @@ public PagedFlux listBySqlServerAsync( .listByServerAsync(resourceGroupName, sqlServerName) .mapPage( failoverGroupInner -> - new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, self.sqlServerManager)); + new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, self.sqlServerManager)); } @Override @@ -116,7 +116,7 @@ public List listBySqlServer(final SqlServer sqlServer) { failoverGroups .add( new SqlFailoverGroupImpl( - inner.getName(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager)); + inner.name(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager)); } return Collections.unmodifiableList(failoverGroups); } @@ -131,7 +131,7 @@ public PagedFlux listBySqlServerAsync(final SqlServer sqlServe .mapPage( failoverGroupInner -> new SqlFailoverGroupImpl( - failoverGroupInner.getName(), + failoverGroupInner.name(), (SqlServerImpl) sqlServer, failoverGroupInner, sqlServer.manager())); @@ -155,7 +155,7 @@ public SqlFailoverGroup failover(String failoverGroupName) { .failover(sqlServer.resourceGroupName(), sqlServer.name(), failoverGroupName); return failoverGroupInner != null ? new SqlFailoverGroupImpl( - failoverGroupInner.getName(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager()) + failoverGroupInner.name(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager()) : null; } @@ -170,7 +170,7 @@ public Mono failoverAsync(String failoverGroupName) { .map( failoverGroupInner -> new SqlFailoverGroupImpl( - failoverGroupInner.getName(), + failoverGroupInner.name(), (SqlServerImpl) sqlServer, failoverGroupInner, sqlServer.manager())); @@ -187,7 +187,7 @@ public SqlFailoverGroup forceFailoverAllowDataLoss(String failoverGroupName) { .forceFailoverAllowDataLoss(sqlServer.resourceGroupName(), sqlServer.name(), failoverGroupName); return failoverGroupInner != null ? new SqlFailoverGroupImpl( - failoverGroupInner.getName(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager()) + failoverGroupInner.name(), (SqlServerImpl) this.sqlServer, failoverGroupInner, sqlServer.manager()) : null; } @@ -202,7 +202,7 @@ public Mono forceFailoverAllowDataLossAsync(String failoverGro .map( failoverGroupInner -> new SqlFailoverGroupImpl( - failoverGroupInner.getName(), + failoverGroupInner.name(), (SqlServerImpl) sqlServer, failoverGroupInner, sqlServer.manager())); @@ -213,7 +213,7 @@ public SqlFailoverGroup failover(String resourceGroupName, String serverName, St FailoverGroupInner failoverGroupInner = this.sqlServerManager.inner().failoverGroups().failover(resourceGroupName, serverName, failoverGroupName); return failoverGroupInner != null - ? new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, this.sqlServerManager) + ? new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, this.sqlServerManager) : null; } @@ -228,7 +228,7 @@ public Mono failoverAsync( .failoverAsync(resourceGroupName, serverName, failoverGroupName) .map( failoverGroupInner -> - new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, self.sqlServerManager)); + new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, self.sqlServerManager)); } @Override @@ -241,7 +241,7 @@ public SqlFailoverGroup forceFailoverAllowDataLoss( .failoverGroups() .forceFailoverAllowDataLoss(resourceGroupName, serverName, failoverGroupName); return failoverGroupInner != null - ? new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, this.sqlServerManager) + ? new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, this.sqlServerManager) : null; } @@ -256,6 +256,6 @@ public Mono forceFailoverAllowDataLossAsync( .forceFailoverAllowDataLossAsync(resourceGroupName, serverName, failoverGroupName) .map( failoverGroupInner -> - new SqlFailoverGroupImpl(failoverGroupInner.getName(), failoverGroupInner, self.sqlServerManager)); + new SqlFailoverGroupImpl(failoverGroupInner.name(), failoverGroupInner, self.sqlServerManager)); } } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java index 1946bd1b771d..dd5c9841df98 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleImpl.java @@ -97,7 +97,7 @@ public SqlFirewallRuleImpl update() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java index 806b2cb58449..591950136788 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlFirewallRuleOperationsImpl.java @@ -41,7 +41,7 @@ public SqlFirewallRule getBySqlServer(String resourceGroupName, String sqlServer FirewallRuleInner inner = this.sqlServerManager.inner().firewallRules().get(resourceGroupName, sqlServerName, name); return (inner != null) - ? new SqlFirewallRuleImpl(resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager) + ? new SqlFirewallRuleImpl(resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager) : null; } @@ -56,7 +56,7 @@ public Mono getBySqlServerAsync( .map( inner -> new SqlFirewallRuleImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager)); } @Override @@ -65,7 +65,7 @@ public SqlFirewallRule getBySqlServer(SqlServer sqlServer, String name) { FirewallRuleInner inner = this.sqlServerManager.inner().firewallRules().get(sqlServer.resourceGroupName(), sqlServer.name(), name); return (inner != null) - ? new SqlFirewallRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()) + ? new SqlFirewallRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager()) : null; } @@ -170,7 +170,7 @@ public List listBySqlServer(String resourceGroupName, String sq firewallRuleSet .add( new SqlFirewallRuleImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager)); } return Collections.unmodifiableList(firewallRuleSet); } @@ -185,7 +185,7 @@ public PagedFlux listBySqlServerAsync(final String resourceGrou .mapPage( inner -> new SqlFirewallRuleImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager)); } @Override @@ -199,7 +199,7 @@ public List listBySqlServer(SqlServer sqlServer) { .firewallRules() .listByServer(sqlServer.resourceGroupName(), sqlServer.name())) { firewallRuleSet - .add(new SqlFirewallRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); + .add(new SqlFirewallRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); } return Collections.unmodifiableList(firewallRuleSet); } @@ -214,7 +214,7 @@ public PagedFlux listBySqlServerAsync(final SqlServer sqlServer .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name()) .mapPage( inner -> - new SqlFirewallRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); + new SqlFirewallRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java index c84e9bafaa76..4a639fef7373 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlRestorableDroppedDatabaseImpl.java @@ -80,17 +80,17 @@ protected Mono getInnerAsync() { .sqlServerManager .inner() .restorableDroppedDatabases() - .getAsync(this.resourceGroupName, this.sqlServerName, this.inner().getId()); + .getAsync(this.resourceGroupName, this.sqlServerName, this.inner().id()); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java index 9431ebd448eb..4163912540bb 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasImpl.java @@ -73,9 +73,9 @@ public class SqlServerDnsAliasImpl super(name, null, innerObject); Objects.requireNonNull(sqlServerManager); this.sqlServerManager = sqlServerManager; - if (innerObject != null && innerObject.getId() != null) { + if (innerObject != null && innerObject.id() != null) { try { - ResourceId resourceId = ResourceId.fromString(innerObject.getId()); + ResourceId resourceId = ResourceId.fromString(innerObject.id()); this.resourceGroupName = resourceId.resourceGroupName(); this.sqlServerName = resourceId.parent().name(); } catch (NullPointerException e) { @@ -90,7 +90,7 @@ public String resourceGroupName() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -105,7 +105,7 @@ public String azureDnsRecord() { @Override public String parentId() { - return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId()); + return ResourceUtils.parentResourceIdFromResourceId(this.inner().id()); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java index 929b02a22479..53f2583dad41 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerDnsAliasOperationsImpl.java @@ -99,7 +99,7 @@ public List listBySqlServer(String resourceGroupName, String serverDnsAliases .add( new SqlServerDnsAliasImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager)); } return Collections.unmodifiableList(serverDnsAliases); } @@ -118,7 +118,7 @@ public PagedFlux listBySqlServerAsync( new SqlServerDnsAliasImpl( resourceGroupName, sqlServerName, - serverDnsAliasInner.getName(), + serverDnsAliasInner.name(), serverDnsAliasInner, self.sqlServerManager)); } @@ -136,7 +136,7 @@ public List listBySqlServer(SqlServer sqlServer) { serverDnsAliases .add( new SqlServerDnsAliasImpl( - inner.getName(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager)); + inner.name(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager)); } return Collections.unmodifiableList(serverDnsAliases); } @@ -151,7 +151,7 @@ public PagedFlux listBySqlServerAsync(final SqlServer sqlServ .mapPage( serverDnsAliasInner -> new SqlServerDnsAliasImpl( - serverDnsAliasInner.getName(), + serverDnsAliasInner.name(), (SqlServerImpl) sqlServer, serverDnsAliasInner, sqlServer.manager())); diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java index 40b485b20934..82c3d4df6d7d 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java @@ -224,7 +224,7 @@ public Map listRecommendedElasticPools() { PagedIterable recommendedElasticPoolInners = this.manager().inner().recommendedElasticPools().listByServer(this.resourceGroupName(), this.name()); for (RecommendedElasticPoolInner inner : recommendedElasticPoolInners) { - recommendedElasticPoolMap.put(inner.getName(), new RecommendedElasticPoolImpl(inner, this)); + recommendedElasticPoolMap.put(inner.name(), new RecommendedElasticPoolImpl(inner, this)); } return Collections.unmodifiableMap(recommendedElasticPoolMap); diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java index 6c740780d32b..262ff550cc74 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerKeyImpl.java @@ -40,8 +40,8 @@ public class SqlServerKeyImpl extends ExternalChildResourceImpl listBySqlServer(String resourceGroupName, String sqlSe serverKeys .add( new SqlServerKeyImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager)); } return Collections.unmodifiableList(serverKeys); } @@ -112,7 +112,7 @@ public PagedFlux listBySqlServerAsync(final String resourceGroupNa new SqlServerKeyImpl( resourceGroupName, sqlServerName, - serverKeyInner.getName(), + serverKeyInner.name(), serverKeyInner, self.sqlServerManager)); } @@ -125,7 +125,7 @@ public List listBySqlServer(final SqlServer sqlServer) { sqlServer.manager().inner().serverKeys().listByServer(sqlServer.resourceGroupName(), sqlServer.name()); for (ServerKeyInner inner : serverKeyInners) { serverKeys - .add(new SqlServerKeyImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); + .add(new SqlServerKeyImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); } return Collections.unmodifiableList(serverKeys); } @@ -141,7 +141,7 @@ public PagedFlux listBySqlServerAsync(final SqlServer sqlServer) { .mapPage( serverKeyInner -> new SqlServerKeyImpl( - serverKeyInner.getName(), (SqlServerImpl) sqlServer, serverKeyInner, sqlServer.manager())); + serverKeyInner.name(), (SqlServerImpl) sqlServer, serverKeyInner, sqlServer.manager())); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java index 7b4085b4ffa9..8d0a5033caad 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerSecurityAlertPolicyImpl.java @@ -76,9 +76,9 @@ public class SqlServerSecurityAlertPolicyImpl super("Default", null, innerObject); Objects.requireNonNull(sqlServerManager); this.sqlServerManager = sqlServerManager; - if (innerObject != null && innerObject.getId() != null) { + if (innerObject != null && innerObject.id() != null) { try { - ResourceId resourceId = ResourceId.fromString(innerObject.getId()); + ResourceId resourceId = ResourceId.fromString(innerObject.id()); this.resourceGroupName = resourceId.resourceGroupName(); this.sqlServerName = resourceId.parent().name(); } catch (NullPointerException e) { @@ -88,7 +88,7 @@ public class SqlServerSecurityAlertPolicyImpl @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -108,7 +108,7 @@ public String sqlServerName() { @Override public String parentId() { - return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId()); + return ResourceUtils.parentResourceIdFromResourceId(this.inner().id()); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java index 03e6ee20d128..c5b8e9d44737 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServersImpl.java @@ -64,7 +64,7 @@ protected SqlServerImpl wrapModel(ServerInner inner) { return null; } - return new SqlServerImpl(inner.getName(), inner, this.manager()); + return new SqlServerImpl(inner.name(), inner, this.manager()); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java index d46abd3dc641..9473d81bf927 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSubscriptionUsageMetricImpl.java @@ -31,12 +31,12 @@ protected Mono getInnerAsync() { @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -61,6 +61,6 @@ public String unit() { @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java index 53ad93d96d83..5057e46342d7 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupImpl.java @@ -90,9 +90,9 @@ public class SqlSyncGroupImpl super(name, null, innerObject); Objects.requireNonNull(sqlServerManager); this.sqlServerManager = sqlServerManager; - if (innerObject != null && innerObject.getId() != null) { + if (innerObject != null && innerObject.id() != null) { try { - ResourceId resourceId = ResourceId.fromString(innerObject.getId()); + ResourceId resourceId = ResourceId.fromString(innerObject.id()); this.resourceGroupName = resourceId.resourceGroupName(); this.sqlServerName = resourceId.parent().parent().name(); this.sqlDatabaseName = resourceId.parent().name(); @@ -108,7 +108,7 @@ public String resourceGroupName() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -123,7 +123,7 @@ public String sqlDatabaseName() { @Override public String parentId() { - return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId()); + return ResourceUtils.parentResourceIdFromResourceId(this.inner().id()); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java index d3d795270914..a9cefc556b82 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncGroupOperationsImpl.java @@ -68,7 +68,7 @@ public PagedIterable listSyncDatabaseIds(String locationName) { .inner() .syncGroups() .listSyncDatabaseIds(locationName) - .mapPage(SyncDatabaseIdPropertiesInner::getId); + .mapPage(SyncDatabaseIdPropertiesInner::id); } @Override @@ -78,7 +78,7 @@ public PagedFlux listSyncDatabaseIdsAsync(String locationName) { .inner() .syncGroups() .listSyncDatabaseIdsAsync(locationName) - .mapPage(SyncDatabaseIdPropertiesInner::getId); + .mapPage(SyncDatabaseIdPropertiesInner::id); } @Override @@ -229,7 +229,7 @@ public List list() { sqlSyncGroups .add( new SqlSyncGroupImpl( - groupInner.getName(), this.sqlDatabase, groupInner, this.sqlServerManager)); + groupInner.name(), this.sqlDatabase, groupInner, this.sqlServerManager)); } } return Collections.unmodifiableList(sqlSyncGroups); @@ -247,6 +247,6 @@ public PagedFlux listAsync() { .mapPage( syncGroupInner -> new SqlSyncGroupImpl( - syncGroupInner.getName(), self.sqlDatabase, syncGroupInner, self.sqlServerManager)); + syncGroupInner.name(), self.sqlDatabase, syncGroupInner, self.sqlServerManager)); } } diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java index dfb8ca435f11..5dbf55e661fa 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberImpl.java @@ -90,9 +90,9 @@ public class SqlSyncMemberImpl super(name, null, innerObject); Objects.requireNonNull(sqlServerManager); this.sqlServerManager = sqlServerManager; - if (innerObject != null && innerObject.getId() != null) { + if (innerObject != null && innerObject.id() != null) { try { - ResourceId resourceId = ResourceId.fromString(innerObject.getId()); + ResourceId resourceId = ResourceId.fromString(innerObject.id()); this.resourceGroupName = resourceId.resourceGroupName(); this.sqlServerName = resourceId.parent().parent().parent().name(); this.sqlDatabaseName = resourceId.parent().parent().name(); @@ -109,7 +109,7 @@ public String resourceGroupName() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -129,7 +129,7 @@ public String sqlSyncGroupName() { @Override public String parentId() { - return ResourceUtils.parentResourceIdFromResourceId(this.inner().getId()); + return ResourceUtils.parentResourceIdFromResourceId(this.inner().id()); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java index d85dc4996670..2d99054bcda5 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlSyncMemberOperationsImpl.java @@ -230,7 +230,7 @@ public List list() { sqlSyncMembers .add( new SqlSyncMemberImpl( - syncMemberInner.getName(), this.sqlSyncGroup, syncMemberInner, this.sqlServerManager)); + syncMemberInner.name(), this.sqlSyncGroup, syncMemberInner, this.sqlServerManager)); } } return Collections.unmodifiableList(sqlSyncMembers); @@ -251,7 +251,7 @@ public PagedFlux listAsync() { .mapPage( syncMemberInner -> new SqlSyncMemberImpl( - syncMemberInner.getName(), self.sqlSyncGroup, syncMemberInner, self.sqlServerManager)); + syncMemberInner.name(), self.sqlSyncGroup, syncMemberInner, self.sqlServerManager)); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java index 02af4278d62e..be5e806802ab 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleImpl.java @@ -125,7 +125,7 @@ public SqlVirtualNetworkRuleImpl update() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java index f5aa15ed5e59..3b722009619d 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlVirtualNetworkRuleOperationsImpl.java @@ -37,7 +37,7 @@ public SqlVirtualNetworkRule getBySqlServer(String resourceGroupName, String sql VirtualNetworkRuleInner inner = this.sqlServerManager.inner().virtualNetworkRules().get(resourceGroupName, sqlServerName, name); return (inner != null) - ? new SqlVirtualNetworkRuleImpl(resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager) + ? new SqlVirtualNetworkRuleImpl(resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager) : null; } @@ -52,7 +52,7 @@ public Mono getBySqlServerAsync( .map( inner -> new SqlVirtualNetworkRuleImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager)); } @Override @@ -67,7 +67,7 @@ public SqlVirtualNetworkRule getBySqlServer(SqlServer sqlServer, String name) { .virtualNetworkRules() .get(sqlServer.resourceGroupName(), sqlServer.name(), name); return (inner != null) - ? new SqlVirtualNetworkRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServerManager) + ? new SqlVirtualNetworkRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServerManager) : null; } @@ -82,7 +82,7 @@ public Mono getBySqlServerAsync(final SqlServer sqlServer .map( inner -> new SqlVirtualNetworkRuleImpl( - inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); + inner.name(), (SqlServerImpl) sqlServer, inner, sqlServer.manager())); } @Override @@ -103,7 +103,7 @@ public List listBySqlServer(String resourceGroupName, Str virtualNetworkRuleSet .add( new SqlVirtualNetworkRuleImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, this.sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, this.sqlServerManager)); } return Collections.unmodifiableList(virtualNetworkRuleSet); } @@ -119,7 +119,7 @@ public PagedFlux listBySqlServerAsync( .mapPage( inner -> new SqlVirtualNetworkRuleImpl( - resourceGroupName, sqlServerName, inner.getName(), inner, sqlServerManager)); + resourceGroupName, sqlServerName, inner.name(), inner, sqlServerManager)); } @Override @@ -135,7 +135,7 @@ public List listBySqlServer(SqlServer sqlServer) { virtualNetworkRuleSet .add( new SqlVirtualNetworkRuleImpl( - inner.getName(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager)); + inner.name(), (SqlServerImpl) sqlServer, inner, this.sqlServerManager)); } } return Collections.unmodifiableList(virtualNetworkRuleSet); @@ -151,7 +151,7 @@ public PagedFlux listBySqlServerAsync(final SqlServer sql .listByServerAsync(sqlServer.resourceGroupName(), sqlServer.name()) .mapPage( inner -> - new SqlVirtualNetworkRuleImpl(inner.getName(), (SqlServerImpl) sqlServer, inner, sqlServerManager)); + new SqlVirtualNetworkRuleImpl(inner.name(), (SqlServerImpl) sqlServer, inner, sqlServerManager)); } @Override diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java index 3fb3056324a1..8dc4bdbe83e3 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/TransparentDataEncryptionActivityImpl.java @@ -16,7 +16,7 @@ class TransparentDataEncryptionActivityImpl extends WrapperImpl getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -99,7 +99,7 @@ public Boolean hasLegalHold() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -139,7 +139,7 @@ public Map metadata() { @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override @@ -149,7 +149,7 @@ public PublicAccess publicAccess() { @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override 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 77966a5172de..fcb26ef0c15b 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 @@ -30,13 +30,13 @@ class BlobServicePropertiesImpl } BlobServicePropertiesImpl(BlobServicePropertiesInner inner, StorageManager manager) { - super(inner.getName(), inner); + super(inner.name(), inner); this.manager = manager; // Set resource name - this.accountName = inner.getName(); + this.accountName = inner.name(); // set resource ancestor and positional variables - this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.getId(), "resourceGroups"); - this.accountName = IdParsingUtils.getValueFromIdByName(inner.getId(), "storageAccounts"); + this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups"); + this.accountName = IdParsingUtils.getValueFromIdByName(inner.id(), "storageAccounts"); // } @@ -69,7 +69,7 @@ protected Mono getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -89,17 +89,17 @@ public DeleteRetentionPolicy deleteRetentionPolicy() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override 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 3d028dc4e388..94051b59bf0b 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 @@ -31,14 +31,14 @@ class ImmutabilityPolicyImpl } ImmutabilityPolicyImpl(ImmutabilityPolicyInner inner, StorageManager manager) { - super(inner.getName(), inner); + super(inner.name(), inner); this.manager = manager; // Set resource name - this.containerName = inner.getName(); + this.containerName = inner.name(); // set resource ancestor and positional variables - this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.getId(), "resourceGroups"); - this.accountName = IdParsingUtils.getValueFromIdByName(inner.getId(), "storageAccounts"); - this.containerName = IdParsingUtils.getValueFromIdByName(inner.getId(), "containers"); + this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups"); + this.accountName = IdParsingUtils.getValueFromIdByName(inner.id(), "storageAccounts"); + this.containerName = IdParsingUtils.getValueFromIdByName(inner.id(), "containers"); // } @@ -88,7 +88,7 @@ protected Mono getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } @Override @@ -98,7 +98,7 @@ public String etag() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -108,7 +108,7 @@ public int immutabilityPeriodSinceCreationInDays() { @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override @@ -118,7 +118,7 @@ public ImmutabilityPolicyState state() { @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override 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 cdfc0bc3603f..602654078331 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 @@ -40,13 +40,13 @@ class ManagementPolicyImpl extends CreatableUpdatableImpl getInnerAsync() { @Override public boolean isInCreateMode() { - return this.inner().getId() == null; + return this.inner().id() == null; } private void resetCreateUpdateParameters() { @@ -101,7 +101,7 @@ private void resetCreateUpdateParameters() { @Override public String id() { - return this.inner().getId(); + return this.inner().id(); } @Override @@ -111,7 +111,7 @@ public OffsetDateTime lastModifiedTime() { @Override public String name() { - return this.inner().getName(); + return this.inner().name(); } @Override @@ -121,7 +121,7 @@ public ManagementPolicySchema policy() { @Override public String type() { - return this.inner().getType(); + return this.inner().type(); } @Override 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 38b8c58a40be..0fb817d2d0b9 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 @@ -499,7 +499,7 @@ public Update upgradeToGeneralPurposeAccountKindV2() { public Mono createResourceAsync() { this.networkRulesHelper.setDefaultActionIfRequired(); createParameters.withLocation(this.regionName()); - createParameters.withTags(this.inner().getTags()); + createParameters.withTags(this.inner().tags()); final StorageAccountsInner client = this.manager().inner().storageAccounts(); return this .manager() @@ -517,7 +517,7 @@ public Mono createResourceAsync() { @Override public Mono updateResourceAsync() { this.networkRulesHelper.setDefaultActionIfRequired(); - updateParameters.withTags(this.inner().getTags()); + updateParameters.withTags(this.inner().tags()); return this .manager() .inner() 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 2c2fec53a0a2..266ba3883613 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 @@ -51,7 +51,7 @@ protected StorageAccountImpl wrapModel(StorageAccountInner storageAccountInner) if (storageAccountInner == null) { return null; } - return new StorageAccountImpl(storageAccountInner.getName(), storageAccountInner, this.manager()); + return new StorageAccountImpl(storageAccountInner.name(), storageAccountInner, this.manager()); } @Override