Cleanup and simplify

8 files changed, 13 insertions, 23 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 9865cda7bc9..9c33080122c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -4,8 +4,8 @@ package com.yahoo.vespa.config.server;
 import ai.vespa.http.DomainName;
 import ai.vespa.http.HttpURL;
 import ai.vespa.http.HttpURL.Query;
-import ai.vespa.util.http.hc5.VespaHttpClientBuilder;
 import ai.vespa.util.http.hc5.DefaultHttpClientBuilder;
+import ai.vespa.util.http.hc5.VespaHttpClientBuilder;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.Version;
 import com.yahoo.component.annotation.Inject;
@@ -94,10 +94,8 @@ import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.orchestrator.Orchestrator;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.message.BasicHeader;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -229,7 +227,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     // Should be used by tests only (first constructor in this class makes sure we use injectable components where possible)
     public static class Builder {
         private TenantRepository tenantRepository;
-        private Optional<Provisioner> hostProvisioner;
+        private Optional<Provisioner> hostProvisioner = Optional.empty();
         private HttpProxy httpProxy = new HttpProxy(new SimpleHttpFetcher(Duration.ofSeconds(30)));
         private EndpointsChecker endpointsChecker = __ -> { throw new UnsupportedOperationException(); };
         private Clock clock = Clock.systemUTC();
@@ -253,13 +251,13 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         }
 
         public Builder withProvisioner(Provisioner provisioner) {
-            if (this.hostProvisioner != null) throw new IllegalArgumentException("provisioner already set in builder");
+            if (this.hostProvisioner.isPresent()) throw new IllegalArgumentException("provisioner already set in builder");
             this.hostProvisioner = Optional.ofNullable(provisioner);
             return this;
         }
 
         public Builder withHostProvisionerProvider(HostProvisionerProvider hostProvisionerProvider) {
-            if (this.hostProvisioner != null) throw new IllegalArgumentException("provisioner already set in builder");
+            if (this.hostProvisioner.isPresent()) throw new IllegalArgumentException("provisioner already set in builder");
             this.hostProvisioner = hostProvisionerProvider.getHostProvisioner();
             return this;
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java
index 9229fb88b40..5547156721a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java
@@ -42,11 +42,6 @@ public class HostProvisionerProvider {
     }
 
     // for testing
-    public static HostProvisionerProvider withProvisioner(Provisioner provisioner, boolean hostedVespa) {
-        return withProvisioner(provisioner, new ConfigserverConfig(new ConfigserverConfig.Builder().hostedVespa(hostedVespa)));
-    }
-
-    // for testing
     public static HostProvisionerProvider withProvisioner(Provisioner provisioner, ConfigserverConfig config) {
         ComponentRegistry<Provisioner> registry = new ComponentRegistry<>();
         registry.register(ComponentId.createAnonymousComponentId("foobar"), provisioner);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index ab527833803..318181dd624 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -296,7 +296,8 @@ public class DeployTester {
                     .withZone(zone)
                     .withFlagSource(flagSource);
 
-            if (configserverConfig.hostedVespa()) builder.withHostProvisionerProvider(HostProvisionerProvider.withProvisioner(provisioner, true));
+            if (configserverConfig.hostedVespa())
+                builder.withHostProvisionerProvider(HostProvisionerProvider.withProvisioner(provisioner, configserverConfig));
 
             TenantRepository tenantRepository = builder.build();
             tenantRepository.addTenant(tenantName);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index c270b4559f9..f00391f22d9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -89,7 +89,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -136,7 +135,7 @@ public class ApplicationHandlerTest {
                 .withClock(clock)
                 .withConfigserverConfig(configserverConfig)
                 .withFileDistributionFactory(new MockFileDistributionFactory(configserverConfig))
-                .withHostProvisionerProvider(HostProvisionerProvider.withProvisioner(provisioner, false))
+                .withHostProvisionerProvider(HostProvisionerProvider.empty())
                 .withModelFactoryRegistry(new ModelFactoryRegistry(modelFactories))
                 .build();
         tenantRepository.addTenant(mytenantName);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
index 9aae64cb884..a0b5b879e45 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
@@ -9,7 +9,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.vespa.config.server.ApplicationRepository;
-import com.yahoo.vespa.config.server.MockProvisioner;
 import com.yahoo.vespa.config.server.application.OrchestratorMock;
 import com.yahoo.vespa.config.server.http.HandlerTest;
 import com.yahoo.vespa.config.server.http.HttpConfigRequest;
@@ -23,7 +22,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
@@ -60,15 +58,13 @@ public class HttpGetConfigHandlerTest {
                 .configDefinitionsDir(temporaryFolder.newFolder().getAbsolutePath())
                 .fileReferencesDir(temporaryFolder.newFolder().getAbsolutePath())
                 .build();
-        MockProvisioner provisioner = new MockProvisioner();
         TenantRepository tenantRepository = new TestTenantRepository.Builder()
                 .withConfigserverConfig(configserverConfig)
-                .withHostProvisionerProvider(HostProvisionerProvider.withProvisioner(provisioner, false))
+                .withHostProvisionerProvider(HostProvisionerProvider.empty())
                 .build();
         tenantRepository.addTenant(tenant);
         ApplicationRepository applicationRepository = new ApplicationRepository.Builder()
                 .withTenantRepository(tenantRepository)
-                .withProvisioner(provisioner)
                 .withOrchestrator(new OrchestratorMock())
                 .withConfigserverConfig(configserverConfig)
                 .build();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/MaintainerTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/MaintainerTester.java
index a2dc0216b72..7b4c4b32ca7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/MaintainerTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/MaintainerTester.java
@@ -41,7 +41,7 @@ class MaintainerTester {
                 .build();
         tenantRepository = new TestTenantRepository.Builder()
                 .withClock(clock)
-                .withHostProvisionerProvider(HostProvisionerProvider.withProvisioner(provisioner, true))
+                .withHostProvisionerProvider(HostProvisionerProvider.withProvisioner(provisioner, configserverConfig))
                 .withConfigserverConfig(configserverConfig)
                 .withModelFactoryRegistry(new ModelFactoryRegistry(List.of(new DeployTester.CountingModelFactory(clock))))
                 .build();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index c7113bbf803..cc6cd4d86e9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -335,7 +335,9 @@ public class SessionPreparerTest {
 
     @Test(expected = LoadBalancerServiceException.class)
     public void require_that_conflict_is_returned_when_creating_load_balancer_fails() throws IOException {
-        preparer = createPreparer(HostProvisionerProvider.withProvisioner(new MockProvisioner().transientFailureOnPrepare(), true));
+        var configserverConfig = new ConfigserverConfig.Builder().hostedVespa(true).build();
+        MockProvisioner provisioner = new MockProvisioner().transientFailureOnPrepare();
+        preparer = createPreparer(HostProvisionerProvider.withProvisioner(provisioner, configserverConfig));
         var params = new PrepareParams.Builder().applicationId(applicationId("test")).build();
         prepare(new File("src/test/resources/deploy/hosted-app"), params);
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index 823466603b1..9af1bbb875e 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -13,7 +13,6 @@ import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.config.server.ConfigServerDB;
-import com.yahoo.vespa.config.server.MockProvisioner;
 import com.yahoo.vespa.config.server.MockSecretStore;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.TestConfigDefinitionRepo;
@@ -219,7 +218,7 @@ public class TenantRepositoryTest {
                   flagSource,
                   new InThreadExecutorService(),
                   new MockSecretStore(),
-                  HostProvisionerProvider.withProvisioner(new MockProvisioner(), false),
+                  HostProvisionerProvider.empty(),
                   configserverConfig,
                   new ConfigServerDB(configserverConfig),
                   Zone.defaultZone(),