diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-02-20 11:08:55 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-02-20 11:14:02 +0100 |
commit | de334b6399043d59533381ae547b7d0797451219 (patch) | |
tree | 2898e091829bf9c8049ce1ad5c6df12797de420d /controller-server | |
parent | 77d99174a91ec901a38a2cd7ff8601ab1e905c57 (diff) |
Rename to DefaultAuthorizationResponseHandler
Diffstat (limited to 'controller-server')
2 files changed, 8 insertions, 5 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 2c6726ef527..fddc2bb6fa1 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 @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.restapi.filter; import com.google.inject.Inject; import com.yahoo.config.provision.ApplicationName; +import com.yahoo.jdisc.Response; import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.http.HttpRequest.Method; import com.yahoo.jdisc.http.filter.DiscFilterRequest; @@ -59,7 +60,7 @@ public class ControllerAuthorizationFilter implements SecurityRequestFilter { Controller controller, EntityService entityService, ZoneRegistry zoneRegistry) { - this(clientFactory, controller, entityService, zoneRegistry, new HttpRespondingAuthorizationResponseHandler()); + this(clientFactory, controller, entityService, zoneRegistry, new DefaultAuthorizationResponseHandler()); } ControllerAuthorizationFilter(AthenzClientFactory clientFactory, @@ -195,8 +196,10 @@ public class ControllerAuthorizationFilter implements SecurityRequestFilter { .map(AthenzPrincipal.class::cast); } - @SuppressWarnings("unused") - static class HttpRespondingAuthorizationResponseHandler implements AuthorizationResponseHandler { + /** + * Maps {@link WebApplicationException} to http response ({@link Response}. + */ + 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 fe1718de135..ff4ceae1c8e 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,7 @@ 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.HttpRespondingAuthorizationResponseHandler; +import com.yahoo.vespa.hosted.controller.restapi.filter.ControllerAuthorizationFilter.DefaultAuthorizationResponseHandler; import org.junit.Test; import java.io.IOException; @@ -149,7 +149,7 @@ public class ControllerAuthorizationFilterTest { controllerTester.controller(), controllerTester.entityService(), controllerTester.zoneRegistry(), - new HttpRespondingAuthorizationResponseHandler()); + new DefaultAuthorizationResponseHandler()); } private static Optional<AuthorizationResponse> invokeFilter(ControllerAuthorizationFilter filter, |