renaming HttpProbe as LoadBalancerHttpProbe to help distinguish from …

…ApplicationGatewayHttpProbe
Azure · Oct 11, 2016 · 67b3199 · 67b3199
1 parent be5ff54
commit 67b3199
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 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
@@ -45,7 +45,7 @@ public interface LoadBalancer extends
     /**
      * @return HTTP probes of this load balancer, indexed by the name
      */
-    Map<String, HttpProbe> httpProbes();
+    Map<String, LoadBalancerHttpProbe> httpProbes();
 
     /**
      * @return backends for this load balancer to load balance the incoming traffic among, indexed by name
@@ -202,11 +202,11 @@ interface WithProbe {
             /**
              * Begins the definition of a new HTTP probe to add to the load balancer.
              * <p>
-             * The definition must be completed with a call to {@link HttpProbe.DefinitionStages.WithAttach#attach()}
+             * The definition must be completed with a call to {@link LoadBalancerHttpProbe.DefinitionStages.WithAttach#attach()}
              * @param name the name of the probe
              * @return the first stage of the new probe definition
              */
-            HttpProbe.DefinitionStages.Blank<WithProbeOrLoadBalancingRule> defineHttpProbe(String name);
+            LoadBalancerHttpProbe.DefinitionStages.Blank<WithProbeOrLoadBalancingRule> defineHttpProbe(String name);
         }
 
         /**
@@ -464,16 +464,16 @@ interface WithProbe {
             /**
              * Begins the definition of a new HTTP probe to add to the load balancer.
              * <p>
-             * The definition must be completed with a call to {@link HttpProbe.DefinitionStages.WithAttach#attach()}
+             * The definition must be completed with a call to {@link LoadBalancerHttpProbe.DefinitionStages.WithAttach#attach()}
              * @param name the name of the new probe
              * @return the next stage of the definition
              */
-            HttpProbe.UpdateDefinitionStages.Blank<Update> defineHttpProbe(String name);
+            LoadBalancerHttpProbe.UpdateDefinitionStages.Blank<Update> defineHttpProbe(String name);
 
             /**
              * Begins the definition of a new TCP probe to add to the load balancer.
              * <p>
-             * The definition must be completed with a call to {@link HttpProbe.DefinitionStages.WithAttach#attach()}
+             * The definition must be completed with a call to {@link LoadBalancerHttpProbe.DefinitionStages.WithAttach#attach()}
              * @param name the name of the new probe
              * @return the next stage of the definition
              */
@@ -498,7 +498,7 @@ interface WithProbe {
              * @param name the name of the probe to update
              * @return the first stage of the probe update
              */
-            HttpProbe.Update updateHttpProbe(String name);
+            LoadBalancerHttpProbe.Update updateHttpProbe(String name);
         }
 
         /**

diff --git a/...t/azure/management/network/HttpProbe.java → ...gement/network/LoadBalancerHttpProbe.java b/...t/azure/management/network/HttpProbe.java → ...gement/network/LoadBalancerHttpProbe.java
@@ -13,7 +13,7 @@
  * An immutable client-side representation of an HTTP load balancing probe.
  */
 @Fluent()
