diff options
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java index a29d6e566ae..cb2ffe1c2f9 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.modelfactory; -import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.ConfigChangeAction; @@ -13,13 +12,9 @@ import com.yahoo.config.model.api.ModelCreateResult; import com.yahoo.config.model.api.ModelFactory; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Version; -import com.yahoo.config.provision.Zone; import com.yahoo.log.LogLevel; -import com.yahoo.path.Path; import com.yahoo.vespa.config.server.application.ApplicationSet; -import com.yahoo.vespa.config.server.GlobalComponentRegistry; import com.yahoo.vespa.config.server.host.HostValidator; import com.yahoo.vespa.config.server.application.PermanentApplicationPackage; import com.yahoo.vespa.config.server.deploy.ModelContextImpl; @@ -29,13 +24,11 @@ import com.yahoo.vespa.config.server.provision.ProvisionerAdapter; import com.yahoo.vespa.config.server.session.FileDistributionFactory; import com.yahoo.vespa.config.server.session.PrepareParams; import com.yahoo.vespa.config.server.session.SessionContext; -import com.yahoo.vespa.config.server.tenant.Rotations; import java.io.File; import java.io.IOException; import java.util.List; import java.util.Optional; -import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -56,35 +49,6 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P private final Optional<ApplicationSet> currentActiveApplicationSet; private final ModelContext.Properties properties; - /** Construct from global component registry */ - public PreparedModelsBuilder(GlobalComponentRegistry globalComponentRegistry, - FileDistributionFactory fileDistributionFactory, - HostProvisionerProvider hostProvisionerProvider, - SessionContext context, - DeployLogger logger, - PrepareParams params, - Optional<ApplicationSet> currentActiveApplicationSet, - Path tenantPath) { - super(globalComponentRegistry.getModelFactoryRegistry()); - this.permanentApplicationPackage = globalComponentRegistry.getPermanentApplicationPackage(); - this.configDefinitionRepo = globalComponentRegistry.getConfigDefinitionRepo(); - this.fileDistributionFactory = fileDistributionFactory; - this.hostProvisionerProvider = hostProvisionerProvider; - - this.context = context; - this.logger = logger; - this.params = params; - this.currentActiveApplicationSet = currentActiveApplicationSet; - - Rotations rotationsSetFromZk = new Rotations(globalComponentRegistry.getCurator(), tenantPath); - Set<Rotation> rotationsSet = getRotations(params.rotations(), rotationsSetFromZk, params.getApplicationId()); - this.properties = createModelContextProperties(params.getApplicationId(), - globalComponentRegistry.getConfigserverConfig(), - globalComponentRegistry.getZone(), - rotationsSet); - } - - /** Construct with all dependencies passed separately */ public PreparedModelsBuilder(ModelFactoryRegistry modelFactoryRegistry, PermanentApplicationPackage permanentApplicationPackage, ConfigDefinitionRepo configDefinitionRepo, @@ -156,14 +120,6 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P .collect(Collectors.toList())); } - private Set<Rotation> getRotations(Set<Rotation> rotationsInRequestParameter, Rotations rotationsFromZk, ApplicationId applicationId) { - Set<Rotation> rotations = rotationsInRequestParameter; - if (rotationsInRequestParameter == null || rotationsInRequestParameter.isEmpty()) { - rotations = rotationsFromZk.readRotationsFromZooKeeper(applicationId); - } - return rotations; - } - private Optional<HostProvisioner> createHostProvisionerAdapter(ModelContext.Properties properties) { return hostProvisionerProvider.getHostProvisioner().map( provisioner -> new ProvisionerAdapter(provisioner, properties.applicationId())); |