Rename pinned to platformPinned

10 files changed, 32 insertions, 37 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
index 64cad599168..d0edbfa54a3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.application;
 
 import com.yahoo.component.Version;
-import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RevisionId;
 
 import java.util.Objects;
@@ -32,23 +31,23 @@ public final class Change {
     private final Optional<RevisionId> revision;
 
     /** Whether this change is a pin to its contained Vespa version, or to the application's current. */
-    private final boolean pinned;
+    private final boolean platformPinned;
 
-    private Change(Optional<Version> platform, Optional<RevisionId> revision, boolean pinned) {
+    private Change(Optional<Version> platform, Optional<RevisionId> revision, boolean platformPinned) {
         this.platform = requireNonNull(platform, "platform cannot be null");
         this.revision = requireNonNull(revision, "revision cannot be null");
         if (revision.isPresent() && ( ! revision.get().isProduction())) {
             throw new IllegalArgumentException("Application version to deploy must be a known version");
         }
-        this.pinned = pinned;
+        this.platformPinned = platformPinned;
     }
 
     public Change withoutPlatform() {
-        return new Change(Optional.empty(), revision, pinned);
+        return new Change(Optional.empty(), revision, platformPinned);
     }
 
     public Change withoutApplication() {
-        return new Change(platform, Optional.empty(), pinned);
+        return new Change(platform, Optional.empty(), platformPinned);
     }
 
     /** Returns whether a change should currently be deployed */
@@ -58,7 +57,7 @@ public final class Change {
 
     /** Returns whether this is the empty change. */
     public boolean isEmpty() {
-        return ! hasTargets() && ! pinned;
+        return ! hasTargets() && ! platformPinned;
     }
 
     /** Returns the platform version carried by this. */
@@ -67,42 +66,39 @@ public final class Change {
     /** Returns the application version carried by this. */
     public Optional<RevisionId> revision() { return revision; }
 
-    public boolean isPinned() { return pinned; }
+    public boolean isPlatformPinned() { return platformPinned; }
 
     /** Returns an instance representing no change */
     public static Change empty() { return empty; }
 
     /** Returns a version of this change which replaces or adds this platform change */
     public Change with(Version platformVersion) {
-        if (pinned)
+        if (platformPinned)
             throw new IllegalArgumentException("Not allowed to set a platform version when pinned.");
 
-        return new Change(Optional.of(platformVersion), revision, pinned);
+        return new Change(Optional.of(platformVersion), revision, platformPinned);
     }
 
     /** Returns a version of this change which replaces or adds this revision change */
     public Change with(RevisionId revision) {
-        return new Change(platform, Optional.of(revision), pinned);
+        return new Change(platform, Optional.of(revision), platformPinned);
     }
 
     /** Returns a change with the versions of this, and with the platform version pinned. */
-    public Change withPin() {
+    public Change withPlatformPin() {
         return new Change(platform, revision, true);
     }
 
     /** Returns a change with the versions of this, and with the platform version unpinned. */
-    public Change withoutPin() {
+    public Change withoutPlatformPin() {
         return new Change(platform, revision, false);
     }
 
     /** Returns the change obtained when overwriting elements of the given change with any present in this */
     public Change onTopOf(Change other) {
-        if (platform.isPresent())
-            other = other.with(platform.get());
-        if (revision.isPresent())
-            other = other.with(revision.get());
-        if (pinned)
-            other = other.withPin();
+        if (platform.isPresent()) other = other.with(platform.get());
+        if (revision.isPresent()) other = other.with(revision.get());
+        if (platformPinned) other = other.withPlatformPin();
         return other;
     }
 
@@ -111,20 +107,20 @@ public final class Change {
         if (this == o) return true;
         if (!(o instanceof Change)) return false;
         Change change = (Change) o;
-        return pinned == change.pinned &&
+        return platformPinned == change.platformPinned &&
                Objects.equals(platform, change.platform) &&
                Objects.equals(revision, change.revision);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(platform, revision, pinned);
+        return Objects.hash(platform, revision, platformPinned);
     }
 
     @Override
     public String toString() {
         StringJoiner changes = new StringJoiner(" and ");
-        if (pinned)
+        if (platformPinned)
             changes.add("pin to " + platform.map(Version::toString).orElse("current platform"));
         else
             platform.ifPresent(version -> changes.add("upgrade to " + version));
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/InstanceList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/InstanceList.java
index c1bf083b26c..b94779994e4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/InstanceList.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/InstanceList.java
@@ -125,7 +125,7 @@ public class InstanceList extends AbstractFilteringList<ApplicationId, InstanceL
 
     /** Returns the subset of instances which are not pinned to a certain Vespa version. */
     public InstanceList unpinned() {
-        return matching(id -> ! instance(id).change().isPinned());
+        return matching(id -> ! instance(id).change().isPlatformPinned());
     }
 
     /** Returns the subset of instances which are currently failing a job. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index 00da34fe2e4..f22e2af4d49 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -229,7 +229,7 @@ public class DeploymentStatus {
                           .anyMatch(deployment -> ! compatibleWithCompileVersion.test(deployment.version()))) {
             for (Version platform : targetsForPolicy(versionStatus, systemVersion, application.deploymentSpec().requireInstance(instance).upgradePolicy()))
                 if (compatibleWithCompileVersion.test(platform))
-                    return change.withoutPin().with(platform);
+                    return change.withoutPlatformPin().with(platform);
         }
         return change;
     }
@@ -596,7 +596,7 @@ public class DeploymentStatus {
 
     /** Changes to deploy with the given job, possibly split in two steps. */
     private List<Change> changes(JobId job, StepStatus step, Change change) {
-        if (change.platform().isEmpty() || change.revision().isEmpty() || change.isPinned())
+        if (change.platform().isEmpty() || change.revision().isEmpty() || change.isPlatformPinned())
             return List.of(change);
 
         if (   step.completedAt(change.withoutApplication(), Optional.of(job)).isPresent()
@@ -1090,7 +1090,7 @@ public class DeploymentStatus {
                 /** Complete if deployment is on pinned version, and last successful deployment, or if given versions is strictly a downgrade, and this isn't forced by a pin. */
                 @Override
                 Optional<Instant> completedAt(Change change, Optional<JobId> dependent) {
-                    if (     change.isPinned()
+                    if (     change.isPlatformPinned()
                         &&   change.platform().isPresent()
                         && ! existingDeployment.map(Deployment::version).equals(change.platform()))
                         return Optional.empty();
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 00a0e22f87d..3bfbf8e1ab4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -41,7 +41,6 @@ import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static java.util.Comparator.comparing;
-import static java.util.Comparator.comparingDouble;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toMap;
 
@@ -334,10 +333,10 @@ public class DeploymentTrigger {
             Change change;
             switch (cancellation) {
                 case ALL: change = Change.empty(); break;
-                case VERSIONS: change = Change.empty().withPin(); break;
+                case VERSIONS: change = Change.empty().withPlatformPin(); break;
                 case PLATFORM: change = application.get().require(instanceId.instance()).change().withoutPlatform(); break;
                 case APPLICATION: change = application.get().require(instanceId.instance()).change().withoutApplication(); break;
-                case PIN: change = application.get().require(instanceId.instance()).change().withoutPin(); break;
+                case PIN: change = application.get().require(instanceId.instance()).change().withoutPlatformPin(); break;
                 default: throw new IllegalArgumentException("Unknown cancellation choice '" + cancellation + "'!");
             }
             applications().store(application.with(instanceId.instance(),
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 7b1a1e879d6..52ddcfd5171 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -437,7 +437,7 @@ public class InternalStepRunner implements StepRunner {
         Version targetPlatform = controller.jobController().run(id).versions().targetPlatform();
         Version systemVersion = controller.readSystemVersion();
         boolean incompatible = controller.applications().versionCompatibility(id.application()).refuse(targetPlatform, systemVersion);
-        return incompatible || application(id.application()).change().isPinned() ? targetPlatform : systemVersion;
+        return incompatible || application(id.application()).change().isPlatformPinned() ? targetPlatform : systemVersion;
     }
 
     private Optional<RunStatus> installTester(RunId id, DualLogger logger) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java
index e7371561636..301b9d6e3de 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Versions.java
@@ -126,7 +126,7 @@ public class Versions {
 
     private static Version targetPlatform(Application application, Change change, Optional<Version> existing,
                                           Supplier<Version> defaultVersion) {
-        if (change.isPinned() && change.platform().isPresent())
+        if (change.isPlatformPinned() && change.platform().isPresent())
             return change.platform().get();
 
         return max(change.platform(), existing)
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 5ae7a60d777..ad30b7b60e6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -297,7 +297,7 @@ public class ApplicationSerializer {
             object.setString(versionField, deploying.platform().get().toString());
         if (deploying.revision().isPresent())
             toSlime(deploying.revision().get(), object);
-        if (deploying.isPinned())
+        if (deploying.isPlatformPinned())
             object.setBool(pinnedField, true);
     }
 
@@ -524,7 +524,7 @@ public class ApplicationSerializer {
         if (object.field(applicationBuildNumberField).valid())
             change = change.with(revisionFromSlime(object, null));
         if (object.field(pinnedField).asBool())
-            change = change.withPin();
+            change = change.withPlatformPin();
         return change;
     }
 
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 81988753621..63020f54d42 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
@@ -2059,7 +2059,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         if ( ! instance.change().isEmpty()) {
             instance.change().platform().ifPresent(version -> root.setString("platform", version.toString()));
             instance.change().revision().ifPresent(revision -> root.setString("application", revision.toString()));
-            root.setBool("pinned", instance.change().isPinned());
+            root.setBool("pinned", instance.change().isPlatformPinned());
         }
         return new SlimeJsonResponse(slime);
     }
@@ -2172,7 +2172,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
                                                                                       .collect(joining(", ")));
             Change change = Change.of(version);
             if (pin)
-                change = change.withPin();
+                change = change.withPlatformPin();
 
             controller.applications().deploymentTrigger().forceChange(id, change, isOperator(request));
             response.append("Triggered ").append(change).append(" for ").append(id);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index 804ae7b7805..b893db55ca1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -312,7 +312,7 @@ class JobControllerApiHandlerHelper {
                 if ( ! change.isEmpty()) {
                     change.platform().ifPresent(version -> deployingObject.setString("platform", version.toFullString()));
                     change.revision().ifPresent(revision -> toSlime(deployingObject.setObject("application"), application.revisions().get(revision)));
-                    if (change.isPinned()) deployingObject.setBool("pinned", true);
+                    if (change.isPlatformPinned()) deployingObject.setBool("pinned", true);
                 }
 
                 Cursor latestVersionsObject = stepObject.setObject("latestVersions");
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 069ee58e9c5..4a33a08a25c 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
@@ -171,7 +171,7 @@ public class DeploymentApiHandler extends ThreadedHttpRequestHandler {
                       instanceObject.setString("application", instance.application().value());
                       instanceObject.setString("instance", instance.instance().value());
                       instanceObject.setBool("upgrading", status.application().require(instance.instance()).change().platform().equals(Optional.of(statistics.version())));
-                      instanceObject.setBool("pinned", status.application().require(instance.instance()).change().isPinned());
+                      instanceObject.setBool("pinned", status.application().require(instance.instance()).change().isPlatformPinned());
                       DeploymentStatus.StepStatus stepStatus = status.instanceSteps().get(instance.instance());
                       if (stepStatus != null) { // Instance may not have any steps, i.e. an empty deployment spec has been submitted
                           Readiness platformReadiness = stepStatus.blockedUntil(Change.of(statistics.version()));