adding getById support to resource collections that can support it

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java

@@ -2,6 +2,7 @@
 
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
@@ -13,6 +14,7 @@
 public interface AvailabilitySets extends
         SupportsListingByGroup<AvailabilitySet>,
         SupportsGettingByGroup<AvailabilitySet>,
+        SupportsGettingById<AvailabilitySet>,
         SupportsListing<AvailabilitySet>,
         SupportsCreating<AvailabilitySet.DefinitionBlank>,
         SupportsDeleting,

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java

@@ -5,6 +5,7 @@
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
@@ -19,6 +20,7 @@ public interface VirtualMachines extends
         SupportsListing<VirtualMachine>,
         SupportsListingByGroup<VirtualMachine>,
         SupportsGettingByGroup<VirtualMachine>,
+        SupportsGettingById<VirtualMachine>,
         SupportsCreating<VirtualMachine.DefinitionBlank>,
         SupportsDeleting,
         SupportsDeletingByGroup {

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java

@@ -13,8 +13,8 @@
 import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetInner;
 import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetsInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupPagedList;
-import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter;
 import com.microsoft.azure.management.resources.implementation.ResourceManager;
 import com.microsoft.azure.management.resources.implementation.api.PageImpl;
 import com.microsoft.rest.RestException;
@@ -26,21 +26,13 @@
 /**
  * The implementation for {@link AvailabilitySets}.
  */
-class AvailabilitySetsImpl implements AvailabilitySets {
-    private final AvailabilitySetsInner client;
-    private final ResourceManager resourceManager;
-    private final PagedListConverter<AvailabilitySetInner, AvailabilitySet> converter;
+class AvailabilitySetsImpl
+    extends GroupableResourcesImpl<AvailabilitySet, AvailabilitySetImpl, AvailabilitySetInner, AvailabilitySetsInner>
+    implements AvailabilitySets {
     AvailabilitySetsImpl(
             final AvailabilitySetsInner client,
             final ResourceManager resourceManager) {
-        this.client = client;
-        this.resourceManager = resourceManager;
-        this.converter = new PagedListConverter<AvailabilitySetInner, AvailabilitySet>() {
-            @Override
-            public AvailabilitySet typeConvert(AvailabilitySetInner inner) {
-                return createFluentModel(inner);
-            }
-        };
+        super(resourceManager, client);
     }
 
     @Override
@@ -49,7 +41,7 @@ public PagedList<AvailabilitySet> list() throws CloudException, IOException {
             @Override
             public List<AvailabilitySet> listNextGroup(String resourceGroupName) throws RestException, IOException {
                 PageImpl<AvailabilitySetInner> page = new PageImpl<>();
-                page.setItems(client.list(resourceGroupName).getBody());
+                page.setItems(innerCollection.list(resourceGroupName).getBody());
                 page.setNextPageLink(null);
                 return converter.convert(new PagedList<AvailabilitySetInner>(page) {
                     @Override
@@ -64,7 +56,7 @@ public Page<AvailabilitySetInner> nextPage(String nextPageLink) throws RestExcep
     @Override
     public PagedList<AvailabilitySet> listByGroup(String groupName) throws CloudException, IOException {
         PageImpl<AvailabilitySetInner> page = new PageImpl<>();
-        page.setItems(client.list(groupName).getBody());
+        page.setItems(this.innerCollection.list(groupName).getBody());
         page.setNextPageLink(null);
         return this.converter.convert(new PagedList<AvailabilitySetInner>(page) {
             @Override
@@ -76,7 +68,7 @@ public Page<AvailabilitySetInner> nextPage(String nextPageLink) throws RestExcep
 
     @Override
     public AvailabilitySetImpl getByGroup(String groupName, String name) throws CloudException, IOException {
-        ServiceResponse<AvailabilitySetInner> response = this.client.get(groupName, name);
+        ServiceResponse<AvailabilitySetInner> response = this.innerCollection.get(groupName, name);
         return createFluentModel(response.getBody());
     }
 
@@ -92,25 +84,26 @@ public void delete(String id) throws Exception {
 
     @Override
     public void delete(String groupName, String name) throws Exception {
-        this.client.delete(groupName, name);
+        this.innerCollection.delete(groupName, name);
     }
 
     /**************************************************************
      * Fluent model helpers.
      **************************************************************/
 
-    private AvailabilitySetImpl createFluentModel(String name) {
-        AvailabilitySetInner availabilitySetInner = new AvailabilitySetInner();
+    @Override
+    protected AvailabilitySetImpl createFluentModel(String name) {
         return new AvailabilitySetImpl(name,
-                availabilitySetInner,
-                this.client,
+                new AvailabilitySetInner(),
+                this.innerCollection,
                 this.resourceManager);
     }
 
-    private AvailabilitySetImpl createFluentModel(AvailabilitySetInner availabilitySetInner) {
+    @Override
+    protected AvailabilitySetImpl createFluentModel(AvailabilitySetInner availabilitySetInner) {
         return new AvailabilitySetImpl(availabilitySetInner.name(),
                 availabilitySetInner,
-                this.client,
+                this.innerCollection,
                 this.resourceManager);
     }
 }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManager.java

@@ -16,7 +16,7 @@
 /**
  * Entry point to Azure compute resource management.
  */
-public final class ComputeManager extends Manager {
+public final class ComputeManager extends Manager<ComputeManager> {
     // The service managers
     private StorageManager storageManager;
     private NetworkManager networkManager;

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java

@@ -23,6 +23,7 @@
 import com.microsoft.azure.management.network.implementation.NetworkManager;
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl;
 import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter;
 import com.microsoft.azure.management.resources.implementation.ResourceManager;
 import com.microsoft.azure.management.resources.implementation.api.PageImpl;
@@ -38,53 +39,44 @@
  * The implementation for {@link VirtualMachines}.
  */
 class VirtualMachinesImpl
+        extends GroupableResourcesImpl<VirtualMachine, VirtualMachineImpl, VirtualMachineInner, VirtualMachinesInner>
         implements VirtualMachines {
-    private final VirtualMachinesInner client;
     private final VirtualMachineSizesInner virtualMachineSizesClient;
     private final ComputeManager computeManager;
-    private final ResourceManager resourceManager;
     private final StorageManager storageManager;
     private final NetworkManager networkManager;
-    private final PagedListConverter<VirtualMachineInner, VirtualMachine> converter;
 
     VirtualMachinesImpl(VirtualMachinesInner client,
                         VirtualMachineSizesInner virtualMachineSizesClient,
                         ComputeManager computeManager,
                         ResourceManager resourceManager,
                         StorageManager storageManager,
                         NetworkManager networkManager) {
-        this.client = client;
+        super(resourceManager, client);
         this.virtualMachineSizesClient = virtualMachineSizesClient;
         this.computeManager = computeManager;
-        this.resourceManager = resourceManager;
         this.storageManager = storageManager;
         this.networkManager = networkManager;
-        this.converter = new PagedListConverter<VirtualMachineInner, VirtualMachine>() {
-            @Override
-            public VirtualMachine typeConvert(VirtualMachineInner inner) {
-                return createFluentModel(inner);
-            }
-        };
     }
 
     // Actions
     //
 
     @Override
     public PagedList<VirtualMachine> list() throws CloudException, IOException {
-        ServiceResponse<PagedList<VirtualMachineInner>> response = client.listAll();
-        return converter.convert(response.getBody());
+        ServiceResponse<PagedList<VirtualMachineInner>> response = this.innerCollection.listAll();
+        return this.converter.convert(response.getBody());
     }
 
     @Override
     public PagedList<VirtualMachine> listByGroup(String groupName) throws CloudException, IOException {
-        ServiceResponse<List<VirtualMachineInner>> response = client.list(groupName);
-        return converter.convert(toPagedList(response.getBody()));
+        ServiceResponse<List<VirtualMachineInner>> response = this.innerCollection.list(groupName);
+        return this.converter.convert(toPagedList(response.getBody()));
     }
 
     @Override
     public VirtualMachine getByGroup(String groupName, String name) throws CloudException, IOException {
-        ServiceResponse<VirtualMachineInner> response = this.client.get(groupName, name);
+        ServiceResponse<VirtualMachineInner> response = this.innerCollection.get(groupName, name);
         return createFluentModel(response.getBody());
     }
 
@@ -95,7 +87,7 @@ public void delete(String id) throws Exception {
 
     @Override
     public void delete(String groupName, String name) throws Exception {
-        this.client.delete(groupName, name);
+        this.innerCollection.delete(groupName, name);
     }
 
     @Override
@@ -131,32 +123,32 @@ public PagedList<VirtualMachineSize> availableSizesByRegion(Region region) throw
 
     @Override
     public void deallocate(String groupName, String name) throws CloudException, IOException, InterruptedException {
-        this.client.deallocate(groupName, name);
+        this.innerCollection.deallocate(groupName, name);
     }
 
     @Override
     public void generalize(String groupName, String name) throws CloudException, IOException {
-        this.client.generalize(groupName, name);
+        this.innerCollection.generalize(groupName, name);
     }
 
     @Override
     public void powerOff(String groupName, String name) throws CloudException, IOException, InterruptedException {
-        this.client.powerOff(groupName, name);
+        this.innerCollection.powerOff(groupName, name);
     }
 
     @Override
     public void restart(String groupName, String name) throws CloudException, IOException, InterruptedException {
-        this.client.restart(groupName, name);
+        this.innerCollection.restart(groupName, name);
     }
 
     @Override
     public void start(String groupName, String name) throws CloudException, IOException, InterruptedException {
-        this.client.start(groupName, name);
+        this.innerCollection.start(groupName, name);
     }
 
     @Override
     public void redeploy(String groupName, String name) throws CloudException, IOException, InterruptedException {
-        this.client.redeploy(groupName, name);
+        this.innerCollection.redeploy(groupName, name);
     }
 
     @Override
@@ -166,7 +158,7 @@ public String capture(String groupName, String name,
         VirtualMachineCaptureParametersInner parameters = new VirtualMachineCaptureParametersInner();
         parameters.withDestinationContainerName(containerName);
         parameters.withOverwriteVhds(overwriteVhd);
-        ServiceResponse<VirtualMachineCaptureResultInner> captureResult = this.client.capture(groupName, name, parameters);
+        ServiceResponse<VirtualMachineCaptureResultInner> captureResult = this.innerCollection.capture(groupName, name, parameters);
         ObjectMapper mapper = new ObjectMapper();
         //Object to JSON string
         return mapper.writeValueAsString(captureResult.getBody().output());
@@ -175,7 +167,8 @@ public String capture(String groupName, String name,
     // Helper methods
     //
 
-    private VirtualMachineImpl createFluentModel(String name) {
+    @Override
+    protected VirtualMachineImpl createFluentModel(String name) {
         VirtualMachineInner inner = new VirtualMachineInner();
         inner.withStorageProfile(new StorageProfile()
             .withOsDisk(new OSDisk())
@@ -186,17 +179,18 @@ private VirtualMachineImpl createFluentModel(String name) {
                 .withNetworkInterfaces(new ArrayList<NetworkInterfaceReference>()));
         return new VirtualMachineImpl(name,
             inner,
-            this.client,
+            this.innerCollection,
             this.computeManager,
             this.resourceManager,
             this.storageManager,
             this.networkManager);
     }
 
-    private VirtualMachineImpl createFluentModel(VirtualMachineInner virtualMachineInner) {
+    @Override
+    protected VirtualMachineImpl createFluentModel(VirtualMachineInner virtualMachineInner) {
         return new VirtualMachineImpl(virtualMachineInner.name(),
                 virtualMachineInner,
-                this.client,
+                this.innerCollection,
                 this.computeManager,
                 this.resourceManager,
                 this.storageManager,

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java

@@ -2,6 +2,7 @@
 
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
@@ -15,6 +16,7 @@ public interface NetworkInterfaces  extends
         SupportsListing<NetworkInterface>,
         SupportsListingByGroup<NetworkInterface>,
         SupportsGettingByGroup<NetworkInterface>,
+        SupportsGettingById<NetworkInterface>,
         SupportsDeleting,
         SupportsDeletingByGroup {
 }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java

@@ -7,6 +7,7 @@
 
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
@@ -21,6 +22,7 @@ public interface NetworkSecurityGroups extends
     SupportsListing<NetworkSecurityGroup>,
     SupportsListingByGroup<NetworkSecurityGroup>,
     SupportsGettingByGroup<NetworkSecurityGroup>,
+    SupportsGettingById<NetworkSecurityGroup>,
     SupportsDeleting,
     SupportsDeletingByGroup {
 }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java

@@ -7,6 +7,7 @@
 
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
@@ -21,6 +22,7 @@ public interface Networks extends
     SupportsListing<Network>,
     SupportsListingByGroup<Network>,
     SupportsGettingByGroup<Network>,
+    SupportsGettingById<Network>,
     SupportsDeleting,
     SupportsDeletingByGroup {
 }

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java

@@ -7,6 +7,7 @@
 
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
@@ -22,5 +23,6 @@ public interface PublicIpAddresses extends
     SupportsDeleting,
     SupportsListingByGroup<PublicIpAddress>,
     SupportsGettingByGroup<PublicIpAddress>,
+    SupportsGettingById<PublicIpAddress>,
     SupportsDeletingByGroup {
 }