diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-05-26 15:24:59 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-05-26 15:24:59 +0200 |
| commit | 75e89b175b284400dcc4d2007e96548807639b7c (patch) | |
| tree | f5d21b81ad83e71b5a0f650186c5279d3d805143 /configserver | |
| parent | a19e2325ed17b25df740b223d96eeea14f895e70 (diff) | |
GC unused parameter tenantListener
Diffstat (limited to 'configserver')
3 files changed, 4 insertions, 10 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java index 5c0207878f1..f878831b8c5 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java @@ -76,8 +76,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> { ConfigserverConfig configserverConfig, Zone zone, ModelFactoryRegistry modelFactoryRegistry, - ConfigDefinitionRepo configDefinitionRepo, - TenantListener tenantListener) { + ConfigDefinitionRepo configDefinitionRepo) { super(modelFactoryRegistry, configserverConfig, zone, 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 cb46d65c4c5..7d74b53fdff 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 @@ -121,7 +121,6 @@ public class SessionRepository { private final Zone zone; private final ModelFactoryRegistry modelFactoryRegistry; private final ConfigDefinitionRepo configDefinitionRepo; - private final TenantListener tenantListener; public SessionRepository(TenantName tenantName, TenantApplications applicationRepo, @@ -139,8 +138,7 @@ public class SessionRepository { Zone zone, Clock clock, ModelFactoryRegistry modelFactoryRegistry, - ConfigDefinitionRepo configDefinitionRepo, - TenantListener tenantListener) { + ConfigDefinitionRepo configDefinitionRepo) { this.tenantName = tenantName; this.configCurator = configCurator; sessionCounter = new SessionCounter(configCurator, tenantName); @@ -163,7 +161,6 @@ public class SessionRepository { this.zone = zone; this.modelFactoryRegistry = modelFactoryRegistry; this.configDefinitionRepo = configDefinitionRepo; - this.tenantListener = tenantListener; loadSessions(); // Needs to be done before creating cache below this.directoryCache = curator.createDirectoryCache(sessionsPath.getAbsolute(), false, false, zkCacheExecutor); @@ -502,8 +499,7 @@ public class SessionRepository { configserverConfig, zone, modelFactoryRegistry, - configDefinitionRepo, - tenantListener); + configDefinitionRepo); // Read hosts allocated on the config server instance which created this SettableOptional<AllocatedHosts> allocatedHosts = new SettableOptional<>(applicationPackage.getAllocatedHosts()); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java index 1c1d2534341..21db290d5e8 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java @@ -357,8 +357,7 @@ public class TenantRepository { zone, clock, modelFactoryRegistry, - configDefinitionRepo, - tenantListener); + configDefinitionRepo); log.log(Level.INFO, "Adding tenant '" + tenantName + "'" + ", created " + created + ". Bootstrapping in " + Duration.between(start, Instant.now())); Tenant tenant = new Tenant(tenantName, sessionRepository, applicationRepo, created); |