Merge pull request #1115 from martinsawicki/martin-plumbing

misc language annotation corrections
Azure · Sep 27, 2016 · 3d84039 · 3d84039
2 parents f5c8df0 + 6f7528c
commit 3d84039
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 125 deletions.
diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java
@@ -23,7 +23,7 @@
 /**
  * Entry point for load balancer management API in Azure.
  */
-@Fluent()
+@Fluent
 public interface LoadBalancer extends
         GroupableResource,
         Refreshable<LoadBalancer>,

diff --git a/...mt-network/src/main/java/com/microsoft/azure/management/network/model/HasBackendPort.java b/...mt-network/src/main/java/com/microsoft/azure/management/network/model/HasBackendPort.java
@@ -5,13 +5,12 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 
 /**
  * An interface representing a model's ability to reference a load balancer backend port.
  */
-@LangDefinition()
+@Fluent
 public interface HasBackendPort  {
     /**
      * @return the backend port number the network traffic is sent to
@@ -21,11 +20,6 @@ public interface HasBackendPort  {
     /**
      * Grouping of definition stages involving specifying a backend port.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify the backend port.
@@ -46,11 +40,6 @@ interface WithBackendPort<ReturnT> {
     /**
      * Grouping of update stages involving modifying a backend port.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to modify the backend port.
@@ -69,11 +58,6 @@ interface WithBackendPort<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update, involving modifying the backend port.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify the backend port.

diff --git a/...gmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFloatingIp.java b/...gmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFloatingIp.java
@@ -5,13 +5,9 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
-
 /**
  * An interface representing a model's ability to have floating IP support.
  */
-@LangDefinition()
 public interface HasFloatingIp {
     /**
      * @return the state of the floating IP enablement
@@ -21,11 +17,6 @@ public interface HasFloatingIp {
     /**
      * Grouping of definition stages involving enabling or disabling floating IP support.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to control floating IP support.
@@ -56,11 +47,6 @@ interface WithFloatingIp<ReturnT> {
     /**
      * Grouping of update stages involving enabling or disabling floating IP support.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of a definition allowing to control floating IP support.
@@ -92,11 +78,6 @@ interface WithFloatingIp<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update, involving enabling or disabling floating IP support.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to control floating IP support.

diff --git a/...-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFrontend.java b/...-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasFrontend.java
@@ -5,14 +5,13 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.Frontend;
 
 /**
  * An interface representing a model's ability to references a load balancer frontend.
  */
-@LangDefinition()
+@Fluent
 public interface HasFrontend  {
     /**
      * @return the associated frontend
@@ -22,11 +21,6 @@ public interface HasFrontend  {
     /**
      * Grouping of definition stages involving specifying the frontend.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify a load balancer frontend.
@@ -45,11 +39,6 @@ interface WithFrontend<ReturnT> {
     /**
      * Grouping of update stages involving specifying the frontend.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to specify a frontend.
@@ -68,11 +57,6 @@ interface WithFrontend<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify a frontend from this load balancer to associate.

diff --git a/...ork/src/main/java/com/microsoft/azure/management/network/model/HasLoadBalancingRules.java b/...ork/src/main/java/com/microsoft/azure/management/network/model/HasLoadBalancingRules.java
@@ -7,13 +7,13 @@
 
 import java.util.Map;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.LoadBalancingRule;
 
 /**
  * An interface representing a model's ability to reference load balancing rules.
  */
-@LangDefinition()
+@Fluent()
 public interface HasLoadBalancingRules  {
     /**
      * @return the associated load balancing rules from this load balancer, indexed by their names

diff --git a/...work/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java b/...work/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java
@@ -5,15 +5,15 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.NetworkInterface;
 
 import java.util.List;
 
 /**
  * Interface exposing a list of network interfaces.
  */
-@LangDefinition()
+@Fluent()
 public interface HasNetworkInterfaces {
     /**
      * Gets the primary network interface.

diff --git a/...twork/src/main/java/com/microsoft/azure/management/network/model/HasPrivateIpAddress.java b/...twork/src/main/java/com/microsoft/azure/management/network/model/HasPrivateIpAddress.java
@@ -5,14 +5,13 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.IPAllocationMethod;
 
 /**
  * An interface representing a model's ability to reference a private IP address.
  */
-@LangDefinition()
+@Fluent()
 public interface HasPrivateIpAddress  {
     /**
      * @return the private IP address associated with this resource
@@ -27,11 +26,6 @@ public interface HasPrivateIpAddress  {
     /**
      * Grouping of definition stages involving specifying the private IP address.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify the private IP address.
@@ -56,11 +50,6 @@ interface WithPrivateIpAddress<ReturnT> {
     /**
      * Grouping of update stages involving modifying the private IP address.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to modify the private IP address.
@@ -85,11 +74,6 @@ interface WithPrivateIpAddress<ReturnT> {
     /**
      * Grouping of definition stages applicable as part of a parent resource update, involving specifying the private IP address.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify the private IP address.

diff --git a/...-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasProtocol.java b/...-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasProtocol.java
@@ -5,14 +5,13 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 
 /**
  * An interface representing a model's ability to reference a transport protocol.
  * @param <ProtocolT> the protocol type of the value
  */
-@LangDefinition()
+@Fluent()
 public interface HasProtocol<ProtocolT>  {
     /**
      * @return the protocol
@@ -22,11 +21,6 @@ public interface HasProtocol<ProtocolT>  {
     /**
      * Grouping of definition stages involving specifying the protocol.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of a definition allowing to specify the protocol.
@@ -46,11 +40,6 @@ interface WithProtocol<ReturnT, ProtocolT> {
     /**
      * Grouping of update stages involving modifying the protocol.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage of an update allowing to modify the transport protocol.
@@ -70,11 +59,6 @@ interface WithProtocol<ReturnT, ProtocolT> {
     /**
      * Grouping of definition stages applicable as part of a load balancer update, involving specifying the protocol.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of a definition allowing to specify the protocol.

diff --git a/...etwork/src/main/java/com/microsoft/azure/management/network/model/HasPublicIpAddress.java b/...etwork/src/main/java/com/microsoft/azure/management/network/model/HasPublicIpAddress.java
@@ -5,15 +5,14 @@
  */
 package com.microsoft.azure.management.network.model;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.network.PublicIpAddress;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 
 /**
  * An interface representing a model's ability to reference a public IP address.
  */
-@LangDefinition()
+@Fluent
 public interface HasPublicIpAddress  {
     /**
      * @return the resource ID of the associated public IP address
@@ -28,11 +27,6 @@ public interface HasPublicIpAddress  {
     /**
      * Grouping of definition stages involving specifying the public IP address.
      */
-    @LangDefinition(
-                ContainerName = "Definition",
-                ContainerFileName = "IDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface DefinitionStages {
         /**
          * The stage of the definition allowing to associate the resource with an existing public IP address.
@@ -106,11 +100,6 @@ interface WithPublicIpAddress<ReturnT> extends
     /**
      * Grouping of update stages involving modifying an existing reference to a public IP address.
      */
-    @LangDefinition(
-                ContainerName = "Update",
-                ContainerFileName = "IUpdate",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateStages {
         /**
          * The stage definition allowing to associate the resource with an existing public IP address.
@@ -191,11 +180,6 @@ interface WithPublicIpAddress<ReturnT> extends
     /**
      * Grouping of definition stages applicable as part of a parent resource update, involving specifying a public IP address.
      */
-    @LangDefinition(
-                ContainerName = "UpdateDefinition",
-                ContainerFileName = "IUpdateDefinition",
-                IsContainerOnly = true,
-                MethodConversionType = MethodConversion.OnlyMethod)
     interface UpdateDefinitionStages {
         /**
          * The stage of the definition allowing to associate the resource with an existing public IP address.