Factoring the individual DefinitionWithGroup sub-interfaces out...

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

@@ -2,6 +2,7 @@
 
 import com.microsoft.azure.management.compute.implementation.api.AvailabilitySetInner;
 import com.microsoft.azure.management.compute.implementation.api.InstanceViewStatus;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.DefinitionAfterGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
 import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
@@ -86,21 +87,17 @@ interface DefinitionBlank extends GroupableResource.DefinitionWithRegion<Definit
     /**
      * The stage of the availability set definition allowing to specify the resource group
      */
-    interface DefinitionWithGroup extends GroupableResource.DefinitionWithGroup<DefinitionAfterGroup> {
+    interface DefinitionWithGroup extends GroupableResource.DefinitionWithGroup<DefinitionCreatable> {
     }
 
-    /**
-     * The stage of the availability set definition after the resource group has been specified
-     */
-    interface DefinitionAfterGroup extends DefinitionCreatable {}
-
     /**
      * The stage of an availability set definition which contains all the minimum required inputs for
      * the resource to be created (via {@link DefinitionCreatable#create()}), but also allows 
      * for any other optional settings to be specified.
      */     
     interface DefinitionCreatable extends 
         Creatable<AvailabilitySet>,
+        DefinitionAfterGroup,
         Resource.DefinitionWithTags<DefinitionCreatable> {
         /**
          * Specifies the update domain count for the availability set.

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

@@ -21,6 +21,6 @@ public interface AvailabilitySets extends
 
 
     interface InGroup 
-        extends ResourcesInGroup<AvailabilitySet, AvailabilitySet.DefinitionAfterGroup> {
+        extends ResourcesInGroup<AvailabilitySet, AvailabilitySet.DefinitionCreatable> {
     }
 }

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

@@ -8,6 +8,7 @@
 import com.microsoft.azure.CloudException;
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.management.compute.AvailabilitySet;
+import com.microsoft.azure.management.compute.AvailabilitySet.DefinitionCreatable;
 import com.microsoft.azure.management.compute.AvailabilitySets;
 import com.microsoft.azure.management.resources.ResourceGroup;
 
@@ -36,7 +37,7 @@ public PagedList<AvailabilitySet> list() throws CloudException, IOException {
 
 
     @Override
-    public AvailabilitySet.DefinitionAfterGroup define(String name) {
+    public DefinitionCreatable define(String name) {
         return this.availabilitySets
                 .define(name)
                 .withRegion(this.resourceGroup.location())

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

@@ -9,6 +9,7 @@
 import java.util.Map;
 
 import com.microsoft.azure.management.network.implementation.api.VirtualNetworkInner;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.DefinitionAfterGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
 import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
@@ -71,15 +72,9 @@ interface DefinitionBlank
      * The stage of the virtual network definition allowing to specify the resource group
      */
     interface DefinitionWithGroup 
-        extends GroupableResource.DefinitionWithGroup<DefinitionAfterGroup> {
+        extends GroupableResource.DefinitionWithGroup<DefinitionCreatable> {
     }
 
-    /**
-     * The stage of the virtual network definition after with the resource group already specified
-     */
-    interface DefinitionAfterGroup
-        extends DefinitionCreatable {}
-
     /**
      * The stage of the virtual network definition allowing to add subnets
      */
@@ -147,6 +142,7 @@ interface UpdateWithSubnet {
      * (see {@link DefinitionWithAddressSpace#withAddressSpace(String)).
      */
     interface DefinitionCreatable extends 
+        DefinitionAfterGroup,
         Creatable<Network>,
         Resource.DefinitionWithTags<DefinitionCreatable> { 
 

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

@@ -28,6 +28,6 @@ public interface Networks extends
     /**
      * Entry point to virtual network management within a specific resource group
      */
-    interface InGroup extends ResourcesInGroup<Network, Network.DefinitionAfterGroup> {
+    interface InGroup extends ResourcesInGroup<Network, Network.DefinitionCreatable> {
     }
 }

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

@@ -6,6 +6,7 @@
 package com.microsoft.azure.management.network;
 
 import com.microsoft.azure.management.network.implementation.api.PublicIPAddressInner;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.DefinitionAfterGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
@@ -83,16 +84,9 @@ interface DefinitionBlank
      * The stage of the public IP address definition allowing to specify the resource group
      */
     interface DefinitionWithGroup 
-        extends GroupableResource.DefinitionWithGroup<DefinitionAfterGroup> {
+        extends GroupableResource.DefinitionWithGroup<DefinitionCreatable> {
     }
 
-    /**
-     * The stage of the public IP address definition after the resource group has been specified
-     */
-    interface DefinitionAfterGroup
-        extends DefinitionCreatable {
-    }
-
     /**
      * A public IP address definition allowing to set the IP allocation method (static or dynamic)
      */
@@ -232,6 +226,7 @@ interface UpdateWithReverseFQDN {
      */
     interface DefinitionCreatable extends 
         Creatable<PublicIpAddress>,
+        DefinitionAfterGroup,
         DefinitionWithLeafDomainLabel,
         DefinitionWithIpAddress,
         DefinitionWithReverseFQDN<DefinitionCreatable>,

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

@@ -29,6 +29,6 @@ public interface PublicIpAddresses extends
      * Entry point to public IP address management within a specific resource group
      */
     interface InGroup extends 
-        ResourcesInGroup<PublicIpAddress, PublicIpAddress.DefinitionAfterGroup>{
+        ResourcesInGroup<PublicIpAddress, PublicIpAddress.DefinitionCreatable>{
     }
 }

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

@@ -23,7 +23,7 @@ public PublicIpAddressesInGroupImpl(PublicIpAddresses publicIpAddresses, Resourc
     }
 
     @Override
-    public PublicIpAddress.DefinitionAfterGroup define(String name) {
+    public PublicIpAddress.DefinitionCreatable define(String name) {
         return this.publicIpAddresses
                 .define(name)
                 .withRegion(this.resourceGroup.location())

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/DefinitionAfterGroup.java

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+package com.microsoft.azure.management.resources.fluentcore.arm.collection;
+
+/**
+ * The point in the resource definition flow after the resource group has been specified
+ */
+public interface DefinitionAfterGroup {
+}

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/ResourcesInGroup.java

@@ -10,7 +10,7 @@
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
-public interface ResourcesInGroup<T, DefinitionT> extends
+public interface ResourcesInGroup<T, DefinitionT extends DefinitionAfterGroup> extends
     SupportsListing<T>,
     SupportsCreating<DefinitionT>,
     SupportsDeleting,

azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java

@@ -1,6 +1,7 @@
 package com.microsoft.azure.management.storage;
 
 import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.resources.fluentcore.arm.collection.DefinitionAfterGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
@@ -90,25 +91,24 @@ public interface StorageAccount extends
      **************************************************************/
 
     /**
-     * Container interface for all the definitions
+     * Container interface for all the definitions that need to be implemented
      */
     public interface Definitions extends 
+        DefinitionAfterGroup,
         DefinitionBlank,
         DefinitionWithGroup,
-        DefinitionAfterGroup,
         DefinitionCreatable {
     }
 
     public interface DefinitionBlank extends GroupableResource.DefinitionWithRegion<DefinitionWithGroup> {
     }
 
-    public interface DefinitionWithGroup extends GroupableResource.DefinitionWithGroup<DefinitionAfterGroup> {
+    public interface DefinitionWithGroup extends GroupableResource.DefinitionWithGroup<DefinitionCreatable> {
     }
 
-    public interface DefinitionAfterGroup extends DefinitionCreatable {
-    }
-
-    public interface DefinitionCreatable extends Creatable<StorageAccount> {
+    public interface DefinitionCreatable extends 
+        Creatable<StorageAccount>,
+        DefinitionAfterGroup {
         DefinitionCreatable withAccountType(AccountType accountType);
     }
 }

azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java

@@ -22,6 +22,6 @@ public interface StorageAccounts extends
         SupportsDeletingByGroup {
 
     interface InGroup extends
-            ResourcesInGroup<StorageAccount, StorageAccount.DefinitionAfterGroup> {
+            ResourcesInGroup<StorageAccount, StorageAccount.DefinitionCreatable> {
     }
 }

azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsInGroupImpl.java

@@ -20,7 +20,7 @@ public StorageAccountsInGroupImpl(final StorageAccounts storageAccounts, final R
     }
 
     @Override
-    public StorageAccount.DefinitionAfterGroup define(String name) {
+    public StorageAccount.DefinitionCreatable define(String name) {
         return storageAccounts.define(name)
                 .withRegion(resourceGroup.location())
                 .withExistingGroup(resourceGroup.name());