diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java index a2404bf41bc0..678af7e3815c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network; +import java.util.Collection; import java.util.Set; import com.microsoft.azure.management.apigeneration.Beta; @@ -42,7 +43,7 @@ public interface Subnet extends * Note that this call may result in multiple calls to Azure to fetch all the referenced interfaces each time it is invoked. */ @Method - Set listNetworkInterfaceIPConfigurations(); + Collection listNetworkInterfaceIPConfigurations(); /** * @return available private IP addresses within this network diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java index 56f150065963..b87a831b4347 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java @@ -5,12 +5,13 @@ */ package com.microsoft.azure.management.network.implementation; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import java.util.TreeSet; import com.microsoft.azure.SubResource; @@ -140,13 +141,13 @@ public NetworkSecurityGroup getNetworkSecurityGroup() { @Override public Set getNetworkInterfaceIPConfigurations() { - return listNetworkInterfaceIPConfigurations(); + return Collections.unmodifiableSet(new TreeSet(listNetworkInterfaceIPConfigurations())); } @Override - public Set listNetworkInterfaceIPConfigurations() { - Set ipConfigs = new HashSet<>(); - Map nics = new HashMap<>(); + public Collection listNetworkInterfaceIPConfigurations() { + Collection ipConfigs = new ArrayList<>(); + Map nics = new TreeMap<>(); List ipConfigRefs = this.inner().ipConfigurations(); if (ipConfigRefs == null) { return ipConfigs; @@ -180,7 +181,7 @@ public Set listNetworkInterfaceIPConfigurations() { ipConfigs.add(ipConfig); } - return Collections.unmodifiableSet(ipConfigs); + return Collections.unmodifiableCollection(ipConfigs); } @Override diff --git a/azure/src/test/java/com/microsoft/azure/management/TestNetworkInterface.java b/azure/src/test/java/com/microsoft/azure/management/TestNetworkInterface.java index d089984cc37a..ac5bba655355 100644 --- a/azure/src/test/java/com/microsoft/azure/management/TestNetworkInterface.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestNetworkInterface.java @@ -5,8 +5,8 @@ */ package com.microsoft.azure.management; +import java.util.Collection; import java.util.List; -import java.util.Set; import org.junit.Assert; @@ -58,7 +58,7 @@ public NetworkInterface createResource(NetworkInterfaces networkInterfaces) thro Subnet subnet = network.subnets().get(ipConfig.subnetName()); Assert.assertNotNull(subnet); Assert.assertEquals(1, subnet.networkInterfaceIPConfigurationCount()); - Set ipConfigs = subnet.listNetworkInterfaceIPConfigurations(); + Collection ipConfigs = subnet.listNetworkInterfaceIPConfigurations(); Assert.assertNotNull(ipConfigs); Assert.assertEquals(1, ipConfigs.size()); NicIPConfiguration ipConfig2 = null;