Remove unused functionality

5 files changed, 9 insertions, 25 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
index 7c1d5fa8dbc..2eccf6b5643 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
@@ -30,7 +30,7 @@ public class ConfigResponseFactoryTest {
     }
 
     @Test
-    public void testUncompressedFacory() {
+    public void testUncompressedFactory() {
         UncompressedConfigResponseFactory responseFactory = new UncompressedConfigResponseFactory();
         ConfigResponse response = responseFactory.createResponse(ConfigPayload.empty(), def, 3, false);
         assertEquals(CompressionType.UNCOMPRESSED, response.getCompressionInfo().getCompressionType());
@@ -39,7 +39,7 @@ public class ConfigResponseFactoryTest {
     }
 
     @Test
-    public void testLZ4CompressedFacory() {
+    public void testLZ4CompressedFactory() {
         LZ4ConfigResponseFactory responseFactory = new LZ4ConfigResponseFactory();
         ConfigResponse response = responseFactory.createResponse(ConfigPayload.empty(), def, 3, false);
         assertEquals(CompressionType.LZ4, response.getCompressionInfo().getCompressionType());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessorTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessorTest.java
index 1a4d04d0323..28f111a04d2 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessorTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessorTest.java
@@ -35,8 +35,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class GetConfigProcessorTest {
 
@@ -49,9 +48,9 @@ public class GetConfigProcessorTest {
         rpc.response = new MockConfigResponse("foo"); // should be a sentinel config, but it does not matter for this test
 
         // one tenant, which has host1 assigned
-        boolean pretentToHaveLoadedApplications = true;
+        boolean pretendToHaveLoadedApplications = true;
         TenantName testTenant = TenantName.from("test");
-        rpc.onTenantCreate(testTenant, new MockTenantProvider(pretentToHaveLoadedApplications));
+        rpc.onTenantCreate(testTenant, new MockTenantProvider(pretendToHaveLoadedApplications));
         rpc.hostsUpdated(testTenant, Collections.singleton("host1"));
 
         {   // a config is returned normally
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java
index ebdee8f58e5..efd96db07d7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java
@@ -20,10 +20,8 @@ import java.util.*;
  */
 public class MockRequestHandler implements RequestHandler, ReloadHandler, TenantHandlerProvider {
 
-    volatile boolean throwException = false;
     private Set<ConfigKey<?>> allConfigs = new HashSet<>();
-    public volatile ConfigResponse responseConfig = null; // for some v1 mocking
-    public Map<ApplicationId, ConfigResponse> responses = new LinkedHashMap<>(); // for v3 mocking
+    public Map<ApplicationId, ConfigResponse> responses = new LinkedHashMap<>();
     private final boolean pretendToHaveLoadedAnyApplication;
 
     public MockRequestHandler() {
@@ -36,10 +34,6 @@ public class MockRequestHandler implements RequestHandler, ReloadHandler, Tenant
 
     @Override
     public ConfigResponse resolveConfig(ApplicationId appId, GetConfigRequest req, Optional<Version> vespaVersion) {
-        if (appId==null) {
-            checkThrow();
-            return responseConfig;
-        }
         return responses.get(appId);
     }
 
@@ -55,15 +49,7 @@ public class MockRequestHandler implements RequestHandler, ReloadHandler, Tenant
     public void removeApplicationsExcept(Set<ApplicationId> applicationIds) { }
 
     @Override
-    public void reloadConfig(ApplicationSet application) {
-        checkThrow();
-    }
-
-    private void checkThrow() {
-        if (throwException) {
-            throw new RuntimeException("foo");
-        }
-    }
+    public void reloadConfig(ApplicationSet application) { }
 
     @Override
     public Set<ConfigKey<?>> listNamedConfigs(ApplicationId appId, Optional<Version> vespaVersion, ConfigKey<?> key, boolean recursive) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
index 69349810a70..0998fdd4db2 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java
@@ -97,7 +97,6 @@ public class RpcServerTest extends TestWithRpc {
     }
 
     private void testGetConfig() {
-        ((MockRequestHandler)tenantProvider.getRequestHandler()).throwException = false;
         ConfigKey<?> key = new ConfigKey<>(SimpletypesConfig.class, "brim");
         ((MockRequestHandler)tenantProvider.getRequestHandler()).responses.put(ApplicationId.defaultId(), createResponse(true));
         JRTClientConfigRequest req = JRTClientConfigRequestV3.createFromRaw(new RawConfig(key, SimpletypesConfig.CONFIG_DEF_MD5),
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java
index 4d01f8a609d..ef97451457d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java
@@ -11,8 +11,8 @@ import com.yahoo.vespa.config.server.RequestHandler;
  */
 public class MockTenantProvider implements TenantHandlerProvider {
 
-    final MockRequestHandler requestHandler;
-    final MockReloadHandler reloadHandler;
+    private final MockRequestHandler requestHandler;
+    private final MockReloadHandler reloadHandler;
 
     public MockTenantProvider() {
         this(false);