diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-02-10 10:54:57 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-02-10 10:54:57 +0100 |
| commit | 4d74de92bf39aa834b93ee3a6aee7847b4de5d31 (patch) | |
| tree | 54109ffe6c3c4b7b5037117e07859139f9f3f20e /configserver/src/main/java/com | |
| parent | 8d8b273fdce76ac0bb01ffa1dc5b4e0957261372 (diff) | |
Simplify
Diffstat (limited to 'configserver/src/main/java/com')
2 files changed, 1 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java index cf6edc48f1d..5831cb3e75f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java @@ -402,8 +402,6 @@ public class TenantApplications implements RequestHandler, HostValidator { configActivationListener.verifyHostsAreAvailable(applicationId, newHosts); } - public HostValidator getHostValidator() { return this; } - public ApplicationId getApplicationIdForHostName(String hostname) { return hostRegistry.getKeyForHost(hostname); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index 306b24a3c69..a0597b77539 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -13,7 +13,6 @@ import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.config.model.application.provider.DeployData; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.Tags; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.secretstore.SecretStore; @@ -243,7 +242,7 @@ public class SessionRepository { ? Optional.empty() : Optional.of(sessionZooKeeperClient.createPrepareWaiter()); Optional<ApplicationSet> activeApplicationSet = getActiveApplicationSet(params.getApplicationId()); - ConfigChangeActions actions = sessionPreparer.prepare(applicationRepo.getHostValidator(), logger, params, + ConfigChangeActions actions = sessionPreparer.prepare(applicationRepo, logger, params, activeApplicationSet, now, getSessionAppDir(sessionId), session.getApplicationPackage(), sessionZooKeeperClient) .getConfigChangeActions(); |