Sort azure resources (#3788)

Author: Flanker32

Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/AzureMvpModel.java

@@ -25,7 +25,6 @@
 
 import com.microsoft.azure.management.Azure;
 import com.microsoft.azure.management.appservice.DeploymentSlot;
-import com.microsoft.azure.management.appservice.LogLevel;
 import com.microsoft.azure.management.appservice.PricingTier;
 import com.microsoft.azure.management.appservice.WebApp;
 import com.microsoft.azure.management.appservice.WebAppDiagnosticLogs;
@@ -36,22 +35,23 @@
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
 import com.microsoft.azuretools.sdkmanage.AzureManager;
-
 import com.microsoft.azuretools.utils.AzureModel;
 import com.microsoft.azuretools.utils.AzureModelController;
 import com.microsoft.azuretools.utils.CanceledByUserException;
+import org.apache.commons.lang3.StringUtils;
+import rx.Observable;
+import rx.schedulers.Schedulers;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
-import rx.Observable;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
 
 public class AzureMvpModel {
 
@@ -112,6 +112,7 @@ public List<Subscription> getSelectedSubscriptions() {
         } catch (IOException e) {
             e.printStackTrace();
         }
+        Collections.sort(ret, getComparator(Subscription::displayName));
         return ret;
     }
 
@@ -134,6 +135,8 @@ public List<ResourceEx<ResourceGroup>> getResourceGroups(boolean forceUpdate) th
             resourceGroups.addAll(srgMap.get(sd).stream().map(
                 resourceGroup -> new ResourceEx<>(resourceGroup, sd.getSubscriptionId())).collect(Collectors.toList()));
         }
+        Collections.sort(resourceGroups, getComparator((ResourceEx<ResourceGroup> resourceGroupResourceEx) ->
+                resourceGroupResourceEx.getResource().name()));
         return resourceGroups;
     }
 
@@ -163,6 +166,7 @@ public List<ResourceGroup> getResourceGroupsBySubscriptionId(String sid) {
         } catch (IOException e) {
             e.printStackTrace();
         }
+        Collections.sort(ret, getComparator(ResourceGroup::name));
         return ret;
     }
 
@@ -197,12 +201,15 @@ public List<Deployment> listAllDeployments() {
                 }
                 subscriber.onCompleted();
             }).subscribeOn(Schedulers.io()), subs.size()).subscribeOn(Schedulers.io()).toBlocking().subscribe();
+        Collections.sort(deployments, getComparator(Deployment::name));
         return deployments;
     }
 
     public List<Deployment> listDeploymentsBySid(String sid) throws IOException {
         Azure azure = AuthMethodManager.getInstance().getAzureClient(sid);
-        return azure.deployments().list();
+        List<Deployment> deployments = azure.deployments().list();
+        Collections.sort(deployments, getComparator(Deployment::name));
+        return deployments;
     }
 
     /**
@@ -215,6 +222,8 @@ public List<ResourceEx<Deployment>> getDeploymentByRgName(String sid, String rgN
         Azure azure = AuthMethodManager.getInstance().getAzureClient(sid);
         res.addAll(azure.deployments().listByResourceGroup(rgName).stream().
             map(deployment -> new ResourceEx<>(deployment, sid)).collect(Collectors.toList()));
+        Collections.sort(res,
+                getComparator((ResourceEx<Deployment> deploymentResourceEx) -> deploymentResourceEx.getResource().name()));
         return res;
     }
 
@@ -287,6 +296,7 @@ public List<Location> listLocationsBySubscriptionId(String sid) {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        Collections.sort(locations, getComparator(Location::name));
         return locations;
     }
 
@@ -304,9 +314,15 @@ public List<PricingTier> listPricingTier() throws IllegalAccessException {
                 ret.add(pt);
             }
         }
+        Collections.sort(ret, getComparator(PricingTier::toString));
         return correctPricingTiers(ret);
     }
 
+    private static <T> Comparator<T> getComparator(Function<T, String> toStringMethod) {
+        return (first, second) ->
+                StringUtils.compareIgnoreCase(toStringMethod.apply(first), toStringMethod.apply(second));
+    }
+
     // workaround for SDK not updated the PREMIUM pricing tiers to latest ones
     // https://github.com/Azure/azure-libraries-for-java/issues/660
     private List<PricingTier> correctPricingTiers(final List<PricingTier> pricingTiers) {