aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-02-20 13:41:34 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-02-21 11:15:21 +0100
commitbcaa910f1cdd10815ec7bd30d67332af3751b759 (patch)
tree3dd09108a7fe354a2bacfbb8d3a4c0a9af54ce41 /controller-server
parent46fe6cf4a37ac34b314fab8c1158ade51f1b37f4 (diff)
Use default AuthorizationResponseHandler in unit test
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
index d0d7164d874..7d700914fee 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
@@ -256,7 +256,7 @@ public class ControllerAuthorizationFilter implements SecurityRequestFilter {
/**
* Maps {@link WebApplicationException} to http response ({@link Response}.
*/
- static class DefaultAuthorizationResponseHandler implements AuthorizationResponseHandler {
+ private static class DefaultAuthorizationResponseHandler implements AuthorizationResponseHandler {
@Override
public void handle(ResponseHandler responseHandler,
DiscFilterRequest request,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java
index 9744b757c3d..497f865a2a5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java
@@ -17,7 +17,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.athenz.ApplicationActio
import com.yahoo.vespa.hosted.controller.api.integration.athenz.HostedAthenzIdentities;
import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzClientFactoryMock;
import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock;
-import com.yahoo.vespa.hosted.controller.restapi.filter.ControllerAuthorizationFilter.DefaultAuthorizationResponseHandler;
import org.junit.Test;
import java.io.IOException;
@@ -147,8 +146,7 @@ public class ControllerAuthorizationFilterTest {
private static ControllerAuthorizationFilter createFilter(ControllerTester controllerTester) {
return new ControllerAuthorizationFilter(new AthenzClientFactoryMock(controllerTester.athenzDb()),
controllerTester.controller(),
- controllerTester.entityService(),
- new DefaultAuthorizationResponseHandler());
+ controllerTester.entityService());
}
private static Optional<AuthorizationResponse> invokeFilter(ControllerAuthorizationFilter filter,