summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2022-02-23 16:35:11 +0100
committerValerij Fredriksen <valerijf@yahooinc.com>2022-02-23 16:35:11 +0100
commit8799eb72387e274b30670fd929f23b4f7bdd61c5 (patch)
treec67cfc075e9bfbda919945f9a35a4d79ceb73734 /controller-server/src/main/java/com/yahoo
parentd1df5dbd556ba25f1daa09c424d227c154c68102 (diff)
Use same serializer for ApplicationVersion
Diffstat (limited to 'controller-server/src/main/java/com/yahoo')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 906c99791bc..72e5a0dfc64 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -1190,7 +1190,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
request.getUri()).toString());
DeploymentStatus status = controller.jobController().deploymentStatus(application);
- application.latestVersion().ifPresent(version -> toSlime(version, object.setObject("latestVersion")));
+ application.latestVersion().ifPresent(version -> JobControllerApiHandlerHelper.toSlime(object.setObject("latestVersion"), version));
application.projectId().ifPresent(id -> object.setLong("projectId", id));
@@ -1450,7 +1450,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
change.platform().ifPresent(version -> object.setString("version", version.toString()));
change.application()
.filter(version -> !version.isUnknown())
- .ifPresent(version -> toSlime(version, object.setObject("revision")));
+ .ifPresent(version -> JobControllerApiHandlerHelper.toSlime(object.setObject("revision"), version));
}
private void toSlime(Endpoint endpoint, Cursor object) {
@@ -2500,7 +2500,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
object.setLong("id", run.id().number());
object.setString("version", run.versions().targetPlatform().toFullString());
if ( ! run.versions().targetApplication().isUnknown())
- toSlime(run.versions().targetApplication(), object.setObject("revision"));
+ JobControllerApiHandlerHelper.toSlime(object.setObject("revision"), run.versions().targetApplication());
object.setString("reason", "unknown reason");
object.setLong("at", run.end().orElse(run.start()).toEpochMilli());
}