Rename isPinning to isPinned

7 files changed, 23 insertions, 23 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index f356069ed49..24c522d2e32 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -668,7 +668,7 @@ public class ApplicationController {
     private void validateRun(Application application, ZoneId zone, Version platformVersion, ApplicationVersion applicationVersion) {
         Deployment deployment = application.deployments().get(zone);
         if (   zone.environment().isProduction() && deployment != null
-            && (   platformVersion.compareTo(deployment.version()) < 0 && ! application.change().isPinning()
+            && (   platformVersion.compareTo(deployment.version()) < 0 && ! application.change().isPinned()
                 || applicationVersion.compareTo(deployment.applicationVersion()) < 0))
             throw new IllegalArgumentException(String.format("Rejecting deployment of %s to %s, as the requested versions (platform: %s, application: %s)" +
                                                              " are older than the currently deployed (platform: %s, application: %s).",
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java
index 64664842e85..677b4b4ba07 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java
@@ -65,7 +65,7 @@ public class ApplicationList {
 
     /** Returns the subset of applications which are not pinned to a certain Vespa version. */
     public ApplicationList notPinned() {
-        return listOf(list.stream().filter(application -> ! application.change().isPinning()));
+        return listOf(list.stream().filter(application -> ! application.change().isPinned()));
     }
 
     /** Returns the subset of applications which are currently not upgrading to the given version */
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 16159268f63..7b77105cc67 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
@@ -28,9 +28,9 @@ public final class Change {
     /** The application version we are changing to, or empty if none */
     private final Optional<ApplicationVersion> application;
 
-    private final boolean pinning;
+    private final boolean pinned;
 
-    private Change(Optional<Version> platform, Optional<ApplicationVersion> application, boolean pinning) {
+    private Change(Optional<Version> platform, Optional<ApplicationVersion> application, boolean pinned) {
         Objects.requireNonNull(platform, "platform cannot be null");
         Objects.requireNonNull(application, "application cannot be null");
         if (application.isPresent() && application.get().isUnknown()) {
@@ -38,15 +38,15 @@ public final class Change {
         }
         this.platform = platform;
         this.application = application;
-        this.pinning = pinning;
+        this.pinned = pinned;
     }
 
     public Change withoutPlatform() {
-        return new Change(Optional.empty(), application, pinning);
+        return new Change(Optional.empty(), application, pinned);
     }
 
     public Change withoutApplication() {
-        return new Change(platform, Optional.empty(), pinning);
+        return new Change(platform, Optional.empty(), pinned);
     }
 
     /** Returns whether a change should currently be deployed */
@@ -60,22 +60,22 @@ public final class Change {
     /** Returns the application version carried by this. */
     public Optional<ApplicationVersion> application() { return application; }
 
-    public boolean isPinning() { return pinning; }
+    public boolean isPinned() { return pinned; }
 
     /** 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 (pinning)
+        if (pinned)
             throw new IllegalArgumentException("Not allowed to set a platform version when pinned.");
 
-        return new Change(Optional.of(platformVersion), application, pinning);
+        return new Change(Optional.of(platformVersion), application, pinned);
     }
 
     /** Returns a version of this change which replaces or adds this application change */
     public Change with(ApplicationVersion applicationVersion) {
-        return new Change(platform, Optional.of(applicationVersion), pinning);
+        return new Change(platform, Optional.of(applicationVersion), pinned);
     }
 
     /** Returns a change with the versions of this, and with the platform version pinned. */
@@ -94,7 +94,7 @@ public final class Change {
             other = other.with(platform.get());
         if (application.isPresent())
             other = other.with(application.get());
-        if (pinning)
+        if (pinned)
             other = other.withPin();
         return other;
     }
@@ -104,20 +104,20 @@ public final class Change {
         if (this == o) return true;
         if (!(o instanceof Change)) return false;
         Change change = (Change) o;
-        return pinning == change.pinning &&
+        return pinned == change.pinned &&
                Objects.equals(platform, change.platform) &&
                Objects.equals(application, change.application);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(platform, application, pinning);
+        return Objects.hash(platform, application, pinned);
     }
 
     @Override
     public String toString() {
         StringJoiner changes = new StringJoiner(" and ");
-        if (pinning)
+        if (pinned)
             changes.add("pin to " + platform.map(Version::toString).orElse("current platform"));
         else
             platform.ifPresent(version -> changes.add("upgrade to " + version.toString()));
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 54076633e4e..f6f843cabcb 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
@@ -464,7 +464,7 @@ public class DeploymentTrigger {
      */
     public boolean isComplete(Change change, Application application, JobType jobType) {
         Optional<Deployment> existingDeployment = deploymentFor(application, jobType);
-        if (     change.isPinning()
+        if (     change.isPinned()
             &&   change.platform().isPresent()
             && ! existingDeployment.map(Deployment::version).equals(change.platform()))
             return false;
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 cb67006dd17..bef61dda875 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
@@ -127,7 +127,7 @@ public class Versions {
 
     private static Version targetPlatform(Application application, Change change, Optional<Deployment> deployment,
                                           Version defaultVersion) {
-        if (change.isPinning() && change.platform().isPresent())
+        if (change.isPinned() && change.platform().isPresent())
             return change.platform().get();
 
         return max(change.platform(), deployment.map(Deployment::version))
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 e7c111e2e3d..69ea36c7e3a 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
@@ -276,14 +276,14 @@ public class ApplicationSerializer {
     }
 
     private void toSlime(Change deploying, Cursor parentObject, String fieldName) {
-        if ( ! deploying.isPresent() && ! deploying.isPinning()) return;
+        if ( ! deploying.isPresent() && ! deploying.isPinned()) return;
 
         Cursor object = parentObject.setObject(fieldName);
         if (deploying.platform().isPresent())
             object.setString(versionField, deploying.platform().get().toString());
         if (deploying.application().isPresent())
             toSlime(deploying.application().get(), object);
-        if (deploying.isPinning())
+        if (deploying.isPinned())
             object.setBool(pinnedField, true);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
index 4088c61b0b6..6755a6f9ad5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
@@ -1150,7 +1150,7 @@ public class UpgraderTest {
 
         tester.deployCompletely(application, applicationPackage);
         assertFalse(tester.application(application.id()).change().isPresent());
-        assertTrue(tester.application(application.id()).change().isPinning());
+        assertTrue(tester.application(application.id()).change().isPinned());
         assertEquals(2, tester.application(application.id()).deployments().size());
 
         // Application does not upgrade.
@@ -1158,18 +1158,18 @@ public class UpgraderTest {
         tester.upgradeSystem(version1);
         tester.upgrader().maintain();
         assertFalse(tester.application(application.id()).change().isPresent());
-        assertTrue(tester.application(application.id()).change().isPinning());
+        assertTrue(tester.application(application.id()).change().isPinned());
 
         // New application package is deployed.
         tester.deployCompletely(application, applicationPackage, BuildJob.defaultBuildNumber + 1);
         assertFalse(tester.application(application.id()).change().isPresent());
-        assertTrue(tester.application(application.id()).change().isPinning());
+        assertTrue(tester.application(application.id()).change().isPinned());
 
         // Application upgrades to new version when pin is removed.
         tester.deploymentTrigger().cancelChange(application.id(), PIN);
         tester.upgrader().maintain();
         assertTrue(tester.application(application.id()).change().isPresent());
-        assertFalse(tester.application(application.id()).change().isPinning());
+        assertFalse(tester.application(application.id()).change().isPinned());
 
         // Application is pinned to new version, and upgrade is therefore not cancelled, even though confidence is broken.
         tester.deploymentTrigger().forceChange(application.id(), Change.empty().withPin());