From eda46d69593569787b4221f922d6d63fc4fad66c Mon Sep 17 00:00:00 2001 From: Anudeep Sharma Date: Fri, 28 Oct 2016 15:06:19 -0700 Subject: [PATCH] Added update to SQL Firewalls and removed sql firewall operation access from the SQL manager directly --- .../resources/fluentcore/arm/Region.java | 30 ++++-- .../azure/management/sql/SqlFirewallRule.java | 99 +++++++++---------- .../management/sql/SqlFirewallRules.java | 9 +- .../azure/management/sql/SqlServer.java | 2 +- .../sql/implementation/FirewallRulesImpl.java | 1 - .../implementation/SqlFirewallRuleImpl.java | 39 +++----- .../implementation/SqlFirewallRulesImpl.java | 19 +--- .../sql/implementation/SqlServerManager.java | 15 --- .../sql/SqlServerOperationsTests.java | 86 +++++++--------- .../TrafficManagerExternalEndpointImpl.java | 6 +- ...afficManagerNestedProfileEndpointImpl.java | 6 +- 11 files changed, 129 insertions(+), 183 deletions(-) diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/Region.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/Region.java index 3933b2f0440f..8f7cc0087b5f 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/Region.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/Region.java @@ -129,14 +129,27 @@ public String label() { } /** - * Parses a label into a Region object. + * Parses a label or name into a Region object. * - * @param label the region label + * @param labelOrName the region name or label * @return the parsed region or null if there's no such region */ - public static Region fromLabel(String label) { + public static Region fromLabelOrName(String labelOrName) { + Region location = Region.fromLabel(labelOrName); + if (location == null) { + return Region.fromName(labelOrName); + } + return location; + } + /** + * Parses a name into a Region object. + * + * @param name the region name + * @return the parsed region or null if there's no such region + */ + public static Region fromName(String name) { for (Region region : Region.VALUES) { - if (region.label.equalsIgnoreCase(label)) { + if (region.name.equalsIgnoreCase(name)) { return region; } } @@ -144,20 +157,21 @@ public static Region fromLabel(String label) { } /** - * Parses a name into a Region object. + * Parses a label into a Region object. * - * @param name the region name + * @param label the region label * @return the parsed region or null if there's no such region */ - public static Region fromName(String name) { + private static Region fromLabel(String label) { for (Region region : Region.VALUES) { - if (region.name.equalsIgnoreCase(name)) { + if (region.label.equalsIgnoreCase(label)) { return region; } } return null; } + @Override public int hashCode() { return name.hashCode(); diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRule.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRule.java index 6103323e45a9..897ad8242e12 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRule.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRule.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.sql; import com.microsoft.azure.management.apigeneration.Fluent; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.models.IndependentChild; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; @@ -39,15 +40,23 @@ public interface SqlFirewallRule extends */ String endIpAddress(); + /** + * @return kind of SQL Server that contains this firewall rule. + */ + String kind(); + + /** + * @return region of SQL Server that contains this firewall rule. + */ + Region region(); + /** * Container interface for all the definitions that need to be implemented. - * @param The final stage for which return creatable for FirewallRule */ - interface Definition extends - SqlFirewallRule.DefinitionStages.Blank, - SqlFirewallRule.DefinitionStages.WithStartIpAddress, - SqlFirewallRule.DefinitionStages.WithEndIpAddress, - SqlFirewallRule.DefinitionStages.Parentable, + interface Definition extends + SqlFirewallRule.DefinitionStages.Blank, + SqlFirewallRule.DefinitionStages.WithStartIpAddress, + SqlFirewallRule.DefinitionStages.WithEndIpAddress, SqlFirewallRule.DefinitionStages.WithCreate { } @@ -57,75 +66,34 @@ interface Definition extends interface DefinitionStages { /** * The first stage of the SQL Server definition. - * @param The final stage for which return creatable for FirewallRule */ - interface Blank extends SqlFirewallRule.DefinitionStages.WithStartIpAddress { + interface Blank extends SqlFirewallRule.DefinitionStages.WithStartIpAddress { } /** * The SQL Firewall Rule definition to set the starting IP Address for the server. - * @param The final stage for which return creatable for FirewallRule */ - interface WithStartIpAddress { + interface WithStartIpAddress { /** * Sets the starting IP address of SQL server's firewall rule. * * @param startIpAddress start IP address in IPv4 format. * @return The next stage of definition. */ - SqlFirewallRule.DefinitionStages.WithEndIpAddress withStartIpAddress(String startIpAddress); + SqlFirewallRule.DefinitionStages.WithEndIpAddress withStartIpAddress(String startIpAddress); } /** * The SQL Firewall Rule definition to set the starting IP Address for the server. - * @param The final stage for which return creatable for FirewallRule */ - interface WithEndIpAddress { + interface WithEndIpAddress { /** * Sets the ending IP address of SQL server's firewall rule. * * @param endIpAddress end IP address in IPv4 format. * @return The next stage of definition. */ - CreateStageT withEndIpAddress(String endIpAddress); - } - - /** - * A resource definition allowing SQLServer to be attached with SQLFirewallRule. - */ - interface WithSqlServer { - /** - * Creates a new SqlFirewallRule resource under SQLServer. - * - * @param groupName the name of the resource group for SQLServer. - * @param sqlServerName the name of the sQLServer. - * @return the creatable for the child resource - */ - Creatable withExistingSqlServer(String groupName, String sqlServerName); - - /** - * Creates a new SqlFirewallRule resource under SQLServer. - * - * @param sqlServerCreatable a creatable definition for the SQLServer - * @return the creatable for the SQLFirewallRule - */ - Creatable withNewSqlServer(Creatable sqlServerCreatable); - - /** - * Creates a new SqlFirewallRule resource under SQLServer. - * - * @param existingSqlServer the SQLServer under which this SqlFirewallRule to be created. - * @return the creatable for the SQLFirewallRule - */ - Creatable withExistingSqlServer(SqlServer existingSqlServer); - } - /** - * A SQL Server definition with sufficient inputs to create a new - * SQL Server in the cloud, but exposing additional optional inputs to - * specify. - */ - interface Parentable extends - SqlFirewallRule.DefinitionStages.WithSqlServer { + WithCreate withEndIpAddress(String endIpAddress); } /** @@ -141,6 +109,8 @@ interface WithCreate extends Creatable { * The template for a SqlFirewallRule update operation, containing all the settings that can be modified. */ interface Update extends + UpdateStages.WithEndIpAddress, + UpdateStages.WithStartIpAddress, Appliable { } @@ -148,5 +118,30 @@ interface Update extends * Grouping of all the SqlFirewallRule update stages. */ interface UpdateStages { + /** + * The SQL Firewall Rule definition to set the starting IP Address for the server. + */ + interface WithStartIpAddress { + /** + * Sets the starting IP address of SQL server's firewall rule. + * + * @param startIpAddress start IP address in IPv4 format. + * @return The next stage of definition. + */ + Update withStartIpAddress(String startIpAddress); + } + + /** + * The SQL Firewall Rule definition to set the starting IP Address for the server. + */ + interface WithEndIpAddress { + /** + * Sets the ending IP address of SQL server's firewall rule. + * + * @param endIpAddress end IP address in IPv4 format. + * @return The next stage of definition. + */ + Update withEndIpAddress(String endIpAddress); + } } } diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java index 32e5d3a330fe..cac8afaae9e4 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java @@ -62,14 +62,7 @@ public interface SqlFirewallRules extends * Entry point to SQL FirewallRule management API, which already have the SQLServer specified. */ interface SqlFirewallRulesCreatable extends SqlFirewallRules { - SqlFirewallRule.DefinitionStages.Blank definedWithSqlServer(String resourceGroupName, String sqlServerName, String firewallRuleName); - } - - /** - * Entry point to SQL FirewallRule management API, which does not have SqlServer specified yet. - */ - interface SqlFirewallRulesParentable extends SqlFirewallRules { - SqlFirewallRule.DefinitionStages.Blank define(String firewallRuleName); + SqlFirewallRule.DefinitionStages.Blank definedWithSqlServer(String resourceGroupName, String sqlServerName, String firewallRuleName); } } diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServer.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServer.java index f1f4e103a380..fbaa1efc2616 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServer.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServer.java @@ -66,7 +66,7 @@ interface FirewallRules { * @param firewallRuleName name of the firewall rule to be created * @return Returns a stage to specify arguments of the firewall rule */ - SqlFirewallRule.DefinitionStages.Blank define(String firewallRuleName); + SqlFirewallRule.DefinitionStages.Blank define(String firewallRuleName); /** * Returns all the firewall rules for the server. diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/FirewallRulesImpl.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/FirewallRulesImpl.java index 03d7ef140d9a..7a413b935e14 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/FirewallRulesImpl.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/FirewallRulesImpl.java @@ -24,7 +24,6 @@ public class FirewallRulesImpl implements SqlServer.FirewallRules { this.resourceGroupName = resourceGroupName; this.sqlServerName = sqlServerName; this.sqlFirewallRules = new SqlFirewallRulesImpl(innerCollection, manager); - } @Override diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRuleImpl.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRuleImpl.java index 32ffe0039a98..6bbdb2d0a4f8 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRuleImpl.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRuleImpl.java @@ -6,10 +6,10 @@ package com.microsoft.azure.management.sql.implementation; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceId; import com.microsoft.azure.management.resources.fluentcore.arm.models.IndependentChild; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.IndependentChildImpl; -import com.microsoft.azure.management.resources.fluentcore.model.Creatable; import com.microsoft.azure.management.sql.SqlFirewallRule; import com.microsoft.azure.management.sql.SqlServer; import rx.Observable; @@ -18,16 +18,15 @@ /** * Implementation for SqlFirewallRule and its parent interfaces. - * @param The final stage for which return creatable for FirewallRule */ -public class SqlFirewallRuleImpl +public class SqlFirewallRuleImpl extends IndependentChildImpl< SqlFirewallRule, SqlServer, ServerFirewallRuleInner, - SqlFirewallRuleImpl> + SqlFirewallRuleImpl> implements SqlFirewallRule, - SqlFirewallRule.Definition, + SqlFirewallRule.Definition, SqlFirewallRule.Update, IndependentChild.DefinitionStages.WithParentResource { private final ServersInner innerCollection; @@ -54,7 +53,15 @@ public String endIpAddress() { return this.inner().endIpAddress(); } + @Override + public String kind() { + return this.inner().kind(); + } + @Override + public Region region() { + return Region.fromLabelOrName(this.inner().location()); + } @Override public SqlFirewallRule refresh() { this.innerCollection.getFirewallRule(this.resourceGroupName(), this.sqlServerName(), this.name()); @@ -83,32 +90,16 @@ public SqlFirewallRule call(ServerFirewallRuleInner databaseInner) { }); } - - @Override - public Creatable withExistingSqlServer(String groupName, String sqlServerName) { - return withExistingParentResource(groupName, sqlServerName); - } - @Override - public Creatable withNewSqlServer(Creatable sqlServerCreatable) { - return withNewParentResource(sqlServerCreatable); - } - - @Override - public Creatable withExistingSqlServer(SqlServer existingSqlServer) { - return withExistingParentResource(existingSqlServer); - } - - @Override - public SqlFirewallRuleImpl withStartIpAddress(String startIpAddress) { + public SqlFirewallRuleImpl withStartIpAddress(String startIpAddress) { this.inner().withStartIpAddress(startIpAddress); return this; } @Override - public CreateStageT withEndIpAddress(String endIpAddress) { + public SqlFirewallRuleImpl withEndIpAddress(String endIpAddress) { this.inner().withEndIpAddress(endIpAddress); - return (CreateStageT) this; + return this; } @Override diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java index 7ee3447bb276..78ec8d3c15fa 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java @@ -14,6 +14,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.sql.SqlFirewallRule; import com.microsoft.azure.management.sql.SqlFirewallRules; +import org.apache.commons.lang3.NotImplementedException; import rx.Observable; /** @@ -29,20 +30,15 @@ public class SqlFirewallRulesImpl extends IndependentChildrenImpl< implements SqlFirewallRules, SupportsGettingByParent, SupportsListingByParent, - SqlFirewallRules.SqlFirewallRulesCreatable, - SqlFirewallRules.SqlFirewallRulesParentable { + SqlFirewallRules.SqlFirewallRulesCreatable { protected SqlFirewallRulesImpl(ServersInner innerCollection, SqlServerManager manager) { super(innerCollection, manager); } + // TODO - ans - Check if we can get rid of this and create another interface where this is not required. @Override protected SqlFirewallRuleImpl wrapModel(String name) { - ServerFirewallRuleInner inner = new ServerFirewallRuleInner(); - - return new SqlFirewallRuleImpl( - name, - inner, - this.innerCollection); + throw new NotImplementedException("Should never hit this code, currently not exposed"); } @Override @@ -63,11 +59,6 @@ protected SqlFirewallRuleImpl wrapModel(ServerFirewallRuleInner inner) { return new SqlFirewallRuleImpl(inner.name(), inner, this.innerCollection); } - @Override - public SqlFirewallRule.DefinitionStages.Blank define(String name) { - return wrapModel(name); - } - @Override public Observable deleteByParentAsync(String groupName, String parentName, String name) { return this.innerCollection.deleteFirewallRuleAsync(groupName, parentName, name); @@ -97,7 +88,7 @@ public PagedList listBySqlServer(GroupableResource sqlServer) { public SqlFirewallRuleImpl definedWithSqlServer(String resourceGroupName, String sqlServerName, String firewallRuleName) { ServerFirewallRuleInner inner = new ServerFirewallRuleInner(); - return new SqlFirewallRuleImpl( + return new SqlFirewallRuleImpl( firewallRuleName, inner, this.innerCollection).withExistingParentResource(resourceGroupName, sqlServerName); diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServerManager.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServerManager.java index ad06d94f4aff..ea0adec14cc2 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServerManager.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServerManager.java @@ -13,7 +13,6 @@ import com.microsoft.azure.management.resources.fluentcore.arm.implementation.Manager; import com.microsoft.azure.management.sql.SqlDatabases; import com.microsoft.azure.management.sql.SqlElasticPools; -import com.microsoft.azure.management.sql.SqlFirewallRules; import com.microsoft.azure.management.sql.SqlServers; /** @@ -23,7 +22,6 @@ public class SqlServerManager extends Manager sqlServerCreatable = sqlServerManager.sqlServers() - .define(SQL_SERVER_NAME) - .withRegion(Region.US_CENTRAL) - .withNewResourceGroup(RG_NAME) - .withAdminUserName("userName") - .withPassword("P@ssword~1") - .withVersion(ServerVersion.ONE_TWO_FULL_STOP_ZERO); + SqlServer sqlServer = createSqlServer(); - SqlFirewallRule sqlFirewallRule = sqlServerManager.sqlFirewallRules() + sqlServer = sqlServerManager.sqlServers().getByGroup(RG_NAME, SQL_SERVER_NAME); + validateSqlServer(sqlServer); + + SqlFirewallRule sqlFirewallRule = sqlServer.firewallRules() .define(SQL_FIREWALLRULE_NAME) .withStartIpAddress(START_IPADDRESS) .withEndIpAddress(END_IPADDRESS) - .withNewSqlServer(sqlServerCreatable) .createAsync().toBlocking().first(); validateSqlFirewallRule(sqlFirewallRule, SQL_FIREWALLRULE_NAME); - validateSqlFirewallRule(sqlServerManager.sqlFirewallRules().getBySqlServer(RG_NAME, SQL_SERVER_NAME, SQL_FIREWALLRULE_NAME), SQL_FIREWALLRULE_NAME); + validateSqlFirewallRule(sqlServer.firewallRules().get(SQL_FIREWALLRULE_NAME), SQL_FIREWALLRULE_NAME); - SqlServer sqlServer = sqlServerManager.sqlServers().getByGroup(RG_NAME, SQL_SERVER_NAME); - validateSqlServer(sqlServer); String secondFirewallRuleName = "secondFireWallRule"; SqlFirewallRule secondFirewallRule = sqlServer.firewallRules() @@ -263,42 +249,29 @@ public void canCRUDSqlFirewallRule() throws Exception { Assert.assertNull(sqlServer.firewallRules().get(secondFirewallRuleName)); // Get - validateSqlFirewallRule(sqlServerManager.sqlFirewallRules().getBySqlServer(sqlServer, SQL_FIREWALLRULE_NAME), SQL_FIREWALLRULE_NAME); - validateSqlFirewallRule(sqlServerManager.sqlFirewallRules().getById(sqlFirewallRule.id()), SQL_FIREWALLRULE_NAME); + sqlFirewallRule = sqlServer.firewallRules().get(SQL_FIREWALLRULE_NAME); + validateSqlFirewallRule(sqlFirewallRule, SQL_FIREWALLRULE_NAME); - // List - validateListSqlFirewallRule(sqlServerManager.sqlFirewallRules().listBySqlServer(sqlServer.resourceGroupName(), sqlServer.name())); - validateListSqlFirewallRule(sqlServerManager.sqlFirewallRules().listBySqlServer(sqlServer)); + // Update + // Making start and end IP address same. + sqlFirewallRule.update().withEndIpAddress(START_IPADDRESS).apply(); + sqlFirewallRule = sqlServer.firewallRules().get(SQL_FIREWALLRULE_NAME); + Assert.assertEquals(sqlFirewallRule.endIpAddress(), START_IPADDRESS); - sqlServerManager.sqlFirewallRules().deleteById(sqlFirewallRule.id()); - validateSqlFirewallRuleNotFound(); + // List + validateListSqlFirewallRule(sqlServer.firewallRules().list()); - // Add firewall rule again with existing server. - sqlFirewallRule = sqlServerManager.sqlFirewallRules() - .define(SQL_FIREWALLRULE_NAME) - .withStartIpAddress(START_IPADDRESS) - .withEndIpAddress(END_IPADDRESS) - .withExistingSqlServer(sqlServer) - .createAsync().toBlocking().first(); - sqlServerManager.sqlFirewallRules().deleteByParent(sqlFirewallRule.resourceGroupName(), sqlFirewallRule.sqlServerName(), sqlFirewallRule.name()); - validateSqlFirewallRuleNotFound(); - - // Add firewall rule again with existing server. - sqlFirewallRule = sqlServerManager.sqlFirewallRules() - .define(SQL_FIREWALLRULE_NAME) - .withStartIpAddress(START_IPADDRESS) - .withEndIpAddress(END_IPADDRESS) - .withExistingSqlServer(sqlServer.resourceGroupName(), sqlServer.name()) - .createAsync().toBlocking().first(); - sqlServerManager.sqlFirewallRules().deleteByParent(sqlFirewallRule.resourceGroupName(), sqlFirewallRule.sqlServerName(), sqlFirewallRule.name()); + // Delete + sqlServer.firewallRules().delete(sqlFirewallRule.name()); validateSqlFirewallRuleNotFound(); + // Delete server sqlServerManager.sqlServers().deleteByGroup(sqlServer.resourceGroupName(), sqlServer.name()); validateSqlServerNotFound(sqlServer); } private static void validateSqlFirewallRuleNotFound() { - Assert.assertNull(sqlServerManager.sqlFirewallRules().getBySqlServer(RG_NAME, SQL_SERVER_NAME, SQL_FIREWALLRULE_NAME)); + Assert.assertNull(sqlServerManager.sqlServers().getByGroup(RG_NAME, SQL_SERVER_NAME).firewallRules().get(SQL_FIREWALLRULE_NAME)); } @@ -315,6 +288,16 @@ private static void validateSqlServerNotFound(SqlServer sqlServer) { Assert.assertNull(sqlServerManager.sqlServers().getById(sqlServer.id())); } + private static SqlServer createSqlServer() { + return sqlServerManager.sqlServers() + .define(SQL_SERVER_NAME) + .withRegion(Region.US_CENTRAL) + .withNewResourceGroup(RG_NAME) + .withAdminUserName("userName") + .withPassword("P@ssword~1") + .withVersion(ServerVersion.ONE_TWO_FULL_STOP_ZERO) + .create(); + } private static void validateListSqlFirewallRule(PagedList sqlFirewallRules) { boolean found = false; for (SqlFirewallRule firewallRule: sqlFirewallRules) { @@ -331,6 +314,9 @@ private static void validateSqlFirewallRule(SqlFirewallRule sqlFirewallRule, Str Assert.assertEquals(SQL_SERVER_NAME, sqlFirewallRule.sqlServerName()); Assert.assertEquals(START_IPADDRESS, sqlFirewallRule.startIpAddress()); Assert.assertEquals(END_IPADDRESS, sqlFirewallRule.endIpAddress()); + Assert.assertEquals(RG_NAME, sqlFirewallRule.resourceGroupName()); + Assert.assertEquals(SQL_SERVER_NAME, sqlFirewallRule.sqlServerName()); + Assert.assertEquals(Region.US_CENTRAL, sqlFirewallRule.region()); } private static void validateListSqlElasticPool(PagedList sqlElasticPools) { diff --git a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerExternalEndpointImpl.java b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerExternalEndpointImpl.java index 0c29228a3767..91aaed739a5a 100644 --- a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerExternalEndpointImpl.java +++ b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerExternalEndpointImpl.java @@ -27,10 +27,6 @@ public String fqdn() { @Override public Region sourceTrafficLocation() { - Region location = Region.fromLabel((inner().endpointLocation())); - if (location == null) { - return Region.fromName((inner().endpointLocation())); - } - return location; + return Region.fromLabelOrName((inner().endpointLocation())); } } diff --git a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerNestedProfileEndpointImpl.java b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerNestedProfileEndpointImpl.java index e959fb8c7f30..902559b9a960 100644 --- a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerNestedProfileEndpointImpl.java +++ b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerNestedProfileEndpointImpl.java @@ -35,10 +35,6 @@ public int minimumChildEndpointCount() { @Override public Region sourceTrafficLocation() { - Region location = Region.fromLabel((inner().endpointLocation())); - if (location == null) { - return Region.fromName((inner().endpointLocation())); - } - return location; + return Region.fromLabelOrName((inner().endpointLocation())); } }