X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FAuthorizationFilter.java;h=fd5b4aa1f47e7c81609be14a2b2a23d6f902e2a2;hp=9dafb55974e77eabaa80acbaf4d3d72c8ae82c26;hb=7fff84259b4f99298a117935e407561df9cf5878;hpb=bfe1f5204aa40a4178c005f23e530401b991ac58 diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java b/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java index 9dafb55..fd5b4aa 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java +++ b/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java @@ -20,8 +20,6 @@ package org.onap.dmaap.dbcapi.resources; -import java.io.IOException; - import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; @@ -34,29 +32,26 @@ import org.onap.dmaap.dbcapi.service.ApiService; public class AuthorizationFilter implements ContainerRequestFilter { private Logger logger = Logger.getLogger(AuthorizationFilter.class.getName()); + private ResponseBuilder responseBuilder = new ResponseBuilder(); @Override - public void filter(ContainerRequestContext requestContext) - throws IOException { + public void filter(ContainerRequestContext requestContext) { ApiService apiResp = new ApiService() .setAuth( requestContext.getHeaderString("Authorization") ) .setUriPath(requestContext.getUriInfo().getPath()) .setHttpMethod( requestContext.getMethod() ) .setRequestId( requestContext.getHeaderString("X-ECOMP-RequestID") ); - + try { apiResp.checkAuthorization(); } catch ( AuthenticationErrorException ae ) { logger.error("Error", ae); - requestContext.abortWith( apiResp.unauthorized( apiResp.getErr().getMessage() ) ); - return ; + requestContext.abortWith( responseBuilder.unauthorized( apiResp.getErr().getMessage() ) ); } catch ( Exception e ) { logger.error("Error", e); - requestContext.abortWith( apiResp.unavailable() ); - return; + requestContext.abortWith( responseBuilder.unavailable() ); } - }