Rename RotationStatus -> RotationState

9 files changed, 45 insertions, 45 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 d5547130438..881a2afb27a 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
@@ -22,7 +22,7 @@ import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
 import com.yahoo.vespa.hosted.controller.application.EndpointList;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 
 import java.time.Instant;
 import java.util.Collections;
@@ -59,7 +59,7 @@ public class Application {
     private final ApplicationMetrics metrics;
     private final Optional<String> pemDeployKey;
     private final List<AssignedRotation> rotations;
-    private final Map<HostName, RotationStatus> rotationStatus;
+    private final Map<HostName, RotationState> rotationStatus;
     private final Optional<ApplicationCertificate> applicationCertificate;
 
     /** Creates an empty application */
@@ -76,7 +76,7 @@ public class Application {
                        List<Deployment> deployments, DeploymentJobs deploymentJobs, Change change,
                        Change outstandingChange, Optional<IssueId> ownershipIssueId, Optional<User> owner,
                        OptionalInt majorVersion, ApplicationMetrics metrics, Optional<String> pemDeployKey,
-                       List<AssignedRotation> rotations, Map<HostName, RotationStatus> rotationStatus, 
+                       List<AssignedRotation> rotations, Map<HostName, RotationState> rotationStatus,
                        Optional<ApplicationCertificate> applicationCertificate) {
         this(id, createdAt, deploymentSpec, validationOverrides,
              deployments.stream().collect(Collectors.toMap(Deployment::zone, Function.identity())),
@@ -88,7 +88,7 @@ public class Application {
                 Map<ZoneId, Deployment> deployments, DeploymentJobs deploymentJobs, Change change,
                 Change outstandingChange, Optional<IssueId> ownershipIssueId, Optional<User> owner,
                 OptionalInt majorVersion, ApplicationMetrics metrics, Optional<String> pemDeployKey,
-                List<AssignedRotation> rotations, Map<HostName, RotationStatus> rotationStatus, Optional<ApplicationCertificate> applicationCertificate) {
+                List<AssignedRotation> rotations, Map<HostName, RotationState> rotationStatus, Optional<ApplicationCertificate> applicationCertificate) {
         this.id = Objects.requireNonNull(id, "id cannot be null");
         this.createdAt = Objects.requireNonNull(createdAt, "instant of creation cannot be null");
         this.deploymentSpec = Objects.requireNonNull(deploymentSpec, "deploymentSpec cannot be null");
@@ -221,12 +221,12 @@ public class Application {
     public Optional<String> pemDeployKey() { return pemDeployKey; }
 
     /** Returns the status of the global rotation assigned to this. Empty if this does not have a global rotation. */
-    public Map<HostName, RotationStatus> rotationStatus() {
+    public Map<HostName, RotationState> rotationStatus() {
         return rotationStatus;
     }
 
     /** Returns the global rotation status of given deployment */
-    public RotationStatus rotationStatus(Deployment deployment) {
+    public RotationState rotationStatus(Deployment deployment) {
         // Rotation status only contains VIP host names, one per zone in the system. The only way to map VIP hostname to
         // this deployment, and thereby determine rotation status, is to check if VIP hostname contains the
         // deployment's environment and region.
@@ -234,7 +234,7 @@ public class Application {
                              .filter(kv -> kv.getKey().value().contains(deployment.zone().value()))
                              .map(Map.Entry::getValue)
                              .findFirst()
-                             .orElse(RotationStatus.unknown);
+                             .orElse(RotationState.unknown);
     }
 
     public Optional<ApplicationCertificate> applicationCertificate() {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
index e8cb6621c13..2afbeb7b873 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
@@ -24,7 +24,7 @@ import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 
 import java.time.Instant;
 import java.util.LinkedHashMap;
@@ -58,7 +58,7 @@ public class LockedApplication {
     private final ApplicationMetrics metrics;
     private final Optional<String> pemDeployKey;
     private final List<AssignedRotation> rotations;
-    private final Map<HostName, RotationStatus> rotationStatus;
+    private final Map<HostName, RotationState> rotationStatus;
     private final Optional<ApplicationCertificate> applicationCertificate;
 
     /**
@@ -81,7 +81,7 @@ public class LockedApplication {
                               Map<ZoneId, Deployment> deployments, DeploymentJobs deploymentJobs, Change change,
                               Change outstandingChange, Optional<IssueId> ownershipIssueId, Optional<User> owner,
                               OptionalInt majorVersion, ApplicationMetrics metrics, Optional<String> pemDeployKey,
-                              List<AssignedRotation> rotations, Map<HostName, RotationStatus> rotationStatus, Optional<ApplicationCertificate> applicationCertificate) {
+                              List<AssignedRotation> rotations, Map<HostName, RotationState> rotationStatus, Optional<ApplicationCertificate> applicationCertificate) {
         this.lock = lock;
         this.id = id;
         this.createdAt = createdAt;
@@ -266,7 +266,7 @@ public class LockedApplication {
                                      metrics, pemDeployKey, assignedRotations, rotationStatus, applicationCertificate);
     }
 
-    public LockedApplication withRotationStatus(Map<HostName, RotationStatus> rotationStatus) {
+    public LockedApplication withRotationStatus(Map<HostName, RotationState> rotationStatus) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
                                      deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
                                      metrics, pemDeployKey, rotations, rotationStatus, applicationCertificate);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
index 40c16cbb8c9..b3f6a9546ca 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
@@ -9,7 +9,7 @@ import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.metrics.MetricsService;
 import com.yahoo.vespa.hosted.controller.application.Deployment;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -102,22 +102,22 @@ public class DeploymentMetricsMaintainer extends Maintainer {
     }
 
     /** Get global rotation status for application */
-    private Map<HostName, RotationStatus> rotationStatus(Application application) {
+    private Map<HostName, RotationState> rotationStatus(Application application) {
         return applications.rotationRepository().getRotation(application)
                            .map(rotation -> controller().metricsService().getRotationStatus(rotation.name()))
                            .map(rotationStatus -> {
-                               Map<HostName, RotationStatus> result = new TreeMap<>();
+                               Map<HostName, RotationState> result = new TreeMap<>();
                                rotationStatus.forEach((hostname, status) -> result.put(hostname, from(status)));
                                return result;
                            })
                            .orElseGet(Collections::emptyMap);
     }
 
-    private static RotationStatus from(com.yahoo.vespa.hosted.controller.api.integration.routing.RotationStatus status) {
+    private static RotationState from(com.yahoo.vespa.hosted.controller.api.integration.routing.RotationStatus status) {
         switch (status) {
-            case IN: return RotationStatus.in;
-            case OUT: return RotationStatus.out;
-            case UNKNOWN: return RotationStatus.unknown;
+            case IN: return RotationState.in;
+            case OUT: return RotationState.out;
+            case UNKNOWN: return RotationState.unknown;
             default: throw new IllegalArgumentException("Unknown API value for rotation status: " + status);
         }
     }
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 a4b7da2cd50..27de3cb18b9 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
@@ -32,7 +32,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobError;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 import com.yahoo.vespa.hosted.controller.rotation.RotationId;
 
 import java.time.Instant;
@@ -317,7 +317,7 @@ public class ApplicationSerializer {
             object.setBool(pinnedField, true);
     }
 
-    private void toSlime(Map<HostName, RotationStatus> rotationStatus, Cursor array) {
+    private void toSlime(Map<HostName, RotationState> rotationStatus, Cursor array) {
         rotationStatus.forEach((hostname, status) -> {
             Cursor object = array.addObject();
             object.setString("hostname", hostname.value());
@@ -355,7 +355,7 @@ public class ApplicationSerializer {
                                                             root.field(writeQualityField).asDouble());
         Optional<String> pemDeployKey = Serializers.optionalString(root.field(pemDeployKeyField));
         List<AssignedRotation> assignedRotations = assignedRotationsFromSlime(deploymentSpec, root);
-        Map<HostName, RotationStatus> rotationStatus = rotationStatusFromSlime(root.field(rotationStatusField));
+        Map<HostName, RotationState> rotationStatus = rotationStatusFromSlime(root.field(rotationStatusField));
         Optional<ApplicationCertificate> applicationCertificate = Serializers.optionalString(root.field(applicationCertificateField)).map(ApplicationCertificate::new);
 
         return new Application(id, createdAt, deploymentSpec, validationOverrides, deployments, deploymentJobs,
@@ -403,14 +403,14 @@ public class ApplicationSerializer {
         return Collections.unmodifiableMap(warnings);
     }
 
-    private Map<HostName, RotationStatus> rotationStatusFromSlime(Inspector object) {
+    private Map<HostName, RotationState> rotationStatusFromSlime(Inspector object) {
         if (!object.valid()) {
             return Collections.emptyMap();
         }
-        Map<HostName, RotationStatus> rotationStatus = new TreeMap<>();
+        Map<HostName, RotationState> rotationStatus = new TreeMap<>();
         object.traverse((ArrayTraverser) (idx, inspect) -> {
             HostName hostname = HostName.from(inspect.field("hostname").asString());
-            RotationStatus status = RotationStatus.valueOf(inspect.field("status").asString());
+            RotationState status = RotationState.valueOf(inspect.field("status").asString());
             rotationStatus.put(hostname, status);
         });
         return Collections.unmodifiableMap(rotationStatus);
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 f29ed8a49f0..a396088a9c4 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
@@ -60,7 +60,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.Endpoint;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 import com.yahoo.vespa.hosted.controller.application.RoutingPolicy;
 import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTrigger;
@@ -685,9 +685,9 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         object.setString("gitCommit", revision.get().commit());
     }
 
-    private void toSlime(RotationStatus status, Cursor object) {
+    private void toSlime(RotationState state, Cursor object) {
         Cursor bcpStatus = object.setObject("bcpStatus");
-        bcpStatus.setString("rotationStatus", status.name().toUpperCase());
+        bcpStatus.setString("rotationStatus", state.name().toUpperCase());
     }
 
     private URI monitoringSystemUri(DeploymentId deploymentId) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RotationStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/RotationState.java
index c9e174e7191..70e554cd30d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RotationStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rotation/RotationState.java
@@ -1,12 +1,12 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.application;
+package com.yahoo.vespa.hosted.controller.rotation;
 
 /**
- * Represents the health status of a global rotation.
+ * The possible states of a global rotation.
  *
  * @author mpolden
  */
-public enum RotationStatus {
+public enum RotationState {
 
     /** Rotation has status 'in' and is receiving traffic */
     in,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
index 637203f87cc..d75bb283fe6 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
@@ -9,7 +9,7 @@ import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
 import com.yahoo.vespa.hosted.controller.application.Deployment;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
 import com.yahoo.vespa.hosted.controller.integration.MetricsServiceMock;
@@ -115,21 +115,21 @@ public class DeploymentMetricsMaintainerTest {
         tester.controllerTester().metricsService().addRotation(assignedRotation);
 
         // No status gathered yet
-        assertEquals(RotationStatus.unknown, app.get().rotationStatus(deployment1.get()));
-        assertEquals(RotationStatus.unknown, app.get().rotationStatus(deployment2.get()));
+        assertEquals(RotationState.unknown, app.get().rotationStatus(deployment1.get()));
+        assertEquals(RotationState.unknown, app.get().rotationStatus(deployment2.get()));
 
         // One rotation out, one in
         metricsService.setZoneIn(assignedRotation, "proxy.prod.us-west-1.vip.test");
         metricsService.setZoneOut(assignedRotation,"proxy.prod.us-east-3.vip.test");
         maintainer.maintain();
-        assertEquals(RotationStatus.in, app.get().rotationStatus(deployment1.get()));
-        assertEquals(RotationStatus.out, app.get().rotationStatus(deployment2.get()));
+        assertEquals(RotationState.in, app.get().rotationStatus(deployment1.get()));
+        assertEquals(RotationState.out, app.get().rotationStatus(deployment2.get()));
 
         // All rotations in
         metricsService.setZoneIn(assignedRotation,"proxy.prod.us-east-3.vip.test");
         maintainer.maintain();
-        assertEquals(RotationStatus.in, app.get().rotationStatus(deployment1.get()));
-        assertEquals(RotationStatus.in, app.get().rotationStatus(deployment2.get()));
+        assertEquals(RotationState.in, app.get().rotationStatus(deployment1.get()));
+        assertEquals(RotationState.in, app.get().rotationStatus(deployment2.get()));
     }
 
     private static DeploymentMetricsMaintainer maintainer(Controller controller) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
index 85c87ec5fe2..721ff9d8118 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
@@ -29,7 +29,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobError;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 import com.yahoo.vespa.hosted.controller.rotation.RotationId;
 import org.junit.Test;
 
@@ -105,9 +105,9 @@ public class ApplicationSerializerTest {
 
         DeploymentJobs deploymentJobs = new DeploymentJobs(projectId, statusList, empty(), true);
 
-        Map<HostName, RotationStatus> rotationStatus = new TreeMap<>();
-        rotationStatus.put(HostName.from("rot1.fqdn"), RotationStatus.in);
-        rotationStatus.put(HostName.from("rot2.fqdn"), RotationStatus.out);
+        Map<HostName, RotationState> rotationStatus = new TreeMap<>();
+        rotationStatus.put(HostName.from("rot1.fqdn"), RotationState.in);
+        rotationStatus.put(HostName.from("rot2.fqdn"), RotationState.out);
 
         Application original = new Application(ApplicationId.from("t1", "a1", "i1"),
                                                Instant.now().truncatedTo(ChronoUnit.MILLIS),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 79fd06b52aa..6ce7d7202e8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -49,7 +49,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.application.EndpointId;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
-import com.yahoo.vespa.hosted.controller.application.RotationStatus;
+import com.yahoo.vespa.hosted.controller.rotation.RotationState;
 import com.yahoo.vespa.hosted.controller.application.RoutingPolicy;
 import com.yahoo.vespa.hosted.controller.athenz.ApplicationAction;
 import com.yahoo.vespa.hosted.controller.athenz.HostedAthenzIdentities;
@@ -1679,12 +1679,12 @@ public class ApplicationApiTest extends ControllerContainerTest {
                         applicationController.store(locked.withRotationStatus(rotationStatus(application))));
         });}
 
-    private Map<HostName, RotationStatus> rotationStatus(Application application) {
+    private Map<HostName, RotationState> rotationStatus(Application application) {
         return controllerTester.controller().applications().rotationRepository().getRotation(application)
                 .map(rotation -> controllerTester.controller().metricsService().getRotationStatus(rotation.name()))
                 .map(rotationStatus -> {
-                    Map<HostName, RotationStatus> result = new TreeMap<>();
-                    rotationStatus.forEach((hostname, status) -> result.put(hostname, RotationStatus.in));
+                    Map<HostName, RotationState> result = new TreeMap<>();
+                    rotationStatus.forEach((hostname, status) -> result.put(hostname, RotationState.in));
                     return result;
                 })
                 .orElseGet(Collections::emptyMap);