-public interface HttpProbe extends LoadBalancerProbe {
+public interface LoadBalancerHttpProbe extends LoadBalancerProbe {
 
     /**
      * @return the HTTP request path for the HTTP probe to call to check the health status

diff --git a/...src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java b/...src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java
@@ -8,7 +8,7 @@
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.network.Backend;
 import com.microsoft.azure.management.network.LoadBalancerFrontend;
-import com.microsoft.azure.management.network.HttpProbe;
+import com.microsoft.azure.management.network.LoadBalancerHttpProbe;
 import com.microsoft.azure.management.network.InboundNatPool;
 import com.microsoft.azure.management.network.InboundNatRule;
 import com.microsoft.azure.management.apigeneration.LangDefinition;
@@ -60,7 +60,7 @@ class LoadBalancerImpl
 
     private Map<String, Backend> backends;
     private Map<String, LoadBalancerTcpProbe> tcpProbes;
-    private Map<String, HttpProbe> httpProbes;
+    private Map<String, LoadBalancerHttpProbe> httpProbes;
     private Map<String, LoadBalancingRule> loadBalancingRules;
     private Map<String, LoadBalancerFrontend> frontends;
     private Map<String, InboundNatRule> inboundNatRules;
@@ -642,7 +642,7 @@ public Map<String, InboundNatRule> inboundNatRules() {
     }
 
     @Override
-    public Map<String, HttpProbe> httpProbes() {
+    public Map<String, LoadBalancerHttpProbe> httpProbes() {
         return Collections.unmodifiableMap(this.httpProbes);
     }
 

diff --git a/...etwork/src/main/java/com/microsoft/azure/management/network/implementation/ProbeImpl.java b/...etwork/src/main/java/com/microsoft/azure/management/network/implementation/ProbeImpl.java
@@ -11,7 +11,7 @@
 
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.apigeneration.LangDefinition;
-import com.microsoft.azure.management.network.HttpProbe;
+import com.microsoft.azure.management.network.LoadBalancerHttpProbe;
 import com.microsoft.azure.management.network.LoadBalancer;
 import com.microsoft.azure.management.network.LoadBalancingRule;
 import com.microsoft.azure.management.network.ProbeProtocol;
@@ -30,10 +30,10 @@ class ProbeImpl
         LoadBalancerTcpProbe.Definition<LoadBalancer.DefinitionStages.WithProbeOrLoadBalancingRule>,
         LoadBalancerTcpProbe.UpdateDefinition<LoadBalancer.Update>,
         LoadBalancerTcpProbe.Update,
-        HttpProbe,
-        HttpProbe.Definition<LoadBalancer.DefinitionStages.WithProbeOrLoadBalancingRule>,
-        HttpProbe.UpdateDefinition<LoadBalancer.Update>,
-        HttpProbe.Update {
+        LoadBalancerHttpProbe,
+        LoadBalancerHttpProbe.Definition<LoadBalancer.DefinitionStages.WithProbeOrLoadBalancingRule>,
+        LoadBalancerHttpProbe.UpdateDefinition<LoadBalancer.Update>,
+        LoadBalancerHttpProbe.Update {
 
     ProbeImpl(ProbeInner inner, LoadBalancerImpl parent) {
         super(inner, parent);

diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java
@@ -33,7 +33,7 @@
 import com.microsoft.azure.management.network.LoadBalancerFrontend;
 import com.microsoft.azure.management.network.Backend;
 import com.microsoft.azure.management.network.LoadBalancerProbe;
-import com.microsoft.azure.management.network.HttpProbe;
+import com.microsoft.azure.management.network.LoadBalancerHttpProbe;
 import com.microsoft.azure.management.network.PublicFrontend;
 import com.microsoft.azure.management.network.PrivateFrontend;
 import com.microsoft.azure.management.storage.StorageAccount;
@@ -375,7 +375,7 @@ public static void print(LoadBalancer resource) {
         // Show HTTP probes
         info.append("\n\tHTTP probes: ")
                 .append(resource.httpProbes().size());
-        for (HttpProbe probe : resource.httpProbes().values()) {
+        for (LoadBalancerHttpProbe probe : resource.httpProbes().values()) {
             info.append("\n\t\tProbe name: ").append(probe.name())
                     .append("\n\t\t\tPort: ").append(probe.port())
                     .append("\n\t\t\tInterval in seconds: ").append(probe.intervalInSeconds())

diff --git a/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java b/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java
@@ -18,7 +18,7 @@
 import com.microsoft.azure.management.compute.VirtualMachines;
 import com.microsoft.azure.management.network.Backend;
 import com.microsoft.azure.management.network.LoadBalancerFrontend;
-import com.microsoft.azure.management.network.HttpProbe;
+import com.microsoft.azure.management.network.LoadBalancerHttpProbe;
 import com.microsoft.azure.management.network.InboundNatPool;
 import com.microsoft.azure.management.network.InboundNatRule;
 import com.microsoft.azure.management.network.PublicFrontend;
@@ -684,7 +684,7 @@ static void printLB(LoadBalancer resource) {
         // Show HTTP probes
         info.append("\n\tHTTP probes: ")
             .append(resource.httpProbes().size());
-        for (HttpProbe probe : resource.httpProbes().values()) {
+        for (LoadBalancerHttpProbe probe : resource.httpProbes().values()) {
             info.append("\n\t\tProbe name: ").append(probe.name())
                 .append("\n\t\t\tPort: ").append(probe.port())
                 .append("\n\t\t\tInterval in seconds: ").append(probe.intervalInSeconds())