Remove all aliases for each rotation, when unused

2 files changed, 7 insertions, 5 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
index ec9cf0b3436..06599aa0b82 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
@@ -4,9 +4,11 @@ package com.yahoo.vespa.hosted.controller.api.integration.dns;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * An in-memory name service for testing purposes.
@@ -36,11 +38,10 @@ public class MemoryNameService implements NameService {
     }
 
     @Override
-    public Optional<Record> findRecord(Record.Type type, RecordData data) {
-        return records.values()
-                .stream()
+    public List<Record> findRecord(Record.Type type, RecordData data) {
+        return records.values().stream()
                 .filter(record -> record.type() == type && record.data().equals(data))
-                .findFirst();
+                .collect(Collectors.toList());
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java
index 078a7e7cefb..1d341f06f90 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.dns;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -22,7 +23,7 @@ public interface NameService {
     Optional<Record> findRecord(Record.Type type, RecordName name);
 
     /** Find record by type and data */
-    Optional<Record> findRecord(Record.Type type, RecordData data);
+    List<Record> findRecord(Record.Type type, RecordData data);
 
     /** Update existing record */
     void updateRecord(RecordId id, RecordData newData);