Remove unnecessary default implementations

2 files changed, 2 insertions, 14 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
index 048f3758ac5..03285fda03c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
@@ -4,8 +4,6 @@ package com.yahoo.vespa.hosted.provision.lb;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 
-import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -16,16 +14,7 @@ import java.util.Set;
 public interface LoadBalancerService {
 
     /** Create a load balancer for given application cluster. Implementations are expected to be idempotent */
-    // TODO: Remove once removed from all implementations
-    default LoadBalancer create(ApplicationId application, ClusterSpec.Id cluster, List<Real> reals) {
-        return create(application, cluster, new HashSet<>(reals));
-    }
-
-    /** Create a load balancer for given application cluster. Implementations are expected to be idempotent */
-    // TODO: Remove default implementation once implemented everywhere
-    default LoadBalancer create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals) {
-        throw new UnsupportedOperationException();
-    }
+    LoadBalancer create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals);
 
     /** Permanently remove load balancer with given ID */
     void remove(LoadBalancerId loadBalancer);
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 7c59e3936a3..a3b779fa77e 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
@@ -16,7 +16,6 @@ import com.yahoo.vespa.hosted.provision.lb.Real;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.persistence.CuratorDatabaseClient;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -81,7 +80,7 @@ public class LoadBalancerProvisioner {
         Map<HostName, Set<String>> hostnameToIpAdresses = nodes.stream()
                                                                .collect(Collectors.toMap(node -> HostName.from(node.hostname()),
                                                                                          this::reachableIpAddresses));
-        List<Real> reals = new ArrayList<>();
+        Set<Real> reals = new LinkedHashSet<>();
         hostnameToIpAdresses.forEach((hostname, ipAddresses) -> {
             ipAddresses.forEach(ipAddress -> reals.add(new Real(hostname, ipAddress)));
         });