Remove NodeRepositoryNode from NodeRepository interface

2 files changed, 7 insertions, 8 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java
index 9b63f5630c9..3e380b77a86 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java
@@ -53,7 +53,7 @@ public class Node {
     private final long wantedRebootGeneration;
     private final int cost;
     private final int failCount;
-    private final String flavor;
+    private final Optional<String> flavor;
     private final String clusterId;
     private final ClusterType clusterType;
     private final String group;
@@ -77,7 +77,7 @@ public class Node {
                  Version currentOsVersion, Version wantedOsVersion, Optional<Instant> currentFirmwareCheck,
                  Optional<Instant> wantedFirmwareCheck, ServiceState serviceState, Optional<Instant> suspendedSince,
                  long restartGeneration, long wantedRestartGeneration, long rebootGeneration,
-                 long wantedRebootGeneration, int cost, int failCount, String flavor, String clusterId,
+                 long wantedRebootGeneration, int cost, int failCount, Optional<String> flavor, String clusterId,
                  ClusterType clusterType, String group, boolean retired, boolean wantToRetire, boolean wantToDeprovision,
                  boolean wantToRebuild, Optional<TenantName> reservedTo, Optional<ApplicationId> exclusiveTo,
                  DockerImage wantedDockerImage, DockerImage currentDockerImage, Map<String, String> reports,
@@ -241,7 +241,7 @@ public class Node {
     }
 
     /** The flavor of this */
-    public String flavor() {
+    public Optional<String> flavor() {
         return flavor;
     }
 
@@ -458,7 +458,7 @@ public class Node {
         private long wantedRebootGeneration = 0;
         private int cost = 0;
         private int failCount = 0;
-        private String flavor = "default";
+        private Optional<String> flavor = Optional.empty();
         private String clusterId = "";
         private ClusterType clusterType = ClusterType.unknown;
         private String group = "";
@@ -647,7 +647,7 @@ public class Node {
         }
 
         public Builder flavor(String flavor) {
-            this.flavor = flavor;
+            this.flavor = Optional.of(flavor);
             return this;
         }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index 69a34ba46ce..53207ec8f99 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -7,11 +7,9 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.vespa.hosted.controller.api.integration.noderepository.NodeRepositoryNode;
 
 import java.net.URI;
 import java.time.Duration;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -25,7 +23,8 @@ import java.util.stream.Collectors;
  */
 public interface NodeRepository {
 
-    void addNodes(ZoneId zone, Collection<NodeRepositoryNode> nodes);
+    /** Add new nodes to the node repository */
+    void addNodes(ZoneId zone, List<Node> nodes);
 
     void deleteNode(ZoneId zone, String hostname);