diff options
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 8 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageValidator.java (renamed from controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentSpecValidator.java) | 14 |
2 files changed, 11 insertions, 11 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 c3028fcb216..cdd2eb2a332 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 @@ -49,9 +49,9 @@ import com.yahoo.vespa.hosted.controller.api.integration.dns.RecordName; import com.yahoo.vespa.hosted.controller.api.integration.routing.RoutingEndpoint; import com.yahoo.vespa.hosted.controller.api.integration.routing.RoutingGenerator; import com.yahoo.vespa.hosted.controller.application.ApplicationPackage; +import com.yahoo.vespa.hosted.controller.application.ApplicationPackageValidator; import com.yahoo.vespa.hosted.controller.application.Deployment; import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics; -import com.yahoo.vespa.hosted.controller.application.DeploymentSpecValidator; import com.yahoo.vespa.hosted.controller.application.Endpoint; import com.yahoo.vespa.hosted.controller.application.EndpointId; import com.yahoo.vespa.hosted.controller.application.JobList; @@ -130,7 +130,7 @@ public class ApplicationController { private final Clock clock; private final DeploymentTrigger deploymentTrigger; private final BooleanFlag provisionApplicationCertificate; - private final DeploymentSpecValidator deploymentSpecValidator; + private final ApplicationPackageValidator applicationPackageValidator; ApplicationController(Controller controller, CuratorDb curator, AccessControl accessControl, RotationsConfig rotationsConfig, @@ -148,7 +148,7 @@ public class ApplicationController { rotationRepository = new RotationRepository(rotationsConfig, this, curator); deploymentTrigger = new DeploymentTrigger(controller, controller.serviceRegistry().buildService(), clock); provisionApplicationCertificate = Flags.PROVISION_APPLICATION_CERTIFICATE.bindTo(controller.flagSource()); - deploymentSpecValidator = new DeploymentSpecValidator(controller); + applicationPackageValidator = new ApplicationPackageValidator(controller); // Update serialization format of all applications Once.after(Duration.ofMinutes(1), () -> { @@ -455,7 +455,7 @@ public class ApplicationController { /** Stores the deployment spec and validation overrides from the application package, and runs cleanup. */ public void storeWithUpdatedConfig(LockedApplication application, ApplicationPackage applicationPackage) { - deploymentSpecValidator.validate(applicationPackage.deploymentSpec()); + applicationPackageValidator.validate(applicationPackage); application = application.with(applicationPackage.deploymentSpec()); application = application.with(applicationPackage.validationOverrides()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentSpecValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageValidator.java index 5c4d5874e53..27d8f69108f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentSpecValidator.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackageValidator.java @@ -14,26 +14,26 @@ import java.util.Objects; import java.util.stream.Collectors; /** - * This contains validators for a {@link DeploymentSpec} that depend on a {@link Controller} to perform validation. + * This contains validators for a {@link ApplicationPackage} that depend on a {@link Controller} to perform validation. * * @author mpolden */ -public class DeploymentSpecValidator { +public class ApplicationPackageValidator { private final Controller controller; - public DeploymentSpecValidator(Controller controller) { + public ApplicationPackageValidator(Controller controller) { this.controller = Objects.requireNonNull(controller, "controller must be non-null"); } /** - * Validate the given deploymentSpec + * Validate the given application package * * @throws IllegalArgumentException if any validations fail */ - public void validate(DeploymentSpec deploymentSpec) { - validateSteps(deploymentSpec); - validateEndpoints(deploymentSpec); + public void validate(ApplicationPackage applicationPackage) { + validateSteps(applicationPackage.deploymentSpec()); + validateEndpoints(applicationPackage.deploymentSpec()); } /** Verify that each of the production zones listed in the deployment spec exist in this system */ |