Remove unused methods

7 files changed, 0 insertions, 73 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java
index 20378456094..312d885cf53 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java
@@ -123,10 +123,6 @@ public class ApplicationOwnershipConfirmer extends Maintainer {
                 .orElseThrow(() -> new IllegalStateException("No tenant found for application " + applicationId));
     }
 
-    protected User userFor(Tenant tenant) {
-        return User.from(tenant.name().value().replaceFirst(Tenant.userPrefix, ""));
-    }
-
     protected void store(IssueId issueId, TenantAndApplicationId applicationId) {
         controller().applications().lockApplicationIfPresent(applicationId, application ->
                 controller().applications().store(application.withOwnershipIssueId(issueId)));
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
index 8d0232afa58..d82cddb4779 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
@@ -95,8 +95,4 @@ public class NodeVersion {
         return Objects.hash(hostname, zone, currentVersion, wantedVersion, changedAt);
     }
 
-    public static NodeVersion empty(HostName hostname) {
-        return new NodeVersion(hostname, ZoneId.defaultId(), Version.emptyVersion, Version.emptyVersion, Instant.EPOCH);
-    }
-
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index ced05410bdb..cee492276af 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -60,7 +60,6 @@ import java.util.OptionalLong;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
 import java.util.logging.Handler;
 import java.util.logging.Logger;
 
@@ -193,27 +192,6 @@ public final class ControllerTester {
         controller = createController(curator, rotationsConfig, athenzDb, serviceRegistry);
     }
 
-    /** Creates the given tenant and application and deploys it */
-    public void createAndDeploy(String tenantName, String domainName, String applicationName, Environment environment, long projectId, Long propertyId) {
-        createAndDeploy(tenantName, domainName, applicationName, toZone(environment), projectId, propertyId);
-    }
-
-    /** Creates the given tenant and application and deploys it */
-    public void createAndDeploy(String tenantName, String domainName, String applicationName,
-                                    String instanceName, ZoneId zone, long projectId, Long propertyId) {
-        throw new AssertionError("Not supposed to use this");
-    }
-
-    /** Creates the given tenant and application and deploys it */
-    public void createAndDeploy(String tenantName, String domainName, String applicationName, ZoneId zone, long projectId, Long propertyId) {
-        createAndDeploy(tenantName, domainName, applicationName, "default", zone, projectId, propertyId);
-    }
-
-    /** Creates the given tenant and application and deploys it */
-    public void createAndDeploy(String tenantName, String domainName, String applicationName, Environment environment, long projectId) {
-        createAndDeploy(tenantName, domainName, applicationName, environment, projectId, null);
-    }
-
     /** Upgrade controller to given version */
     public void upgradeController(Version version, String commitSha, Instant commitDate) {
         for (var hostname : controller().curator().cluster()) {
@@ -360,14 +338,6 @@ public final class ControllerTester {
         return application;
     }
 
-    public void deploy(ApplicationId id, ZoneId zone) {
-        deploy(id, zone, new ApplicationPackage(new byte[0]));
-    }
-
-    public void deploy(ApplicationId id, ZoneId zone, ApplicationPackage applicationPackage) {
-        deploy(id, zone, applicationPackage, false);
-    }
-
     public void deploy(ApplicationId id, ZoneId zone, ApplicationPackage applicationPackage, boolean deployCurrentVersion) {
         deploy(id, zone, Optional.of(applicationPackage), deployCurrentVersion);
     }
@@ -383,10 +353,6 @@ public final class ControllerTester {
                                            new DeployOptions(false, version, false, deployCurrentVersion));
     }
 
-    public Supplier<Instance> application(ApplicationId application) {
-        return () -> controller().applications().requireInstance(application);
-    }
-
     private static Controller createController(CuratorDb curator, RotationsConfig rotationsConfig,
                                                AthenzDbMock athensDb,
                                                ServiceRegistryMock serviceRegistry) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MetricsMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MetricsMock.java
index 3c84b308886..1b9a450324e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MetricsMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MetricsMock.java
@@ -43,10 +43,6 @@ public class MetricsMock implements Metric {
         return ctx;
     }
 
-    public Map<Context, Map<String, Number>> getMetrics() {
-        return metrics;
-    }
-    
     /** Returns a zero-context metric by name, or null if it is not present */
     public Number getMetric(String name) {
         Map<String, Number> valuesForEmptyContext = metrics.get(createContext(Collections.emptyMap()));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
index cbb93a51bfd..69f4e0672bf 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
@@ -209,10 +209,6 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg
         return mockContactRetriever;
     }
 
-    public ArtifactRepositoryMock artifactRepositoryMock() {
-        return artifactRepositoryMock;
-    }
-
     public EndpointCertificateMock endpointCertificateMock() {
         return endpointCertificateMock;
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
index 9d4cf32befe..62b52d0d087 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
@@ -14,7 +14,6 @@ import com.yahoo.vespa.athenz.api.AthenzIdentity;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.athenz.ApplicationAction;
 import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzClientFactoryMock;
-import com.yahoo.vespa.hosted.controller.integration.ConfigServerMock;
 import com.yahoo.vespa.hosted.controller.integration.ServiceRegistryMock;
 import org.junit.ComparisonFailure;
 
@@ -46,17 +45,11 @@ public class ContainerTester {
         this.container = container;
         this.responseFilePath = responseFilePath;
     }
-    
-    public JDisc container() { return container; }
 
     public Controller controller() {
         return (Controller) container.components().getComponent(Controller.class.getName());
     }
 
-    public ConfigServerMock configServer() {
-        return serviceRegistry().configServerMock();
-    }
-
     public AthenzClientFactoryMock athenzClientFactory() {
         return (AthenzClientFactoryMock) container.components().getComponent(AthenzClientFactoryMock.class.getName());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
index 9e03a236f4a..ad8a3409eef 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.controller.restapi;
 import com.yahoo.application.Networking;
 import com.yahoo.application.container.JDisc;
 import com.yahoo.application.container.handler.Request;
-import com.yahoo.application.container.handler.Response;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
 import com.yahoo.vespa.athenz.api.AthenzUser;
@@ -14,13 +13,9 @@ import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzClientFact
 import org.junit.After;
 import org.junit.Before;
 
-import java.io.UncheckedIOException;
-import java.nio.charset.CharacterCodingException;
-
 import static com.yahoo.vespa.hosted.controller.integration.AthenzFilterMock.IDENTITY_HEADER_NAME;
 import static com.yahoo.vespa.hosted.controller.integration.AthenzFilterMock.OKTA_ACCESS_TOKEN_HEADER_NAME;
 import static com.yahoo.vespa.hosted.controller.integration.AthenzFilterMock.OKTA_IDENTITY_TOKEN_HEADER_NAME;
-import static org.junit.Assert.assertEquals;
 
 /**
  * Superclass of REST API tests which needs to set up a functional container instance.
@@ -150,17 +145,6 @@ public class ControllerContainerTest {
                "  </http>\n";
     }
 
-    protected void assertResponse(Request request, int responseStatus, String responseMessage) {
-        Response response = container.handleRequest(request);
-        // Compare both status and message at once for easier diagnosis
-        try {
-            assertEquals("status: " + responseStatus + "\nmessage: " + responseMessage,
-                         "status: " + response.getStatus() + "\nmessage: " + response.getBodyAsString());
-        } catch (CharacterCodingException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
     protected static Request authenticatedRequest(String uri) {
         return addIdentityToRequest(new Request(uri), defaultUser);
     }