converting language annotations to the latest @fluent and removing re…

…dundant ones from nested interfaces
Azure · Sep 21, 2016 · c4ae77e · c4ae77e
1 parent 585139d
commit c4ae77e
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 79 deletions.
diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType;
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
@@ -25,7 +25,7 @@
 /**
  * An immutable client-side representation of an Azure deployment.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Deployment extends
         Refreshable<Deployment>,
         Updatable<Deployment.Update>,
@@ -118,7 +118,6 @@ public interface Deployment extends
     /**
      * Container interface for all the deployment definitions.
      */
-    @LangDefinition(ContainerName = "~/Deployment.Definition")
     interface Definition extends
         DefinitionStages.Blank,
         DefinitionStages.WithGroup,
@@ -131,7 +130,6 @@ interface Definition extends
     /**
      * Grouping of all the deployment definition stages.
      */
-    @LangDefinition(ContainerName = "~/Deployment.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of deployment definition.
@@ -245,7 +243,6 @@ interface WithCreate extends Creatable<Deployment> {
     /**
      * Grouping of all the deployment updates stages.
      */
-    @LangDefinition(ContainerName = "~/Deployment.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
         /**
          * A deployment update allowing to change the deployment mode.
@@ -329,7 +326,6 @@ interface WithParameters {
      * <p>
      * Call {@link Update#apply()} to apply the changes to the deployment in Azure.
      */
-    @LangDefinition(ContainerName = "~/Deployment.Update")
     interface Update extends
             Appliable<Deployment>,
             UpdateStages.WithTemplate,

diff --git a/...ources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java b/...ources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java
@@ -6,14 +6,14 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 import com.microsoft.azure.management.resources.implementation.DeploymentExportResultInner;
 
 /**
  * An immutable client-side representation of an Azure deployment template export result.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface DeploymentExportResult extends
         Wrapper<DeploymentExportResultInner> {
 

diff --git a/...resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java b/...resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.model.Indexable;
 import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -16,7 +16,7 @@
 /**
  * An immutable client-side representation of a deployment operation.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface DeploymentOperation extends
         Indexable,
         Refreshable<DeploymentOperation>,

diff --git a/...esources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperations.java b/...esources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperations.java
@@ -6,14 +6,14 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to deployment operation management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface DeploymentOperations extends
         SupportsListing<DeploymentOperation>,
         SupportsGettingById<DeploymentOperation> {

diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 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;
@@ -19,7 +19,7 @@
 /**
  * Entry point to template deployment in Azure.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Deployments extends
         SupportsCreating<Deployment.DefinitionStages.Blank>,
         SupportsListing<Deployment>,

diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java
@@ -6,15 +6,15 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.model.Indexable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 import com.microsoft.azure.management.resources.implementation.FeatureResultInner;
 
 /**
  * An immutable client-side representation of an Azure feature.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Feature extends
         Indexable,
         Wrapper<FeatureResultInner> {

diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Features.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Features.java
@@ -6,14 +6,15 @@
 
 package com.microsoft.azure.management.resources;
 
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to features management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Features extends
         SupportsListing<Feature> {
     /**

diff --git a/...gmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java b/...gmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 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;
@@ -19,7 +19,7 @@
 /**
  * An immutable client-side representation of an Azure generic resource.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface GenericResource extends
         GroupableResource,
         Refreshable<GenericResource>,
@@ -58,7 +58,6 @@ public interface GenericResource extends
     /**
      * The entirety of the generic resource definition.
      */
-    @LangDefinition(ContainerName = "~/GenericResource.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithGroup,
@@ -73,7 +72,6 @@ interface Definition extends
     /**
      * Grouping of generic resource definition stages.
      */
-    @LangDefinition(ContainerName = "~/GenericResource.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * A generic resource definition allowing region to be specified.
@@ -184,7 +182,6 @@ interface WithCreate extends
     /**
      * Grouping of generic resource update stages.
      */
-    @LangDefinition(ContainerName = "~/GenericResource.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
         /**
          * A generic resource update allowing to change the resource properties.
@@ -252,7 +249,6 @@ interface WithApiVersion {
     /**
      * The template for a generic resource update operation, containing all the settings that can be modified.
      */
-    @LangDefinition(ContainerName = "~/GenericResource.Update")
     interface Update extends
             Appliable<GenericResource>,
             UpdateStages.WithPlan,

diff --git a/...mt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java b/...mt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 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;
@@ -16,7 +16,7 @@
 /**
  * Entry point to generic resources management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface GenericResources extends
         SupportsListingByGroup<GenericResource>,
         SupportsGettingById<GenericResource>,

diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java
@@ -6,15 +6,15 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.model.Indexable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 import com.microsoft.azure.management.resources.implementation.LocationInner;
 
 /**
  * An immutable client-side representation of an Azure location.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Location extends
         Indexable,
         Wrapper<LocationInner> {

diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.model.Indexable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 import com.microsoft.azure.management.resources.implementation.ProviderInner;
@@ -16,7 +16,7 @@
 /**
  * An immutable client-side representation of an Azure resource provider.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Provider extends
         Indexable,
         Wrapper<ProviderInner> {

diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Providers.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Providers.java
@@ -6,15 +6,15 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 import com.microsoft.rest.ServiceResponse;
 
 /**
  * Entry point to providers management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Providers extends
         SupportsListing<Provider>,
         SupportsGettingByName<Provider> {

diff --git a/...t-resources/src/main/java/com/microsoft/azure/management/resources/ResourceConnector.java b/...t-resources/src/main/java/com/microsoft/azure/management/resources/ResourceConnector.java
@@ -7,14 +7,14 @@
 package com.microsoft.azure.management.resources;
 
 import com.microsoft.azure.RestClient;
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 
 /**
  * Defines a connector that connects other resources to a resource group.
  * Implementations of this class can let users browse resources inside a
  * specific resource group.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface ResourceConnector {
     /**
      * Implementations of this interface defines how to create a connector.

diff --git a/...-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java b/...-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 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;
@@ -20,7 +20,7 @@
 /**
  * An immutable client-side representation of an Azure resource group.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface ResourceGroup extends
         Indexable,
         Resource,
@@ -52,7 +52,6 @@ public interface ResourceGroup extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
-    @LangDefinition(ContainerName = "~/ResourceGroup.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithCreate {
@@ -61,7 +60,6 @@ interface Definition extends
     /**
      * Grouping of all the resource group definition stages.
      */
-     @LangDefinition(ContainerName = "~/ResourceGroup.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * A resource group definition allowing location to be set.
@@ -83,7 +81,6 @@ interface WithCreate extends
     /**
      * Grouping of all the resource group update stages.
      */
-    @LangDefinition(ContainerName = "~/ResourceGroup.Update", ContainerFileName = "IUpdate")
     interface UpdateStages {
     }
 
@@ -92,7 +89,6 @@ interface UpdateStages {
      * <p>
      * Call {@link Update#apply()} to apply the changes to the resource group in Azure.
      */
-    @LangDefinition(ContainerName = "~/ResourceGroup.Update", ContainerFileName = "IUpdate")
     interface Update extends
             Appliable<ResourceGroup>,
             Resource.UpdateWithTags<Update> {

diff --git a/...ces/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java b/...ces/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java
@@ -6,14 +6,14 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 import com.microsoft.azure.management.resources.implementation.ResourceGroupExportResultInner;
 
 /**
  * An immutable client-side representation of an Azure deployment template export result.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface ResourceGroupExportResult extends
         Wrapper<ResourceGroupExportResultInner> {
 

diff --git a/...mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java b/...mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java
@@ -6,7 +6,7 @@
 
 package com.microsoft.azure.management.resources;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
@@ -16,7 +16,7 @@
 /**
  * Entry point to resource group management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface ResourceGroups extends
         SupportsListing<ResourceGroup>,
         SupportsGettingByName<ResourceGroup>,

diff --git a/...e-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java b/...e-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java
@@ -7,15 +7,15 @@
 package com.microsoft.azure.management.resources;
 
 import com.microsoft.azure.PagedList;
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.model.Indexable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 import com.microsoft.azure.management.resources.implementation.SubscriptionInner;
 
 /**
  * An immutable client-side representation of an Azure subscription.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface Subscription extends
         Indexable,
         Wrapper<SubscriptionInner> {