Cleanup

4 files changed, 15 insertions, 15 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
index d53c16d2ce6..4bfbb345516 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
@@ -276,7 +276,7 @@ public class Application {
         return true;
     }
     
-    /** Returns true if there is no outstanding change to deploy - i.e deploying is empty or completedly deployed */
+    /** Returns true if there is no current change to deploy - i.e deploying is empty or completely deployed */
     public boolean deployingCompleted() { 
         if ( ! deploying.isPresent()) return true;
         return deploymentJobs().isDeployed(deploying.get()); 
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 bc82451580a..bf067a39bbb 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
@@ -15,7 +15,7 @@ import java.util.Optional;
  */
 public abstract class Change {
 
-    /** Returns true if this change is blocked by the given spec art the given instant */
+    /** Returns true if this change is blocked by the given spec at the given instant */
     public abstract boolean blockedBy(DeploymentSpec deploymentSpec, Instant instant);
     
     /** A change to the application package revision of an application */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
index 0dac79964f7..e215e240372 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
@@ -52,8 +52,8 @@ public class DeploymentOrder {
             return Collections.emptyList();
         }
 
-        // Always trigger system test after component as deployment spec might not be available yet (e.g. if this is a
-        // new application with no previous deployments)
+        // Always trigger system test after component as deployment spec might not be available yet 
+        // (e.g. if this is a new application with no previous deployments)
         if (job == JobType.component) {
             return Collections.singletonList(JobType.systemTest);
         }
@@ -108,7 +108,7 @@ public class DeploymentOrder {
         // Step may not exist for all jobs, e.g. component
         return step.map(s -> s.equals(lastStep)).orElse(false);
     }
-    
+
     /** Returns jobs for given deployment spec, in the order they are declared */
     public List<JobType> jobsFrom(DeploymentSpec deploymentSpec) {
         return deploymentSpec.steps().stream()
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index 4394ae0498e..72bfa238094 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -28,7 +28,7 @@ public class ApplicationPackageBuilder {
     private Environment environment = Environment.prod;
     private final StringBuilder environmentBody = new StringBuilder();
     private final StringBuilder validationOverridesBody = new StringBuilder();
-    private final StringBuilder blockUpgrade = new StringBuilder();
+    private final StringBuilder blockChange = new StringBuilder();
     private String searchDefinition = "search test { }";
 
     public ApplicationPackageBuilder upgradePolicy(String upgradePolicy) {
@@ -64,13 +64,13 @@ public class ApplicationPackageBuilder {
 
     public ApplicationPackageBuilder blockChange(boolean revision, boolean version, 
                                                  String daySpec, String hourSpec, String zoneSpec) {
-        blockUpgrade.append("  <block-change");
-        blockUpgrade.append(" revision='").append(revision).append("'");
-        blockUpgrade.append(" version='").append(version).append("'");
-        blockUpgrade.append(" days='").append(daySpec).append("'");
-        blockUpgrade.append(" hours='").append(hourSpec).append("'");
-        blockUpgrade.append(" time-zone='").append(zoneSpec).append("'");
-        blockUpgrade.append("/>\n");
+        blockChange.append("  <block-change");
+        blockChange.append(" revision='").append(revision).append("'");
+        blockChange.append(" version='").append(version).append("'");
+        blockChange.append(" days='").append(daySpec).append("'");
+        blockChange.append(" hours='").append(hourSpec).append("'");
+        blockChange.append(" time-zone='").append(zoneSpec).append("'");
+        blockChange.append("/>\n");
         return this;
     }
 
@@ -82,7 +82,7 @@ public class ApplicationPackageBuilder {
         validationOverridesBody.append("</allow>\n");
         return this;
     }
-    
+
     /** Sets the content of the search definition test.sd */
     public ApplicationPackageBuilder searchDefinition(String testSearchDefinition) {
         this.searchDefinition = testSearchDefinition;
@@ -96,7 +96,7 @@ public class ApplicationPackageBuilder {
             xml.append(upgradePolicy);
             xml.append("'/>\n");
         }
-        xml.append(blockUpgrade);
+        xml.append(blockChange);
         xml.append("  <");
         xml.append(environment.value());
         xml.append(">\n");