Remove unused method

1 files changed, 10 insertions, 19 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index 04f64b070b3..890d190c24e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -109,7 +109,7 @@ public class LoadBalancerProvisioner {
     public void activate(Set<ClusterSpec> clusters, NodeList newActive, ApplicationTransaction transaction) {
         Map<ClusterSpec.Id, ZoneEndpoint> activatingClusters = clusters.stream()
                                                                        // .collect(Collectors.toMap(ClusterSpec::id, ClusterSpec::zoneEndpoint));
-                                                                       // TODO: this dies with combined clusters Ü
+                                                                       // TODO: this dies with combined clusters
                                                                        .collect(groupingBy(LoadBalancerProvisioner::effectiveId,
                                                                                           reducing(ZoneEndpoint.defaultEndpoint,
                                                                                                    ClusterSpec::zoneEndpoint,
@@ -193,14 +193,13 @@ public class LoadBalancerProvisioner {
         Optional<LoadBalancer> loadBalancer = db.readLoadBalancer(id);
         LoadBalancer newLoadBalancer;
         LoadBalancer.State fromState = loadBalancer.map(LoadBalancer::state).orElse(null);
-        if (   loadBalancer.isPresent()
-            && (   ! inAccount(cloudAccount, loadBalancer.get())
-                || ! hasCorrectVisibility(loadBalancer.get(), zoneEndpoint))) {
-                // We have a load balancer, but with the wrong account or visibility.
-                // Load balancer must be removed before we can provision a new one with the wanted visibility
-                newLoadBalancer = loadBalancer.get().with(LoadBalancer.State.removable, now);
-        }
-        else {
+        boolean recreateLoadBalancer = loadBalancer.isPresent() && (!inAccount(cloudAccount, loadBalancer.get())
+                                                                    || !hasCorrectVisibility(loadBalancer.get(), zoneEndpoint));
+        if (recreateLoadBalancer) {
+            // We have a load balancer, but with the wrong account or visibility.
+            // Load balancer must be removed before we can provision a new one with the wanted visibility
+            newLoadBalancer = loadBalancer.get().with(LoadBalancer.State.removable, now);
+        } else {
             Optional<LoadBalancerInstance> instance = provisionInstance(id, loadBalancer, zoneEndpoint, cloudAccount);
             newLoadBalancer = loadBalancer.isEmpty() ? new LoadBalancer(id, instance, LoadBalancer.State.reserved, now)
                                                      : loadBalancer.get().with(instance);
@@ -211,8 +210,8 @@ public class LoadBalancerProvisioner {
     }
 
     private static boolean hasCorrectVisibility(LoadBalancer newLoadBalancer, ZoneEndpoint zoneEndpoint) {
-        return    newLoadBalancer.instance().isEmpty()
-               || newLoadBalancer.instance().get().settings().isPublicEndpoint() == zoneEndpoint.isPublicEndpoint();
+        return newLoadBalancer.instance().isEmpty() ||
+               newLoadBalancer.instance().get().settings().isPublicEndpoint() == zoneEndpoint.isPublicEndpoint();
     }
 
     private void activate(ApplicationTransaction transaction, ClusterSpec.Id cluster, ZoneEndpoint settings, NodeList nodes) {
@@ -320,14 +319,6 @@ public class LoadBalancerProvisioner {
         return loadBalancer.instance().isEmpty() || loadBalancer.instance().get().cloudAccount().equals(cloudAccount);
     }
 
-    /** Returns whether load balancer has given reals, and settings if specified */
-    private static boolean isUpToDate(LoadBalancer loadBalancer, Set<Real> reals, ZoneEndpoint zoneEndpoint) {
-        if (loadBalancer.instance().isEmpty())
-            throw new IllegalStateException("Expected a load balancer instance to be present, for " + loadBalancer.id());
-        return    loadBalancer.instance().get().reals().equals(reals)
-               && loadBalancer.instance().get().settings().equals(zoneEndpoint);
-    }
-
     /** Find IP addresses reachable by the load balancer service */
     private Set<String> reachableIpAddresses(Node node) {
         Set<String> reachable = new LinkedHashSet<>(node.ipConfig().primary());