diff options
Diffstat (limited to 'controller-api/src/main')
3 files changed, 1 insertions, 48 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java index 086696fc6a4..852629768c5 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerClient.java @@ -7,7 +7,6 @@ import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions; import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.identifiers.Hostname; -import com.yahoo.vespa.hosted.controller.api.rotation.Rotation; import com.yahoo.vespa.serviceview.bindings.ApplicationView; import java.io.IOException; @@ -28,7 +27,7 @@ public interface ConfigServerClient { PrepareResponse prepareResponse(); } - PreparedApplication prepare(DeploymentId applicationInstance, DeployOptions deployOptions, Set<String> rotationCnames, Set<Rotation> rotations, byte[] content); + PreparedApplication prepare(DeploymentId applicationInstance, DeployOptions deployOptions, Set<String> rotationCnames, Set<String> rotationNames, byte[] content); List<String> getNodeQueryHost(DeploymentId applicationInstance, String type) throws NoInstanceException; diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/rotation/Rotation.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/rotation/Rotation.java deleted file mode 100644 index a1f78302e4b..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/rotation/Rotation.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.rotation; - -import com.yahoo.vespa.hosted.controller.api.identifiers.RotationId; - -import java.util.Objects; - -/** - * Represents a global routing rotation. - * - * @author Oyvind Gronnesby - */ -// TODO: Used in serialization (ConfigServerClient). This should be removed and config server client should use a -// Set<String> instead, like it does for CNAMEs. -public class Rotation { - - /** The ID of the allocated rotation. This value is generated by global routing system. */ - public final RotationId rotationId; - - /** The global name which the allocated rotation points to */ - public final String rotationName; - - public Rotation(RotationId rotationId, String rotationName) { - this.rotationId = Objects.requireNonNull(rotationId); - this.rotationName = Objects.requireNonNull(rotationName); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Rotation)) return false; - final Rotation rotation = (Rotation) o; - return rotationId.equals(rotation.rotationId) && rotationName.equals(rotation.rotationName); - } - - @Override - public int hashCode() { - return Objects.hash(rotationId, rotationName); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/rotation/package-info.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/rotation/package-info.java deleted file mode 100644 index 1626158a489..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/rotation/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.vespa.hosted.controller.api.rotation; - -import com.yahoo.osgi.annotation.ExportPackage; |