Use same serializer for ApplicationVersion

6 files changed, 16 insertions, 51 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());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json
index 19df8059cf8..29f748d5408 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json
@@ -6,12 +6,7 @@
   "validationOverrides": "<validation-overrides>\n    <allow until=\"2016-04-28\" comment=\"Renaming content cluster\">content-cluster-removal</allow>\n    <allow until=\"2016-08-22\" comment=\"Migrating us-east-3 to C-2E\">cluster-size-reduction</allow>\n    <allow until=\"2017-06-30\" comment=\"Test Vespa upgrade tests\">force-automatic-tenant-upgrade-test</allow>\n</validation-overrides>\n",
   "projectId": 102889,
   "deployingField": {
-    "buildNumber": 42,
-    "sourceRevision": {
-      "repositoryField": "git@git.host:user/repo.git",
-      "branchField": "origin/master",
-      "commitField": "234f3e4e77049d0b9538c9e1b356d17eb1dedb6a"
-    }
+    "build": 42
   },
   "outstandingChangeField": false,
   "queryQuality": 100,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
index df3f9699677..c8f5b7bf50a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
@@ -3,13 +3,8 @@
   "application": "application2",
   "deployments": "http://localhost:8080/application/v4/tenant/tenant2/application/application2/job/",
   "latestVersion": {
-    "buildNumber": 1,
-    "hash": "1.0.1-commit1",
-    "source": {
-      "gitRepository": "repository1",
-      "gitBranch": "master",
-      "gitCommit": "commit1"
-    },
+    "build": 1,
+    "compileVersion": "6.1.0",
     "sourceUrl": "repository1/tree/commit1",
     "commit": "commit1"
   },
@@ -24,13 +19,8 @@
       "instance": "instance1",
       "deploying": {
         "revision": {
-          "buildNumber": 1,
-          "hash": "1.0.1-commit1",
-          "source": {
-            "gitRepository": "repository1",
-            "gitBranch": "master",
-            "gitCommit": "commit1"
-          },
+          "build": 1,
+          "compileVersion": "6.1.0",
           "sourceUrl": "repository1/tree/commit1",
           "commit": "commit1"
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
index 9ef46247629..7aae1815dac 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
@@ -3,13 +3,8 @@
   "application": "application2",
   "deployments": "http://localhost:8080/application/v4/tenant/tenant2/application/application2/job/",
   "latestVersion": {
-    "buildNumber": 1,
-    "hash": "1.0.1-commit1",
-    "source": {
-      "gitRepository": "repository1",
-      "gitBranch": "master",
-      "gitCommit": "commit1"
-    },
+    "build": 1,
+    "compileVersion": "6.1.0",
     "sourceUrl": "repository1/tree/commit1",
     "commit": "commit1"
   },
@@ -23,13 +18,8 @@
       "instance": "instance1",
       "deploying": {
         "revision": {
-          "buildNumber": 1,
-          "hash": "1.0.1-commit1",
-          "source": {
-            "gitRepository": "repository1",
-            "gitBranch": "master",
-            "gitCommit": "commit1"
-          },
+          "build": 1,
+          "compileVersion": "6.1.0",
           "sourceUrl": "repository1/tree/commit1",
           "commit": "commit1"
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
index 968992b2db5..b98de97856d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
@@ -8,13 +8,8 @@
   "projectId": 123,
   "deploying": {
     "revision": {
-      "buildNumber": 1,
-      "hash": "1.0.1-commit1",
-      "source": {
-        "gitRepository": "repository1",
-        "gitBranch": "master",
-        "gitCommit": "commit1"
-      },
+      "build": 1,
+      "compileVersion": "6.1.0",
       "sourceUrl": "repository1/tree/commit1",
       "commit": "commit1"
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
index 393e228b6e4..a697c667ab0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
@@ -8,13 +8,8 @@
   "projectId": 123,
   "deploying": {
     "revision": {
-      "buildNumber": 1,
-      "hash": "1.0.1-commit1",
-      "source": {
-        "gitRepository": "repository1",
-        "gitBranch": "master",
-        "gitCommit": "commit1"
-      },
+      "build": 1,
+      "compileVersion": "6.1.0",
       "sourceUrl": "repository1/tree/commit1",
       "commit": "commit1"
     }