Fix unneeded exception in signatures

21 files changed, 28 insertions, 38 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java
index 214f0defedf..4b217e65777 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.config.server;
 
 import com.yahoo.config.ConfigInstance;
-import com.yahoo.config.ConfigurationRuntimeException;
 import com.yahoo.config.codegen.DefParser;
 import com.yahoo.config.codegen.InnerCNode;
 import com.yahoo.config.model.api.ConfigDefinitionRepo;
@@ -51,12 +50,8 @@ public class SuperModelController {
     public ConfigResponse resolveConfig(GetConfigRequest request) {
         ConfigKey<?> configKey = request.getConfigKey();
         InnerCNode targetDef = getConfigDefinition(request.getConfigKey(), request.getDefContent());
-        try {
-            ConfigPayload payload = model.getConfig(configKey);
-            return responseFactory.createResponse(payload, targetDef, generation);
-        } catch (IOException e) {
-            throw new ConfigurationRuntimeException("Unable to resolve config", e);
-        }
+        ConfigPayload payload = model.getConfig(configKey);
+        return responseFactory.createResponse(payload, targetDef, generation);
     }
 
     private InnerCNode getConfigDefinition(ConfigKey<?> configKey, DefContent defContent) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelGenerationCounter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelGenerationCounter.java
index 0527fc288f6..79dce228def 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelGenerationCounter.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelGenerationCounter.java
@@ -8,8 +8,6 @@ import com.yahoo.vespa.config.GenerationCounter;
 import com.yahoo.vespa.curator.recipes.CuratorCounter;
 import com.yahoo.vespa.curator.Curator;
 
-import java.util.logging.Logger;
-
 /**
  * Distributed global generation counter for the super model.
  *
@@ -72,7 +70,6 @@ public class SuperModelGenerationCounter implements GenerationCounter {
 
         public static class IncrementOperation implements Transaction.Operation {
 
-            private static final Logger log = Logger.getLogger(IncrementOperation.class.getName());
             private final CuratorCounter counter;
 
             public IncrementOperation(CuratorCounter counter) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java
index 09762e53a2e..814c29504ed 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java
@@ -43,7 +43,7 @@ public class ZKTenantApplications implements TenantApplications, PathChildrenCac
     private final ReloadHandler reloadHandler;
     private final TenantName tenant;
 
-    private ZKTenantApplications(Curator curator, Path tenantRoot, ReloadHandler reloadHandler, TenantName tenant) throws Exception {
+    private ZKTenantApplications(Curator curator, Path tenantRoot, ReloadHandler reloadHandler, TenantName tenant) {
         this.curator = curator;
         this.tenantRoot = tenantRoot;
         this.reloadHandler = reloadHandler;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index 0653254fdb5..ef475291cc7 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -361,7 +361,7 @@ public class ZooKeeperClient {
         configCurator.putData(rootPath.append(ZKApplicationPackage.allocatedHostsNode).append(version.toSerializedForm()).getAbsolute(), json);
     }
 
-    public void feedZKFileRegistries(Map<Version, FileRegistry> fileRegistryMap) throws IOException {
+    public void feedZKFileRegistries(Map<Version, FileRegistry> fileRegistryMap) {
         for (Map.Entry<Version, FileRegistry> versionFileRegistryEntry : fileRegistryMap.entrySet()) {
             feedZKFileRegistry(versionFileRegistryEntry.getKey(), versionFileRegistryEntry.getValue());
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
index 04e286ac96f..a1018fcd2da 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
@@ -31,7 +31,6 @@ import com.yahoo.vespa.config.util.ConfigUtils;
  * @since 5.1
  */
 public class HttpConfigRequest implements GetConfigRequest, TenantRequest {
-    private static final String DEFAULT_TENANT = "default";
     private static final String HTTP_PROPERTY_NOCACHE = "noCache";
     private final ConfigKey<?> key;
     private final ApplicationId appId;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
index e22f4a42776..51e574aef5d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.config.server.model;
 import com.yahoo.cloud.config.LbServicesConfig;
 import com.yahoo.cloud.config.RoutingConfig;
 import com.yahoo.config.ConfigInstance;
+import com.yahoo.config.ConfigurationRuntimeException;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.TenantName;
@@ -34,7 +35,7 @@ public class SuperModel implements LbServicesConfig.Producer, RoutingConfig.Prod
         this.zoneProd = new RoutingProducer(Collections.unmodifiableMap(models));
     }
 
-    public ConfigPayload getConfig(ConfigKey<?> configKey) throws IOException {
+    public ConfigPayload getConfig(ConfigKey<?> configKey) {
         // TODO: Override not applied, but not really necessary here
         if (configKey.equals(new ConfigKey<>(LbServicesConfig.class, configKey.getConfigId())))  {
             LbServicesConfig.Builder builder = new LbServicesConfig.Builder();
@@ -45,7 +46,7 @@ public class SuperModel implements LbServicesConfig.Producer, RoutingConfig.Prod
             getConfig(builder);
             return ConfigPayload.fromInstance(new RoutingConfig(builder));
         } else {
-            throw new RuntimeException(configKey + " is not valid when asking for config from SuperModel");
+            throw new ConfigurationRuntimeException(configKey + " is not valid when asking for config from SuperModel");
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
index 771099ef163..7395171e380 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
@@ -71,7 +71,7 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> implements Nod
                               Path sessionsPath,
                               TenantApplications applicationRepo,
                               MetricUpdater metricUpdater,
-                              ExecutorService executorService) throws Exception {
+                              ExecutorService executorService) {
         this.curator = curator;
         this.sessionsPath = sessionsPath;
         this.applicationRepo = applicationRepo;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java
index 773cf372097..68e837a4bf6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java
@@ -66,7 +66,7 @@ public class ServerCacheLoader {
      *
      * @param appPath the path to load config definitions from
      */
-    private void loadConfigDefinitionsFromPath(ServerCache cache, String appPath) throws InterruptedException {
+    private void loadConfigDefinitionsFromPath(ServerCache cache, String appPath) {
         if ( ! configCurator.exists(appPath)) return;
         for (String nodeName : configCurator.getChildren(appPath)) {
             String payload = configCurator.getData(appPath, nodeName);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
index bb2172c98f9..652f27ddaf4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
@@ -96,7 +96,7 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader {
 
     private LocalSession createSessionFromApplication(ApplicationPackage applicationPackage,
                                                       long sessionId,
-                                                      SessionZooKeeperClient sessionZKClient, TimeoutBudget timeoutBudget) throws Exception {
+                                                      SessionZooKeeperClient sessionZKClient, TimeoutBudget timeoutBudget) {
         log.log(LogLevel.DEBUG, Tenants.logPre(tenant) + "Creating session " + sessionId + " in ZooKeeper");
         sessionZKClient.createNewSession(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
         log.log(LogLevel.DEBUG, Tenants.logPre(tenant) + "Creating upload waiter for session " + sessionId);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
index 37dff639a35..b6e2b9621d8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
@@ -29,8 +29,12 @@ public class SessionStateWatcher implements NodeCacheListener {
     private final MetricUpdater metrics;
     private final Executor executor;
 
-    public SessionStateWatcher(Curator.FileCache fileCache, ReloadHandler reloadHandler, RemoteSession session, MetricUpdater metrics) throws Exception {
-        executor = Executors.newSingleThreadExecutor(ThreadFactoryFactory.getThreadFactory(SessionStateWatcher.class.getName() + "-" + session));
+    public SessionStateWatcher(Curator.FileCache fileCache,
+                               ReloadHandler reloadHandler,
+                               RemoteSession session,
+                               MetricUpdater metrics) {
+        executor = Executors.newSingleThreadExecutor(
+                ThreadFactoryFactory.getThreadFactory(SessionStateWatcher.class.getName() + "-" + session));
         this.fileCache = fileCache;
         this.reloadHandler = reloadHandler;
         this.session = session;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java
index 8264de0df01..5402b14a337 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java
@@ -330,7 +330,7 @@ public class Tenants implements ConnectionStateListener, PathChildrenCacheListen
         }
     }
 
-    public void close() throws IOException {
+    public void close() {
         directoryCache.close();
         pathChildrenExecutor.shutdown();
     }
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 22e3dbd9823..efd8b2f843b 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
@@ -82,10 +82,10 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
 
         private Curator curator = new MockCurator();
         private Optional<ConfigCurator> configCurator = Optional.empty();
-        private Metrics metrics = Metrics.createTestMetrics();;
+        private Metrics metrics = Metrics.createTestMetrics();
         private ConfigserverConfig configserverConfig = new ConfigserverConfig(new ConfigserverConfig.Builder()
                                                                                        .configServerDBDir(Files.createTempDir()
-                                                                                                               .getAbsolutePath()));;
+                                                                                                               .getAbsolutePath()));
         private ConfigDefinitionRepo defRepo = new StaticConfigDefinitionRepo();
         private TenantRequestHandlerTest.MockReloadListener reloadListener = new TenantRequestHandlerTest.MockReloadListener();
         private MockTenantListener tenantListener = new MockTenantListener();
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 7ccc3382be2..bb7560e3740 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
@@ -96,7 +96,7 @@ public class DeployTester {
     /**
      * Do the initial "deploy" with the existing API-less code as the deploy API doesn't support first deploys yet.
      */
-    public ApplicationId deployApp(String appName) throws InterruptedException, IOException {
+    public ApplicationId deployApp(String appName) {
         final Tenant tenant = tenant();
         LocalSession session = tenant.getSessionFactory().createSession(testApp, appName, new TimeoutBudget(Clock.systemUTC(), Duration.ofSeconds(60)));
         ApplicationId id = ApplicationId.from(tenant.getName(), ApplicationName.from(appName), InstanceName.defaultName());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java
index 4f551339983..32d2f3c9148 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java
@@ -53,7 +53,6 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
     protected PathProvider pathProvider;
     protected TenantApplications applicationRepo;
     protected String activatedMessage = " activated.";
-    protected String tenantMessage = "";
 
     @Test
     public void testThatPreviousSessionIsDeactivated() throws Exception {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java
index c5c0e53871d..2a3769ae978 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionPrepareHandlerTestBase.java
@@ -179,7 +179,7 @@ public abstract class SessionPrepareHandlerTestBase extends SessionHandlerTest {
         assertThat(SessionHandlerTest.getRenderedString(response), not(containsString(string)));
     }
 
-    public abstract SessionHandler createHandler() throws Exception;
+    public abstract SessionHandler createHandler();
 
-    public abstract SessionHandler createHandler(RemoteSessionRepo remoteSessionRepo) throws Exception ;
+    public abstract SessionHandler createHandler(RemoteSessionRepo remoteSessionRepo);
 }
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 3a6a69dd437..7ad691d648c 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
@@ -232,7 +232,7 @@ public class ApplicationHandlerTest {
         Assert.assertTrue(provisioner.activated);
     }
 
-    static void addMockApplication(Tenant tenant, ApplicationId applicationId, long sessionId) throws Exception {
+    static void addMockApplication(Tenant tenant, ApplicationId applicationId, long sessionId) {
         tenant.getApplicationRepo().createPutApplicationTransaction(applicationId, sessionId).commit();
         ApplicationPackage app = FilesApplicationPackage.fromFile(testApp);
         tenant.getLocalSessionRepo().addSession(new SessionHandlerTest.MockSession(sessionId, app, applicationId));
@@ -295,10 +295,6 @@ public class ApplicationHandlerTest {
                                 method);
     }
 
-    private void deleteAndAssertOKResponseMocked(ApplicationId applicationId) throws IOException {
-        deleteAndAssertOKResponseMocked(applicationId, true);
-    }
-
     private void deleteAndAssertOKResponseMocked(ApplicationId applicationId, boolean fullAppIdInUrl) throws IOException {
         long sessionId = tenants.tenantsCopy().get(applicationId.tenant()).getApplicationRepo().getSessionIdForApplication(applicationId);
         deleteAndAssertResponse(mockHandler, applicationId, Zone.defaultZone(), Response.Status.OK, null, fullAppIdInUrl);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index da3a75f8b02..5d364de28d3 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -53,7 +53,6 @@ public class SessionActiveHandlerTest extends SessionActiveHandlerTestBase {
         configCurator = ConfigCurator.create(curator);
         localRepo = new LocalSessionRepo(applicationRepo);
         pathPrefix = "/application/v2/tenant/" + tenant + "/session/";
-        tenantMessage = ",\"tenant\":\"" + tenant + "\"";
         pathProvider = new PathProvider(Path.createRoot());
         activatedMessage = " for tenant '" + tenant + "' activated.";
         hostProvisioner = new MockProvisioner();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index 3925b3d2db9..7e0edf3a446 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -166,12 +166,12 @@ public class SessionPrepareHandlerTest extends SessionPrepareHandlerTestBase {
     }
 
     @Override
-    public SessionHandler createHandler() throws Exception {
+    public SessionHandler createHandler() {
         return createHandler(addTestTenant());
     }
 
     @Override
-    public SessionHandler createHandler(RemoteSessionRepo remoteSessionRepo) throws Exception {
+    public SessionHandler createHandler(RemoteSessionRepo remoteSessionRepo) {
         return createHandler(addTenant(tenant, localRepo, remoteSessionRepo,
                 new SessionCreateHandlerTestBase.MockSessionFactory()));
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
index 3d585f65714..2eb27c6d51c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
@@ -47,7 +47,7 @@ public class TenantHandlerTest extends TenantTest {
         assertResponseEquals(response, "{\"message\":\"Tenant " + tenantName + " created.\"}");
     }
 
-    private HttpResponse putSync(HttpRequest testRequest) throws InterruptedException {
+    private HttpResponse putSync(HttpRequest testRequest) {
         return handler.handlePUT(testRequest);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TestTenantBuilder.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TestTenantBuilder.java
index 92ac2ccc480..cc417ab69e2 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TestTenantBuilder.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TestTenantBuilder.java
@@ -28,7 +28,7 @@ public class TestTenantBuilder {
     private GlobalComponentRegistry componentRegistry;
     private Map<TenantName, TenantBuilder> tenantMap = new HashMap<>();
 
-    public TestTenantBuilder() throws Exception {
+    public TestTenantBuilder() {
         componentRegistry = new TestComponentRegistry.Builder().build();
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
index 6205ac09c4c..1b14e7360e7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class ZKApplicationFileTest extends ApplicationFileTest {
 
-    private void feed(ConfigCurator zk, File dirToFeed) throws IOException {
+    private void feed(ConfigCurator zk, File dirToFeed) {
         assertTrue(dirToFeed.isDirectory());
         String appPath = "/0";
         zk.feedZooKeeper(dirToFeed, appPath + ConfigCurator.USERAPP_ZK_SUBPATH, null, true);