Remove unused method

6 files changed, 11 insertions, 31 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java
index b17ca52d835..3cd3d969731 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java
@@ -43,11 +43,6 @@ public class CreateRecord implements NameServiceRequest {
     }
 
     @Override
-    public List<Record> affectedRecords() {
-        return List.of(record);
-    }
-
-    @Override
     public String toString() {
         return "create record " + record;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
index ec943676962..9dd02735638 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
@@ -52,11 +52,6 @@ public class CreateRecords implements NameServiceRequest {
     }
 
     @Override
-    public List<Record> affectedRecords() {
-        return records();
-    }
-
-    @Override
     public String toString() {
         return "create records " + records();
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
index f4bea8b1083..299ea168c7a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
@@ -39,24 +39,24 @@ public class NameServiceForwarder {
     }
 
     /** Create or update a CNAME record with given name and data */
-    public Record createCname(RecordName name, RecordData canonicalName, NameServiceQueue.Priority priority) {
-        return forward(new CreateRecord(new Record(Record.Type.CNAME, name, canonicalName)), priority).affectedRecords().get(0);
+    public void createCname(RecordName name, RecordData canonicalName, NameServiceQueue.Priority priority) {
+        forward(new CreateRecord(new Record(Record.Type.CNAME, name, canonicalName)), priority);
     }
 
     /** Create or update an ALIAS record with given name and targets */
-    public List<Record> createAlias(RecordName name, Set<AliasTarget> targets, NameServiceQueue.Priority priority) {
+    public void createAlias(RecordName name, Set<AliasTarget> targets, NameServiceQueue.Priority priority) {
         var records = targets.stream().map(AliasTarget::asData)
                              .map(data -> new Record(Record.Type.ALIAS, name, data))
                              .collect(Collectors.toList());
-        return forward(new CreateRecords(records), priority).affectedRecords();
+        forward(new CreateRecords(records), priority);
     }
 
     /** Create or update a TXT record with given name and data */
-    public List<Record> createTxt(RecordName name, List<RecordData> txtData, NameServiceQueue.Priority priority) {
+    public void createTxt(RecordName name, List<RecordData> txtData, NameServiceQueue.Priority priority) {
         var records = txtData.stream()
                              .map(data -> new Record(Record.Type.TXT, name, data))
                              .collect(Collectors.toList());
-        return forward(new CreateRecords(records), priority).affectedRecords();
+        forward(new CreateRecords(records), priority);
     }
 
     /** Remove all records of given type and name */
@@ -69,7 +69,7 @@ public class NameServiceForwarder {
         forward(new RemoveRecords(type, data), priority);
     }
 
-    private NameServiceRequest forward(NameServiceRequest request, NameServiceQueue.Priority priority) {
+    private void forward(NameServiceRequest request, NameServiceQueue.Priority priority) {
         try (Lock lock = db.lockNameServiceQueue()) {
             NameServiceQueue queue = db.readNameServiceQueue();
             var queued = queue.requests().size();
@@ -80,7 +80,6 @@ public class NameServiceForwarder {
             }
             db.writeNameServiceQueue(queue.with(request, priority).last(maxQueuedRequests));
         }
-        return request;
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
index cc49e589cbb..684fb091d92 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
@@ -72,7 +72,7 @@ public class NameServiceQueue {
         if (requests.isEmpty()) return this;
 
         var queue = new NameServiceQueue(requests);
-        for (var i = 0; i < n && !queue.requests.isEmpty(); i++) {
+        for (int i = 0; i < n && !queue.requests.isEmpty(); i++) {
             var request = queue.requests.peek();
             try {
                 request.dispatchTo(nameService);
@@ -97,11 +97,13 @@ public class NameServiceQueue {
 
     /** Priority of a request added to this */
     public enum Priority {
+
         /** Default priority. Request will be delivered in FIFO order */
         normal,
 
-        /**Request is queued before others. Useful for code that needs to act on effects of a request */
+        /** Request is queued first. Useful for code that needs to act on effects of a request */
         high
+
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceRequest.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceRequest.java
index a01719ccc88..65076694160 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceRequest.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceRequest.java
@@ -2,9 +2,6 @@
 package com.yahoo.vespa.hosted.controller.dns;
 
 import com.yahoo.vespa.hosted.controller.api.integration.dns.NameService;
-import com.yahoo.vespa.hosted.controller.api.integration.dns.Record;
-
-import java.util.List;
 
 /**
  * Interface for requests to a {@link NameService}.
@@ -16,7 +13,4 @@ public interface NameServiceRequest {
     /** Send this to given name service */
     void dispatchTo(NameService nameService);
 
-    /** Returns the records affected by executing this */
-    List<Record> affectedRecords();
-
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/RemoveRecords.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/RemoveRecords.java
index b721f66e452..ddc4d157afd 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/RemoveRecords.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/RemoveRecords.java
@@ -61,11 +61,6 @@ public class RemoveRecords implements NameServiceRequest {
     }
 
     @Override
-    public List<Record> affectedRecords() {
-        return List.of();
-    }
-
-    @Override
     public String toString() {
         return "remove records of type " + type + ", by " +
                name.map(n -> "name " + n).orElse("") +