1 files changed, 9 insertions, 11 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java
index 03ff17c6ebc..2b1007f75d4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java
@@ -26,13 +26,11 @@ import static java.util.stream.Collectors.toMap;
 public class LoadBalancerServiceMock implements LoadBalancerService {
 
     private record Key(ApplicationId application, ClusterSpec.Id cluster, String idSeed) {
-        @Override public int hashCode() { return idSeed == null ? Objects.hash(application, cluster) : Objects.hash(idSeed); }
+        @Override public int hashCode() { return idSeed.hashCode(); }
         @Override public boolean equals(Object o) {
             if (o == this) return true;
             if ( ! (o instanceof Key key)) return false;
-            if (idSeed != null) return Objects.equals(idSeed, key.idSeed);
-            return Objects.equals(application, key.application) &&
-                   Objects.equals(cluster, key.cluster);
+            return Objects.equals(idSeed, key.idSeed);
         }
     }
     private final Map<Key, LoadBalancerInstance> instances = new HashMap<>();
@@ -68,7 +66,7 @@ public class LoadBalancerServiceMock implements LoadBalancerService {
     }
 
     @Override
-    public LoadBalancerInstance provision(LoadBalancerSpec spec, Optional<String> idSeed) {
+    public LoadBalancerInstance provision(LoadBalancerSpec spec, String idSeed) {
         if (throwOnCreate) throw new IllegalStateException("Did not expect a new load balancer to be created");
         var instance = new LoadBalancerInstance(
                 idSeed,
@@ -82,13 +80,13 @@ public class LoadBalancerServiceMock implements LoadBalancerService {
                 spec.settings(),
                 spec.settings().isPrivateEndpoint() ? List.of(PrivateServiceId.of("service")) : List.of(),
                 spec.cloudAccount());
-        instances.put(new Key(spec.application(), spec.cluster(), idSeed.orElse(null)), instance);
+        instances.put(new Key(spec.application(), spec.cluster(), idSeed), instance);
         return instance;
     }
 
     @Override
     public LoadBalancerInstance configure(LoadBalancerInstance instance, LoadBalancerSpec spec, boolean force) {
-        var id = new Key(spec.application(), spec.cluster(), instance.idSeed().orElse(null));
+        var id = new Key(spec.application(), spec.cluster(), instance.idSeed());
         var oldInstance = requireNonNull(instances.get(id), "expected existing load balancer " + id);
         if (!force && !oldInstance.reals().isEmpty() && spec.reals().isEmpty()) {
             throw new IllegalArgumentException("Refusing to remove all reals from load balancer " + id);
@@ -102,20 +100,20 @@ public class LoadBalancerServiceMock implements LoadBalancerService {
 
     @Override
     public void reallocate(LoadBalancerInstance provisioned, LoadBalancerSpec spec) {
-        instances.put(new Key(spec.application(), spec.cluster(), provisioned.idSeed().get()),
-                      requireNonNull(instances.remove(new Key(null, null, provisioned.idSeed().get())))); // ᕙ༼◕_◕༽ᕤ
+        instances.put(new Key(spec.application(), spec.cluster(), provisioned.idSeed()),
+                      requireNonNull(instances.remove(new Key(null, null, provisioned.idSeed())))); // ᕙ༼◕_◕༽ᕤ
     }
 
     @Override
     public void remove(LoadBalancer loadBalancer) {
         requireNonNull(instances.remove(new Key(loadBalancer.id().application(),
                                                 loadBalancer.id().cluster(),
-                                                loadBalancer.instance().get().idSeed().orElse(null))),
+                                                loadBalancer.instance().get().idSeed())),
                        "expected load balancer to exist: " + loadBalancer.id());
     }
 
     @Override
-    public Availability healthy(Endpoint endpoint, Optional<String> idSeed) {
+    public Availability healthy(Endpoint endpoint, String idSeed) {
         return Availability.ready;
     }