Rename field

8 files changed, 14 insertions, 14 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java
index 6b60b49e1ef..18648d4a488 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java
@@ -31,7 +31,7 @@ public class VersionStatusSerializer {
 
     // VespaVersion fields
     private static final String releaseCommitField = "releaseCommit";
-    private static final String releasedAtField = "releasedAt";
+    private static final String committedAtField = "releasedAt";
     private static final String isCurrentSystemVersionField = "isCurrentSystemVersion";
     private static final String deploymentStatisticsField = "deploymentStatistics";
     private static final String confidenceField = "confidence";
@@ -61,7 +61,7 @@ public class VersionStatusSerializer {
 
     private void vespaVersionToSlime(VespaVersion version, Cursor object) {
         object.setString(releaseCommitField, version.releaseCommit());
-        object.setLong(releasedAtField, version.releasedAt().toEpochMilli());
+        object.setLong(committedAtField, version.committedAt().toEpochMilli());
         object.setBool(isCurrentSystemVersionField, version.isCurrentSystemVersion());
         deploymentStatisticsToSlime(version.statistics(), object.setObject(deploymentStatisticsField));
         object.setString(confidenceField, version.confidence().name());
@@ -92,7 +92,7 @@ public class VersionStatusSerializer {
     private VespaVersion vespaVersionFromSlime(Inspector object) {
         return new VespaVersion(deploymentStatisticsFromSlime(object.field(deploymentStatisticsField)),
                                 object.field(releaseCommitField).asString(),
-                                Instant.ofEpochMilli(object.field(releasedAtField).asLong()),
+                                Instant.ofEpochMilli(object.field(committedAtField).asLong()),
                                 object.field(isCurrentSystemVersionField).asBool(),
                                 configServersFromSlime(object.field(configServersField)),
                                 VespaVersion.Confidence.valueOf(object.field(confidenceField).asString())
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
index 8338d341a2b..f9d3901765f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
@@ -84,7 +84,7 @@ public class DeploymentApiHandler extends LoggingRequestHandler {
             versionObject.setString("version", version.versionNumber().toString());
             versionObject.setString("confidence", version.confidence().name());
             versionObject.setString("commit", version.releaseCommit());
-            versionObject.setLong("date", version.releasedAt().toEpochMilli());
+            versionObject.setLong("date", version.committedAt().toEpochMilli());
             versionObject.setBool("controllerVersion", version.isSelfVersion());
             versionObject.setBool("systemVersion", version.isCurrentSystemVersion());
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
index 14f3e6b2f61..314e9fe6014 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java
@@ -131,7 +131,7 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler {
         Cursor cursor = slime.setObject();
         cursor.setString("version", version.versionNumber().toString());
         cursor.setString("sha", version.releaseCommit());
-        cursor.setLong("date", version.releasedAt().toEpochMilli());
+        cursor.setLong("date", version.committedAt().toEpochMilli());
         return new SlimeJsonResponse(slime);
         
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
index 9bc7b7a22d8..86fba06db2f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
@@ -177,7 +177,7 @@ public class VersionStatus {
                                               Collection<String> configServerHostnames,
                                               Controller controller) {
         GitSha gitSha = controller.gitHub().getCommit(VESPA_REPO_OWNER, VESPA_REPO, statistics.version().toFullString());
-        Instant releasedAt = Instant.ofEpochMilli(gitSha.commit.author.date.getTime()); // commitedAt ...
+        Instant committedAt = Instant.ofEpochMilli(gitSha.commit.author.date.getTime());
         VespaVersion.Confidence confidence;
         // Always compute confidence for system version
         if (isSystemVersion) {
@@ -188,7 +188,7 @@ public class VersionStatus {
                     .orElse(VespaVersion.confidenceFrom(statistics, controller));
         }
         return new VespaVersion(statistics,
-                                gitSha.sha, releasedAt,
+                                gitSha.sha, committedAt,
                                 isSystemVersion,
                                 configServerHostnames,
                                 confidence
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java
index ea89a70543c..3377c397163 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersion.java
@@ -25,18 +25,18 @@ import static com.yahoo.config.application.api.DeploymentSpec.UpgradePolicy;
 public class VespaVersion implements Comparable<VespaVersion> {
     
     private final String releaseCommit;
-    private final Instant releasedAt;
+    private final Instant committedAt;
     private final boolean isCurrentSystemVersion;
     private final DeploymentStatistics statistics;
     private final ImmutableSet<String> configServerHostnames;
     private final Confidence confidence;
 
-    public VespaVersion(DeploymentStatistics statistics, String releaseCommit, Instant releasedAt,
+    public VespaVersion(DeploymentStatistics statistics, String releaseCommit, Instant committedAt,
                         boolean isCurrentSystemVersion, Collection<String> configServerHostnames,
                         Confidence confidence) {
         this.statistics = statistics;
         this.releaseCommit = releaseCommit;
-        this.releasedAt = releasedAt;
+        this.committedAt = committedAt;
         this.isCurrentSystemVersion = isCurrentSystemVersion;
         this.configServerHostnames = ImmutableSet.copyOf(configServerHostnames);
         this.confidence = confidence;
@@ -79,7 +79,7 @@ public class VespaVersion implements Comparable<VespaVersion> {
     public String releaseCommit() { return releaseCommit; }
     
     /** Returns the time of the release commit */
-    public Instant releasedAt() { return releasedAt; }
+    public Instant committedAt() { return committedAt; }
     
     /** Statistics about deployment of this version */
     public DeploymentStatistics statistics() { return statistics; }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 25ea29f92cc..3871831ffe9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -308,7 +308,7 @@ public class ControllerTest {
         for (int i = 0; i < versions.size(); i++) {
             VespaVersion c = versions.get(i);
             if (c.isCurrentSystemVersion())
-                versions.set(i, new VespaVersion(c.statistics(), c.releaseCommit(), c.releasedAt(),
+                versions.set(i, new VespaVersion(c.statistics(), c.releaseCommit(), c.committedAt(),
                                                  false, c.configServerHostnames(),
                                                  c.confidence()));
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
index c668bde0d40..05b671baea0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
@@ -44,7 +44,7 @@ public class VersionStatusSerializerTest {
             VespaVersion a = status.versions().get(i);
             VespaVersion b = deserialized.versions().get(i);
             assertEquals(a.releaseCommit(), b.releaseCommit());
-            assertEquals(a.releasedAt(), b.releasedAt());
+            assertEquals(a.committedAt(), b.committedAt());
             assertEquals(a.isCurrentSystemVersion(), b.isCurrentSystemVersion());
             assertEquals(a.statistics(), b.statistics());
             assertEquals(a.configServerHostnames(), b.configServerHostnames());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
index a56ab028233..4de3b9abd5b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
@@ -83,7 +83,7 @@ public class DeploymentApiTest extends ControllerContainerTest {
             if ( ! version.configServerHostnames().isEmpty())
                 version = new VespaVersion(version.statistics(), 
                                            version.releaseCommit(), 
-                                           version.releasedAt(), 
+                                           version.committedAt(),
                                            version.isCurrentSystemVersion(), 
                                            ImmutableSet.of("config1.test", "config2.test"),
                                            VespaVersion.confidenceFrom(version.statistics(), controller)