Always have wanted node version (WIP)

3 files changed, 8 insertions, 9 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 7f13ff1a13c..c91548f9ca7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -125,8 +125,7 @@ public class NodeSerializer {
         object.setLong(restartGenerationKey, allocation.restartGeneration().wanted());
         object.setLong(currentRestartGenerationKey, allocation.restartGeneration().current());
         object.setBool(removableKey, allocation.isRemovable());
-        allocation.membership().cluster().vespaVersion()
-                .ifPresent(version -> object.setString(wantedVespaVersionKey, version.toString()));
+        object.setString(wantedVespaVersionKey, allocation.membership().cluster().vespaVersion().toString());
     }
 
     private void toSlime(History history, Cursor array) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
index 2766a219931..0ac82f1dbd8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
@@ -156,8 +156,8 @@ class NodesResponse extends HttpResponse {
             toSlime(node.allocation().get().membership(), object.setObject("membership"));
             object.setLong("restartGeneration", node.allocation().get().restartGeneration().wanted());
             object.setLong("currentRestartGeneration", node.allocation().get().restartGeneration().current());
-            node.allocation().get().membership().cluster().dockerImage().ifPresent(image -> object.setString("wantedDockerImage", image));
-            node.allocation().get().membership().cluster().vespaVersion().ifPresent(version -> object.setString("wantedVespaVersion", version.toFullString()));
+            object.setString("wantedDockerImage", node.allocation().get().membership().cluster().dockerImage());
+            object.setString("wantedVespaVersion", node.allocation().get().membership().cluster().vespaVersion().toFullString());
         }
         object.setLong("rebootGeneration", node.status().reboot().wanted());
         object.setLong("currentRebootGeneration", node.status().reboot().current());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
index 97610e17b45..3d38adca4d3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
@@ -230,7 +230,7 @@ public class SerializationTest {
                                false));
 
         Node deserializedNode = nodeSerializer.fromJson(State.provisioned, nodeSerializer.toJson(nodeWithAllocation));
-        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0", deserializedNode.allocation().get().membership().cluster().dockerImage().get());
+        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0", deserializedNode.allocation().get().membership().cluster().dockerImage());
     }
 
     @Test
@@ -279,8 +279,8 @@ public class SerializationTest {
                         "   }\n" +
                         "}";
         Node node = nodeSerializer.fromJson(State.active, Utf8.toBytes(nodeWithDockerImage));
-        assertEquals("6.42.1", node.allocation().get().membership().cluster().vespaVersion().get().toString());
-        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1", node.allocation().get().membership().cluster().dockerImage().get());
+        assertEquals("6.42.1", node.allocation().get().membership().cluster().vespaVersion().toString());
+        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1", node.allocation().get().membership().cluster().dockerImage());
 
         String nodeWithWantedVespaVersion =
                 "{\n" +
@@ -295,8 +295,8 @@ public class SerializationTest {
                         "   }\n" +
                         "}";
         node = nodeSerializer.fromJson(State.active, Utf8.toBytes(nodeWithWantedVespaVersion));
-        assertEquals("6.42.2", node.allocation().get().membership().cluster().vespaVersion().get().toString());
-        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.2", node.allocation().get().membership().cluster().dockerImage().get());
+        assertEquals("6.42.2", node.allocation().get().membership().cluster().vespaVersion().toString());
+        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.2", node.allocation().get().membership().cluster().dockerImage());
     }
 
     @Test