From 21b1c45d63010d76e96bfa20551feda20d1505f7 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Fri, 19 Jul 2019 09:18:23 +0200 Subject: Remove rotations from LoadBalancer --- .../api/integration/configserver/LoadBalancer.java | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'controller-api') diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java index 1b0c0b9d982..0ad15e9cabe 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java @@ -1,15 +1,12 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.configserver; -import com.google.common.collect.ImmutableSortedSet; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.HostName; -import com.yahoo.config.provision.RotationName; import java.util.Objects; import java.util.Optional; -import java.util.Set; /** * Represents an exclusive load balancer, assigned to an application's cluster. @@ -23,19 +20,6 @@ public class LoadBalancer { private final ClusterSpec.Id cluster; private final HostName hostname; private final Optional dnsZone; - private final Set rotations; - - // TODO(mpolden): Kept for API compatibility with internal code. This constructor can be removed when all usages are - // TODO(mpolden): removed - public LoadBalancer(String id, ApplicationId application, ClusterSpec.Id cluster, HostName hostname, - Optional dnsZone, Set rotations) { - this.id = Objects.requireNonNull(id, "id must be non-null"); - this.application = Objects.requireNonNull(application, "application must be non-null"); - this.cluster = Objects.requireNonNull(cluster, "cluster must be non-null"); - this.hostname = Objects.requireNonNull(hostname, "hostname must be non-null"); - this.dnsZone = Objects.requireNonNull(dnsZone, "dnsZone must be non-null"); - this.rotations = ImmutableSortedSet.copyOf(Objects.requireNonNull(rotations, "rotations must be non-null")); - } public LoadBalancer(String id, ApplicationId application, ClusterSpec.Id cluster, HostName hostname, Optional dnsZone) { @@ -44,7 +28,6 @@ public class LoadBalancer { this.cluster = Objects.requireNonNull(cluster, "cluster must be non-null"); this.hostname = Objects.requireNonNull(hostname, "hostname must be non-null"); this.dnsZone = Objects.requireNonNull(dnsZone, "dnsZone must be non-null"); - this.rotations = Set.of(); } public String id() { @@ -67,8 +50,4 @@ public class LoadBalancer { return dnsZone; } - public Set rotations() { - return rotations; - } - } -- cgit v1.2.3