Use double progress [0, 1] instead of string

5 files changed, 13 insertions, 15 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ClusterReindexing.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ClusterReindexing.java
index 4b7148463f9..f162007b0e4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ClusterReindexing.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ClusterReindexing.java
@@ -54,9 +54,9 @@ public class ClusterReindexing {
         private final Instant endedAt;
         private final State state;
         private final String message;
-        private final String progress;
+        private final Double progress;
 
-        public Status(Instant startedAt, Instant endedAt, State state, String message, String progress) {
+        public Status(Instant startedAt, Instant endedAt, State state, String message, Double progress) {
             this.startedAt = Objects.requireNonNull(startedAt);
             this.endedAt = endedAt;
             this.state = state;
@@ -68,7 +68,7 @@ public class ClusterReindexing {
         public Optional<Instant> endedAt() { return Optional.ofNullable(endedAt); }
         public Optional<State> state() { return Optional.ofNullable(state); }
         public Optional<String> message() { return Optional.ofNullable(message); }
-        public Optional<String> progress() { return Optional.ofNullable(progress); }
+        public Optional<Double> progress() { return Optional.ofNullable(progress); }
 
         @Override
         public boolean equals(Object o) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java
index 0124b6822f0..1ced0c4ce4f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java
@@ -114,16 +114,16 @@ public class DefaultClusterReindexingStatusClient implements ClusterReindexingSt
                 Instant endedMillis = Optional.ofNullable(statusJson.get("endedMillis"))
                                               .map(json -> Instant.ofEpochMilli(json.longValue()))
                                               .orElse(null);
-                String progressToken = Optional.ofNullable(statusJson.get("progress"))
-                                               .map(JsonNode::textValue)
-                                               .orElse(null);
+                Double progress = Optional.ofNullable(statusJson.get("progress"))
+                                          .map(JsonNode::doubleValue)
+                                          .orElse(null);
                 ClusterReindexing.State state = Optional.ofNullable(statusJson.get("state"))
                                                         .map(json -> ClusterReindexing.State.fromString(json.textValue()))
                                                         .orElse(null);
                 String message = Optional.ofNullable(statusJson.get("message"))
                                          .map(JsonNode::textValue)
                                          .orElse(null);
-                documentStatuses.put(type, new ClusterReindexing.Status(startedMillis, endedMillis, state, message, progressToken));
+                documentStatuses.put(type, new ClusterReindexing.Status(startedMillis, endedMillis, state, message, progress));
             }
             clusters.put(clusterName, new ClusterReindexing(documentStatuses));
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
index 0c7d60c5313..900061949f4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
@@ -483,7 +483,7 @@ public class ApplicationHandler extends HttpHandler {
             status.endedAt().ifPresent(endedAt -> object.setLong("endedMillis", endedAt.toEpochMilli()));
             status.state().map(ClusterReindexing.State::asString).ifPresent(state -> object.setString("state", state));
             status.message().ifPresent(message -> object.setString("message", message));
-            status.progress().ifPresent(progress -> object.setString("progress", progress));
+            status.progress().ifPresent(progress -> object.setDouble("progress", progress));
         }
 
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java
index 82e1bd96373..7b8d5d9cc07 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java
@@ -5,9 +5,7 @@ import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.api.PortInfo;
 import com.yahoo.config.model.api.ServiceInfo;
-import com.yahoo.documentapi.ProgressToken;
 import com.yahoo.vespa.config.server.modelfactory.ModelResult;
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -63,7 +61,7 @@ public class DefaultClusterReindexingStatusClientTest {
                 "        \"artist\": {" +
                 "          \"startedMillis\":50," +
                 "          \"endedMillis\":150," +
-                "          \"progress\":\"half-done\"," +
+                "          \"progress\": 0.5," +
                 "          \"state\": \"" + ClusterReindexing.State.SUCCESSFUL.asString() + "\"," +
                 "          \"message\":\"success\"" +
                 "        }" +
@@ -84,7 +82,7 @@ public class DefaultClusterReindexingStatusClientTest {
                                                                                                                    Instant.ofEpochMilli(150),
                                                                                                                    ClusterReindexing.State.SUCCESSFUL,
                                                                                                                    "success",
-                                                                                                                   "half-done"))));
+                                                                                                                   0.5))));
         Map<String, ClusterReindexing> result = client.getReindexingStatus(app);
         assertEquals(expected, result);
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index 3ca21a46d12..f2558fa50b8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -455,7 +455,7 @@ public class ApplicationHandlerTest {
                                                                                              now.plusSeconds(2),
                                                                                              ClusterReindexing.State.FAILED,
                                                                                              "message",
-                                                                                             "some")));
+                                                                                             0.1)));
         assertJsonEquals(getRenderedString(new ReindexingResponse(applicationReindexing,
                                                                   Map.of("boo", clusterReindexing,
                                                                          "moo", clusterReindexing))),
@@ -476,7 +476,7 @@ public class ApplicationHandlerTest {
                          "          \"endedMillis\": 125456,\n" +
                          "          \"state\": \"failed\",\n" +
                          "          \"message\": \"message\",\n" +
-                         "          \"progress\": \"some\"\n" +
+                         "          \"progress\": 0.1\n" +
                          "        }\n" +
                          "      }\n" +
                          "    },\n" +
@@ -498,7 +498,7 @@ public class ApplicationHandlerTest {
                          "          \"endedMillis\": 125456,\n" +
                          "          \"state\": \"failed\",\n" +
                          "          \"message\": \"message\",\n" +
-                         "          \"progress\": \"some\"\n" +
+                         "          \"progress\": 0.1\n" +
                          "        },\n" +
                          "        \"bax\": {\n" +
                          "          \"startedMillis\": 123456\n" +