From 909d83048528f1374ea81926d46ca5a7b4bc9d8c Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 15 Nov 2019 08:37:30 +0100 Subject: Remove dead code --- .../com/yahoo/config/model/api/ModelContext.java | 2 - .../com/yahoo/config/model/deploy/DeployState.java | 2 - config-provisioning/abi-spec.json | 15 -------- .../java/com/yahoo/config/provision/Rotation.java | 44 ---------------------- 4 files changed, 63 deletions(-) delete mode 100644 config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index bb42eb6da26..a53b0931cc6 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -7,7 +7,6 @@ import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; -import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Zone; import java.io.File; @@ -49,7 +48,6 @@ public interface ModelContext { String athenzDnsSuffix(); boolean hostedVespa(); Zone zone(); - default Set rotations() { return Set.of(); } // TODO(mpolden): Remove once 7.122 is the oldest config model Set endpoints(); boolean isBootstrap(); boolean isFirstTimeDeployment(); diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 0f43be96e73..b286b94c699 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -22,7 +22,6 @@ import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.provision.HostsXmlProvisioner; import com.yahoo.config.model.provision.SingleNodeProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; -import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Zone; import com.yahoo.io.IOUtils; import com.yahoo.io.reader.NamedReader; @@ -47,7 +46,6 @@ import java.io.UncheckedIOException; import java.time.Instant; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 4c1e6e3e08a..91907af75c4 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -759,21 +759,6 @@ ], "fields": [] }, - "com.yahoo.config.provision.Rotation": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void (java.lang.String)", - "public java.lang.String getId()", - "public boolean equals(java.lang.Object)", - "public int hashCode()", - "public java.lang.String toString()" - ], - "fields": [] - }, "com.yahoo.config.provision.SystemName": { "superClass": "java.lang.Enum", "interfaces": [], diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java deleted file mode 100644 index d1cf86c6d16..00000000000 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java +++ /dev/null @@ -1,44 +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.config.provision; - -import java.util.Objects; - -/** - * A rotation (virtual endpoint). - */ -// TODO(mpolden): Remove once 7.122 is the oldest config model -public class Rotation { - - private final String id; - - public Rotation(String id) { - this.id = Objects.requireNonNull(id, "Rotation id cannot be null"); - } - - public String getId() { - return id; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Rotation)) { - return false; - } - final Rotation that = (Rotation) o; - return (this.id.equals(that.id)); - } - - @Override - public int hashCode() { - return id.hashCode(); - } - - @Override - public String toString() { - return "rotation '" + id + "'"; - } - -} -- cgit v1.2.3