diff options
Diffstat (limited to 'configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java')
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java index 5f00499598a..58bd1485dad 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java @@ -27,7 +27,6 @@ import java.time.Clock; import java.util.Collections; import java.util.Optional; -import static com.yahoo.vespa.config.server.SuperModelRequestHandlerTest.emptyNodeFlavors; /** * @author Ulf Lilleengen @@ -56,7 +55,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry { ModelFactoryRegistry modelFactoryRegistry, PermanentApplicationPackage permanentApplicationPackage, FileDistributionFactory fileDistributionFactory, - SuperModelGenerationCounter superModelGenerationCounter, HostRegistries hostRegistries, ConfigserverConfig configserverConfig, SessionPreparer sessionPreparer, @@ -72,7 +70,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry { this.configserverConfig = configserverConfig; this.reloadListener = reloadListener; this.tenantListener = tenantListener; - this.superModelGenerationCounter = superModelGenerationCounter; + this.superModelGenerationCounter = new SuperModelGenerationCounter(curator); this.defRepo = defRepo; this.permanentApplicationPackage = permanentApplicationPackage; this.hostRegistries = hostRegistries; @@ -88,7 +86,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry { public static class Builder { private Curator curator = new MockCurator(); - private Optional<ConfigCurator> configCurator = Optional.empty(); private Metrics metrics = Metrics.createTestMetrics(); private ConfigserverConfig configserverConfig = new ConfigserverConfig( new ConfigserverConfig.Builder() @@ -115,11 +112,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry { return this; } - public Builder configCurator(ConfigCurator configCurator) { - this.configCurator = Optional.ofNullable(configCurator); - return this; - } - public Builder metrics(Metrics metrics) { this.metrics = metrics; return this; @@ -155,21 +147,16 @@ public class TestComponentRegistry implements GlobalComponentRegistry { .orElse(new PermanentApplicationPackage(configserverConfig)); FileDistributionFactory fileDistributionFactory = this.fileDistributionFactory .orElse(new MockFileDistributionFactory(configserverConfig)); - HostProvisionerProvider hostProvisionerProvider = hostProvisioner.isPresent() ? - HostProvisionerProvider.withProvisioner(hostProvisioner.get()) : - HostProvisionerProvider.empty(); + HostProvisionerProvider hostProvisionerProvider = hostProvisioner. + map(HostProvisionerProvider::withProvisioner).orElseGet(HostProvisionerProvider::empty); SessionPreparer sessionPreparer = new SessionPreparer(modelFactoryRegistry, fileDistributionFactory, hostProvisionerProvider, permApp, configserverConfig, defRepo, curator, zone); - return new TestComponentRegistry(curator, configCurator.orElse(ConfigCurator.create(curator)), - metrics, modelFactoryRegistry, - permApp, - fileDistributionFactory, - new SuperModelGenerationCounter(curator), - hostRegistries, configserverConfig, sessionPreparer, - hostProvisioner, defRepo, reloadListener, - tenantListener, zone, clock); + return new TestComponentRegistry(curator, ConfigCurator.create(curator), metrics, modelFactoryRegistry, + permApp, fileDistributionFactory, hostRegistries, configserverConfig, + sessionPreparer, hostProvisioner, defRepo, reloadListener, tenantListener, + zone, clock); } } |