Removed redundant throws

6 files changed, 9 insertions, 14 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerInfoImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerInfoImpl.java
index fcfad041b76..29a0fb9fffc 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerInfoImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerInfoImpl.java
@@ -18,9 +18,8 @@ class ContainerInfoImpl implements Docker.ContainerInfo {
     @Override
     public Optional<Integer> getPid() {
         InspectContainerResponse.ContainerState state = inspectContainerResponse.getState();
-        Integer containerPid = -1;
         if (state.getRunning()) {
-            containerPid = state.getPid();
+            Integer containerPid = state.getPid();
             if (containerPid == null) {
                 throw new RuntimeException("PID of running container " + containerName + " is null");
             }
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index 587061488b6..337cbdadd77 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -120,7 +120,7 @@ public class DockerImpl implements Docker {
         return dockerConfigBuilder;
     }
 
-    private void setupDockerNetworkIfNeeded() throws IOException, InterruptedException {
+    private void setupDockerNetworkIfNeeded() throws IOException {
         if (! dockerClient.listNetworksCmd().withNameFilter(DOCKER_CUSTOM_MACVLAN_NETWORK_NAME).exec().isEmpty()) return;
 
         // Use IPv6 address if there is a mix of IP4 and IPv6 by taking the longest address.
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerNetworkCreator.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerNetworkCreator.java
index 03f8375e02d..7d767b689d6 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerNetworkCreator.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerNetworkCreator.java
@@ -11,10 +11,10 @@ import java.net.UnknownHostException;
 import java.util.Collections;
 
 /**
- * @author valerijf
+ * @author freva
  */
 class DockerNetworkCreator {
-    static InetAddress getDefaultGatewayLinux(boolean ipv6) throws IOException, InterruptedException {
+    static InetAddress getDefaultGatewayLinux(boolean ipv6) throws IOException {
         String command = ipv6 ? "route -A inet6 -n | grep 'UG[ \t]' | awk '{print $2}'" :
                 "route -n | grep 'UG[ \t]' | awk '{print $2}'";
 
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java
index b02f7f17686..523abe0f5ce 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerTestUtils.java
@@ -6,8 +6,6 @@ import com.yahoo.metrics.simple.MetricReceiver;
 import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
 
 /**
  * Helper class for testing full integration with docker daemon, requires running daemon. To run these tests:
@@ -69,7 +67,7 @@ public class DockerTestUtils {
                 .withName(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME).withDriver("bridge").withIpam(ipam).exec();
     }
 
-    public static void buildSimpleHttpServerDockerImage(DockerImpl docker, DockerImage dockerImage) throws IOException, ExecutionException, InterruptedException {
+    public static void buildSimpleHttpServerDockerImage(DockerImpl docker, DockerImage dockerImage) {
         try {
             docker.deleteImage(dockerImage);
         } catch (Exception e) {
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/VespaSSLConfig.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/VespaSSLConfig.java
index 1da95818393..a8db1de45c5 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/VespaSSLConfig.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/VespaSSLConfig.java
@@ -76,7 +76,7 @@ public class VespaSSLConfig implements SSLConfig {
     }
 
     public static KeyStore createKeyStore(final String keypem, final String certpem) throws NoSuchAlgorithmException,
-            InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
+            IOException, CertificateException, KeyStoreException {
         PrivateKey privateKey = loadPrivateKey(keypem);
         requireNonNull(privateKey);
         List<Certificate> privateCertificates = loadCertificates(certpem);
@@ -128,8 +128,7 @@ public class VespaSSLConfig implements SSLConfig {
     /**
      * Return private key ("key.pem") from Reader
      */
-    private static PrivateKey loadPrivateKey(final Reader reader) throws IOException, NoSuchAlgorithmException,
-            InvalidKeySpecException {
+    private static PrivateKey loadPrivateKey(final Reader reader) throws IOException, NoSuchAlgorithmException {
         try (PEMParser pemParser = new PEMParser(reader)) {
             Object readObject = pemParser.readObject();
             while (readObject != null) {
@@ -175,8 +174,7 @@ public class VespaSSLConfig implements SSLConfig {
     /**
      * Return KeyPair from "key.pem"
      */
-    private static PrivateKey loadPrivateKey(final String keypem) throws IOException, NoSuchAlgorithmException,
-            InvalidKeySpecException {
+    private static PrivateKey loadPrivateKey(final String keypem) throws IOException, NoSuchAlgorithmException {
         try (StringReader certReader = new StringReader(keypem);
              BufferedReader reader = new BufferedReader(certReader)) {
             return loadPrivateKey(reader);
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
index 72fe753c82b..e83270b5949 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
@@ -138,7 +138,7 @@ public class DockerImageGarbageCollectionTest {
             return this;
         }
 
-        private void expectUnusedImages(final String... imageIds) throws Exception {
+        private void expectUnusedImages(final String... imageIds) {
             final List<DockerImage> expectedUnusedImages = Arrays.stream(imageIds)
                     .map(DockerImage::new)
                     .collect(Collectors.toList());