summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-07-04 14:30:23 +0200
committerMartin Polden <mpolden@mpolden.no>2018-07-04 14:54:20 +0200
commit4e67940cbe89f5c4d587479db33a0487acad1b60 (patch)
tree8ecee39c62b721b3e088b3cb38b8cd4bc7e3a339 /controller-server
parent73dd787a48f39a85fb44367ba8fc71fd18683337 (diff)
Clean up signature
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/EmptyJsonResponse.java4
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/NTokenValidatorTest.java3
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryClientMock.java35
3 files changed, 20 insertions, 22 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/EmptyJsonResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/EmptyJsonResponse.java
index 3e8d4182c42..be3222cc1a8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/EmptyJsonResponse.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/EmptyJsonResponse.java
@@ -2,9 +2,7 @@
package com.yahoo.vespa.hosted.controller.restapi.application;
import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.slime.Slime;
-import java.io.IOException;
import java.io.OutputStream;
/**
@@ -17,7 +15,7 @@ public class EmptyJsonResponse extends HttpResponse {
}
@Override
- public void render(OutputStream stream) throws IOException { }
+ public void render(OutputStream stream) {}
@Override
public String getContentType() { return "application/json"; }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/NTokenValidatorTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/NTokenValidatorTest.java
index a70c1572c21..510c806383c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/NTokenValidatorTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/athenz/filter/NTokenValidatorTest.java
@@ -13,7 +13,6 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.time.Instant;
import java.util.Optional;
@@ -34,7 +33,7 @@ public class NTokenValidatorTest {
public ExpectedException exceptionRule = ExpectedException.none();
@Test
- public void valid_token_is_accepted() throws NoSuchAlgorithmException, InvalidTokenException {
+ public void valid_token_is_accepted() throws InvalidTokenException {
NTokenValidator validator = new NTokenValidator(createKeystore());
NToken token = createNToken(IDENTITY, Instant.now(), TRUSTED_KEY.getPrivate(), "0");
AthenzPrincipal principal = validator.validate(token);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryClientMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryClientMock.java
index 330127b7670..1b12b441272 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryClientMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryClientMock.java
@@ -9,7 +9,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.noderepository.NodeRepo
import com.yahoo.vespa.hosted.controller.api.integration.noderepository.NodeState;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
-import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
@@ -17,28 +16,29 @@ import java.util.Collection;
* @author bjorncs
*/
public class NodeRepositoryClientMock implements NodeRepositoryClientInterface {
+
@Override
- public void addNodes(ZoneId zone, Collection<NodeRepositoryNode> nodes) throws IOException {
+ public void addNodes(ZoneId zone, Collection<NodeRepositoryNode> nodes) {
throw new UnsupportedOperationException();
}
@Override
- public NodeRepositoryNode getNode(ZoneId zone, String hostname) throws IOException {
+ public NodeRepositoryNode getNode(ZoneId zone, String hostname) {
throw new UnsupportedOperationException();
}
@Override
- public void deleteNode(ZoneId zone, String hostname) throws IOException {
+ public void deleteNode(ZoneId zone, String hostname) {
throw new UnsupportedOperationException();
}
@Override
- public NodeList listNodes(ZoneId zone, boolean recursive) throws IOException {
+ public NodeList listNodes(ZoneId zone, boolean recursive) {
throw new UnsupportedOperationException();
}
@Override
- public NodeList listNodes(ZoneId zone, String tenant, String applicationId, String instance) throws IOException {
+ public NodeList listNodes(ZoneId zone, String tenant, String applicationId, String instance) {
NodeRepositoryNode nodeA = createNodeA();
NodeRepositoryNode nodeB = createNodeB();
return new NodeList(Arrays.asList(nodeA, nodeB));
@@ -69,57 +69,58 @@ public class NodeRepositoryClientMock implements NodeRepositoryClientInterface {
}
@Override
- public String resetFailureInformation(ZoneId zone, String nodename) throws IOException {
+ public String resetFailureInformation(ZoneId zone, String nodename) {
throw new UnsupportedOperationException();
}
@Override
- public String restart(ZoneId zone, String nodename) throws IOException {
+ public String restart(ZoneId zone, String nodename) {
throw new UnsupportedOperationException();
}
@Override
- public String reboot(ZoneId zone, String nodename) throws IOException {
+ public String reboot(ZoneId zone, String nodename) {
throw new UnsupportedOperationException();
}
@Override
- public String cancelReboot(ZoneId zone, String nodename) throws IOException {
+ public String cancelReboot(ZoneId zone, String nodename) {
throw new UnsupportedOperationException();
}
@Override
- public String wantTo(ZoneId zone, String nodename, WantTo... actions) throws IOException {
+ public String wantTo(ZoneId zone, String nodename, WantTo... actions) {
throw new UnsupportedOperationException();
}
@Override
- public String cancelRestart(ZoneId zone, String nodename) throws IOException {
+ public String cancelRestart(ZoneId zone, String nodename) {
throw new UnsupportedOperationException();
}
@Override
- public String setHardwareFailureDescription(ZoneId zone, String nodename, String hardwareFailureDescription) throws IOException {
+ public String setHardwareFailureDescription(ZoneId zone, String nodename, String hardwareFailureDescription) {
throw new UnsupportedOperationException();
}
@Override
- public void setState(ZoneId zone, NodeState nodeState, String nodename) throws IOException {
+ public void setState(ZoneId zone, NodeState nodeState, String nodename) {
throw new UnsupportedOperationException();
}
@Override
- public String enableMaintenanceJob(ZoneId zone, String jobName) throws IOException {
+ public String enableMaintenanceJob(ZoneId zone, String jobName) {
throw new UnsupportedOperationException();
}
@Override
- public String disableMaintenanceJob(ZoneId zone, String jobName) throws IOException {
+ public String disableMaintenanceJob(ZoneId zone, String jobName) {
throw new UnsupportedOperationException();
}
@Override
- public MaintenanceJobList listMaintenanceJobs(ZoneId zone) throws IOException {
+ public MaintenanceJobList listMaintenanceJobs(ZoneId zone) {
throw new UnsupportedOperationException();
}
+
}