Clean up NameService interface

3 files changed, 11 insertions, 26 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 06599aa0b82..105d2626dcd 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
@@ -6,7 +6,6 @@ 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;
 
@@ -31,17 +30,17 @@ public class MemoryNameService implements NameService {
     }
 
     @Override
-    public Optional<Record> findRecord(Record.Type type, RecordName name) {
+    public List<Record> findRecords(Record.Type type, RecordName name) {
         return records.values().stream()
-                .filter(record -> record.type() == type && record.name().equals(name))
-                .findFirst();
+                      .filter(record -> record.type() == type && record.name().equals(name))
+                      .collect(Collectors.toUnmodifiableList());
     }
 
     @Override
-    public List<Record> findRecord(Record.Type type, RecordData data) {
+    public List<Record> findRecords(Record.Type type, RecordData data) {
         return records.values().stream()
-                .filter(record -> record.type() == type && record.data().equals(data))
-                .collect(Collectors.toList());
+                      .filter(record -> record.type() == type && record.data().equals(data))
+                      .collect(Collectors.toUnmodifiableList());
     }
 
     @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 8c5579cf97c..170196fd483 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,9 +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.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * A managed DNS service.
@@ -20,18 +18,11 @@ public interface NameService {
      */
     RecordId createCname(RecordName alias, RecordData canonicalName);
 
-    /** Find record by type and name - will throw exception if more than one record matches */
-    Optional<Record> findRecord(Record.Type type, RecordName name);
+    /** Find records matching type and name */
+    List<Record> findRecords(Record.Type type, RecordName name);
 
-    /** Find record by type and name - may return multiple records */
-    default List<Record> findRecords(Record.Type type, RecordName name) {
-        List<Record> result = new ArrayList<>();
-        findRecord(type, name).ifPresent(result::add);
-        return result;
-    }
-
-    /** Find record by type and data */
-    List<Record> findRecord(Record.Type type, RecordData data);
+    /** Find records matching type and data */
+    List<Record> findRecords(Record.Type type, RecordData data);
 
     /** Update existing record */
     void updateRecord(RecordId id, RecordData newData);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java
index b51202e8261..dd9747ce5ca 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java
@@ -56,12 +56,7 @@ public class Record {
 
     @Override
     public String toString() {
-        return "Record{" +
-               "id=" + id +
-               ", type=" + type +
-               ", name='" + name + '\'' +
-               ", data='" + data + '\'' +
-               '}';
+        return String.format("%s: %s %s -> %s", id, type, name, data);
     }
 
     @Override