From b7e3f3b610a9a04f84f4e149735997adcee56495 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 10 Oct 2016 18:10:38 -0700 Subject: [PATCH] renaming Probe as LoadBalancerProbe to help distinguish from ApplicationGatewayProbe --- .../com/microsoft/azure/management/network/HttpProbe.java | 2 +- .../network/{Probe.java => LoadBalancerProbe.java} | 2 +- .../azure/management/network/LoadBalancingRule.java | 2 +- .../com/microsoft/azure/management/network/TcpProbe.java | 2 +- .../management/network/implementation/LoadBalancerImpl.java | 6 +++--- .../network/implementation/LoadBalancingRuleImpl.java | 4 ++-- .../java/com/microsoft/azure/management/samples/Utils.java | 4 ++-- .../com/microsoft/azure/management/TestLoadBalancer.java | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) rename azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/{Probe.java => LoadBalancerProbe.java} (96%) diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/HttpProbe.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/HttpProbe.java index 5a1b3a6e7913d..23565061d554b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/HttpProbe.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/HttpProbe.java @@ -13,7 +13,7 @@ * An immutable client-side representation of an HTTP load balancing probe. */ @Fluent() -public interface HttpProbe extends Probe { +public interface HttpProbe extends LoadBalancerProbe { /** * @return the HTTP request path for the HTTP probe to call to check the health status diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancerProbe.java similarity index 96% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancerProbe.java index 1238eae6c02e3..623604729d07c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancerProbe.java @@ -16,7 +16,7 @@ * An immutable client-side representation of a load balancing probe. */ @Fluent() -public interface Probe extends +public interface LoadBalancerProbe extends Wrapper, ChildResource, HasLoadBalancingRules, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java index 219fa015a9f2a..840d9cb6f7d55 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java @@ -51,7 +51,7 @@ public interface LoadBalancingRule extends /** * @return the probe associated with the load balancing rule */ - Probe probe(); + LoadBalancerProbe probe(); /** * Grouping of load balancing rule definition stages. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TcpProbe.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TcpProbe.java index 6da7132358133..37af857d61a26 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TcpProbe.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TcpProbe.java @@ -13,7 +13,7 @@ * An immutable client-side representation of a TCP load balancing probe. */ @Fluent() -public interface TcpProbe extends Probe { +public interface TcpProbe extends LoadBalancerProbe { /** * Grouping of probe definition stages. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java index 261f4de9b3efe..c31bfb0b700b7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java @@ -17,7 +17,7 @@ import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NicIpConfiguration; -import com.microsoft.azure.management.network.Probe; +import com.microsoft.azure.management.network.LoadBalancerProbe; import com.microsoft.azure.management.network.ProbeProtocol; import com.microsoft.azure.management.network.PublicFrontend; import com.microsoft.azure.management.network.PublicIpAddress; @@ -440,7 +440,7 @@ public LoadBalancerImpl withHttpProbe(String path) { @Override public ProbeImpl defineTcpProbe(String name) { - Probe probe = this.tcpProbes.get(name); + LoadBalancerProbe probe = this.tcpProbes.get(name); if (probe == null) { ProbeInner inner = new ProbeInner() .withName(name) @@ -453,7 +453,7 @@ public ProbeImpl defineTcpProbe(String name) { @Override public ProbeImpl defineHttpProbe(String name) { - Probe probe = this.httpProbes.get(name); + LoadBalancerProbe probe = this.httpProbes.get(name); if (probe == null) { ProbeInner inner = new ProbeInner() .withName(name) diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleImpl.java index 7fda71da7e5fe..a080882286a29 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleImpl.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.network.LoadBalancer; import com.microsoft.azure.management.network.LoadBalancingRule; import com.microsoft.azure.management.network.LoadDistribution; -import com.microsoft.azure.management.network.Probe; +import com.microsoft.azure.management.network.LoadBalancerProbe; import com.microsoft.azure.management.network.TransportProtocol; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; @@ -97,7 +97,7 @@ public Backend backend() { } @Override - public Probe probe() { + public LoadBalancerProbe probe() { SubResource probeRef = this.inner().probe(); if (probeRef == null) { return null; 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 index 0348db76e4660..eea5beaf0269e 100644 --- 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 @@ -32,7 +32,7 @@ import com.microsoft.azure.management.network.InboundNatRule; import com.microsoft.azure.management.network.LoadBalancerFrontend; import com.microsoft.azure.management.network.Backend; -import com.microsoft.azure.management.network.Probe; +import com.microsoft.azure.management.network.LoadBalancerProbe; import com.microsoft.azure.management.network.HttpProbe; import com.microsoft.azure.management.network.PublicFrontend; import com.microsoft.azure.management.network.PrivateFrontend; @@ -420,7 +420,7 @@ public static void print(LoadBalancer resource) { info.append("\n\t\t\tBackend port: ").append(rule.backendPort()); - Probe probe = rule.probe(); + LoadBalancerProbe probe = rule.probe(); info.append("\n\t\t\tProbe: "); if (probe == null) { info.append("(None)"); diff --git a/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java b/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java index 5b81ba03a7a18..36089ac1a6f43 100644 --- a/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestLoadBalancer.java @@ -30,7 +30,7 @@ import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.Networks; import com.microsoft.azure.management.network.PrivateFrontend; -import com.microsoft.azure.management.network.Probe; +import com.microsoft.azure.management.network.LoadBalancerProbe; import com.microsoft.azure.management.network.PublicIpAddress; import com.microsoft.azure.management.network.PublicIpAddresses; import com.microsoft.azure.management.network.TcpProbe; @@ -729,7 +729,7 @@ static void printLB(LoadBalancer resource) { info.append("\n\t\t\tBackend port: ").append(rule.backendPort()); - Probe probe = rule.probe(); + LoadBalancerProbe probe = rule.probe(); info.append("\n\t\t\tProbe: "); if (probe == null) { info.append("(None)");