(Locked)?Application(Serializer|List)? renamed with Instance

1 files changed, 0 insertions, 288 deletions

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
deleted file mode 100644
index 88fc6307a84..00000000000
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
+++ /dev/null
@@ -1,288 +0,0 @@
-// 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;
-
-import com.yahoo.component.Version;
-import com.yahoo.config.application.api.DeploymentSpec;
-import com.yahoo.config.application.api.ValidationOverrides;
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ClusterSpec;
-import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.vespa.curator.Lock;
-import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
-import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
-import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId;
-import com.yahoo.vespa.hosted.controller.api.integration.organization.User;
-import com.yahoo.vespa.hosted.controller.application.AssignedRotation;
-import com.yahoo.vespa.hosted.controller.application.Change;
-import com.yahoo.vespa.hosted.controller.application.ClusterInfo;
-import com.yahoo.vespa.hosted.controller.application.ClusterUtilization;
-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.metric.ApplicationMetrics;
-import com.yahoo.vespa.hosted.controller.rotation.RotationStatus;
-
-import java.time.Instant;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
-
-/**
- * An application that has been locked for modification. Provides methods for modifying an application's fields.
- *
- * @author mpolden
- * @author jonmv
- */
-public class LockedApplication {
-
-    private final Lock lock;
-    private final ApplicationId id;
-    private final Instant createdAt;
-    private final DeploymentSpec deploymentSpec;
-    private final ValidationOverrides validationOverrides;
-    private final Map<ZoneId, Deployment> deployments;
-    private final DeploymentJobs deploymentJobs;
-    private final Change change;
-    private final Change outstandingChange;
-    private final Optional<IssueId> ownershipIssueId;
-    private final Optional<User> owner;
-    private final OptionalInt majorVersion;
-    private final ApplicationMetrics metrics;
-    private final Optional<String> pemDeployKey;
-    private final List<AssignedRotation> rotations;
-    private final RotationStatus rotationStatus;
-
-    /**
-     * Used to create a locked application
-     *
-     * @param instance The application to lock.
-     * @param lock The lock for the application.
-     */
-    LockedApplication(Instance instance, Lock lock) {
-        this(Objects.requireNonNull(lock, "lock cannot be null"), instance.id(), instance.createdAt(),
-             instance.deploymentSpec(), instance.validationOverrides(),
-             instance.deployments(),
-             instance.deploymentJobs(), instance.change(), instance.outstandingChange(),
-             instance.ownershipIssueId(), instance.owner(), instance.majorVersion(), instance.metrics(),
-             instance.pemDeployKey(), instance.rotations(), instance.rotationStatus());
-    }
-
-    private LockedApplication(Lock lock, ApplicationId id, Instant createdAt,
-                              DeploymentSpec deploymentSpec, ValidationOverrides validationOverrides,
-                              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, RotationStatus rotationStatus) {
-        this.lock = lock;
-        this.id = id;
-        this.createdAt = createdAt;
-        this.deploymentSpec = deploymentSpec;
-        this.validationOverrides = validationOverrides;
-        this.deployments = deployments;
-        this.deploymentJobs = deploymentJobs;
-        this.change = change;
-        this.outstandingChange = outstandingChange;
-        this.ownershipIssueId = ownershipIssueId;
-        this.owner = owner;
-        this.majorVersion = majorVersion;
-        this.metrics = metrics;
-        this.pemDeployKey = pemDeployKey;
-        this.rotations = rotations;
-        this.rotationStatus = rotationStatus;
-    }
-
-    /** Returns a read-only copy of this */
-    public Instance get() {
-        return new Instance(id, createdAt, deploymentSpec, validationOverrides, deployments, deploymentJobs, change,
-                            outstandingChange, ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                            rotations, rotationStatus);
-    }
-
-    public LockedApplication withBuiltInternally(boolean builtInternally) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs.withBuiltInternally(builtInternally), change, outstandingChange,
-                                     ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    public LockedApplication withProjectId(OptionalLong projectId) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs.withProjectId(projectId), change, outstandingChange,
-                                     ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    public LockedApplication withDeploymentIssueId(IssueId issueId) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs.with(issueId), change, outstandingChange,
-                                     ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    public LockedApplication withJobPause(JobType jobType, OptionalLong pausedUntil) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs.withPause(jobType, pausedUntil), change, outstandingChange,
-                                     ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    public LockedApplication withJobCompletion(long projectId, JobType jobType, JobStatus.JobRun completion,
-                                               Optional<DeploymentJobs.JobError> jobError) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs.withCompletion(projectId, jobType, completion, jobError),
-                                     change, outstandingChange, ownershipIssueId, owner, majorVersion, metrics,
-                                     pemDeployKey, rotations, rotationStatus);
-    }
-
-    public LockedApplication withJobTriggering(JobType jobType, JobStatus.JobRun job) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs.withTriggering(jobType, job), change, outstandingChange,
-                                     ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    public LockedApplication withNewDeployment(ZoneId zone, ApplicationVersion applicationVersion, Version version,
-                                               Instant instant, Map<DeploymentMetrics.Warning, Integer> warnings) {
-        // Use info from previous deployment if available, otherwise create a new one.
-        Deployment previousDeployment = deployments.getOrDefault(zone, new Deployment(zone, applicationVersion,
-                                                                                      version, instant));
-        Deployment newDeployment = new Deployment(zone, applicationVersion, version, instant,
-                                                  previousDeployment.clusterUtils(),
-                                                  previousDeployment.clusterInfo(),
-                                                  previousDeployment.metrics().with(warnings),
-                                                  previousDeployment.activity());
-        return with(newDeployment);
-    }
-
-    public LockedApplication withClusterUtilization(ZoneId zone, Map<ClusterSpec.Id, ClusterUtilization> clusterUtilization) {
-        Deployment deployment = deployments.get(zone);
-        if (deployment == null) return this;    // No longer deployed in this zone.
-        return with(deployment.withClusterUtils(clusterUtilization));
-    }
-
-    public LockedApplication withClusterInfo(ZoneId zone, Map<ClusterSpec.Id, ClusterInfo> clusterInfo) {
-        Deployment deployment = deployments.get(zone);
-        if (deployment == null) return this;    // No longer deployed in this zone.
-        return with(deployment.withClusterInfo(clusterInfo));
-
-    }
-
-    public LockedApplication recordActivityAt(Instant instant, ZoneId zone) {
-        Deployment deployment = deployments.get(zone);
-        if (deployment == null) return this;
-        return with(deployment.recordActivityAt(instant));
-    }
-
-    public LockedApplication with(ZoneId zone, DeploymentMetrics deploymentMetrics) {
-        Deployment deployment = deployments.get(zone);
-        if (deployment == null) return this;    // No longer deployed in this zone.
-        return with(deployment.withMetrics(deploymentMetrics));
-    }
-
-    public LockedApplication withoutDeploymentIn(ZoneId zone) {
-        Map<ZoneId, Deployment> deployments = new LinkedHashMap<>(this.deployments);
-        deployments.remove(zone);
-        return with(deployments);
-    }
-
-    public LockedApplication withoutDeploymentJob(JobType jobType) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs.without(jobType), change, outstandingChange,
-                                     ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    public LockedApplication with(DeploymentSpec deploymentSpec) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange,
-                                     ownershipIssueId, owner, majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    public LockedApplication with(ValidationOverrides validationOverrides) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    public LockedApplication withChange(Change change) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    public LockedApplication withOutstandingChange(Change outstandingChange) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    public LockedApplication withOwnershipIssueId(IssueId issueId) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, Optional.ofNullable(issueId), owner,
-                                     majorVersion, metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    public LockedApplication withOwner(User owner) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId,
-                                     Optional.ofNullable(owner), majorVersion, metrics, pemDeployKey,
-                                     rotations, rotationStatus);
-    }
-
-    /** Set a major version for this, or set to null to remove any major version override */
-    public LockedApplication withMajorVersion(Integer majorVersion) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner,
-                                     majorVersion == null ? OptionalInt.empty() : OptionalInt.of(majorVersion),
-                                     metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    public LockedApplication with(ApplicationMetrics metrics) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    public LockedApplication withPemDeployKey(String pemDeployKey) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, Optional.ofNullable(pemDeployKey), rotations, rotationStatus);
-    }
-
-    public LockedApplication with(List<AssignedRotation> assignedRotations) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, pemDeployKey, assignedRotations, rotationStatus);
-    }
-
-    public LockedApplication with(RotationStatus rotationStatus) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    /** Don't expose non-leaf sub-objects. */
-    private LockedApplication with(Deployment deployment) {
-        Map<ZoneId, Deployment> deployments = new LinkedHashMap<>(this.deployments);
-        deployments.put(deployment.zone(), deployment);
-        return with(deployments);
-    }
-
-    private LockedApplication with(Map<ZoneId, Deployment> deployments) {
-        return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
-                                     deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,
-                                     metrics, pemDeployKey, rotations, rotationStatus);
-    }
-
-    @Override
-    public String toString() {
-        return "application '" + id + "'";
-    }
-
-}