diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-05-06 09:11:04 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-05-06 09:11:04 +0200 |
commit | 61dfa5c4c2c7e897ea018c3baa2888e40a27282f (patch) | |
tree | 60717ece072b480d0aa3d5fe949eb1da43dde0a9 /configserver | |
parent | d55e63b95eb0379d02f8c7cec0311c19aea5aac6 (diff) |
Remove dead code
Diffstat (limited to 'configserver')
3 files changed, 1 insertions, 29 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 61ecfa16f66..dfc71c7fd9f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -8,12 +8,11 @@ import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.api.ContainerEndpoint; +import com.yahoo.config.model.api.EndpointCertificateSecrets; import com.yahoo.config.model.api.HostProvisioner; import com.yahoo.config.model.api.Model; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.config.model.api.EndpointCertificateSecrets; import com.yahoo.config.model.api.Provisioned; -import com.yahoo.config.model.api.TlsSecrets; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.DockerImage; @@ -125,9 +124,6 @@ public class ModelContextImpl implements ModelContext { public Optional<File> appDir() { return appDir; } @Override - public Optional<String> wantedDockerImageRepository() { return wantedDockerImageRepository.map(DockerImage::repository); } - - @Override public Optional<DockerImage> wantedDockerImageRepo() { return wantedDockerImageRepository; } @Override @@ -246,9 +242,6 @@ public class ModelContextImpl implements ModelContext { public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override - public Optional<TlsSecrets> tlsSecrets() { return endpointCertificateSecrets.map(TlsSecrets::new); } - - @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; } @Override @@ -283,13 +276,6 @@ public class ModelContextImpl implements ModelContext { return useThreePhaseUpdates; } - // TODO: Remove - @Override - public boolean useBucketSpaceMetric() { return true; } - - @Override - public boolean useNewAthenzFilter() { return true; } - @Override public Optional<AthenzDomain> athenzDomain() { return athenzDomain; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java index 7ce255910e6..307ec5c0c3c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java @@ -39,13 +39,6 @@ public class ProvisionerAdapter implements HostProvisioner { } @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) { - provisioned.add(cluster.id(), capacity); - return provisioner.prepare(applicationId, cluster, capacity.withGroups(groups), logger); - } - - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) { provisioned.add(cluster.id(), capacity); return provisioner.prepare(applicationId, cluster, capacity, logger); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java index 8ddfb1e8b09..fff129b04e4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java @@ -33,13 +33,6 @@ public class StaticProvisioner implements HostProvisioner { throw new UnsupportedOperationException("Allocating a single host from provisioning info is not supported"); } - - @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) { - return prepare(cluster, capacity.withGroups(groups), logger); - } - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) { List<HostSpec> hostsAlreadyAllocatedToCluster = |