From 74384bcd1fb4990116ee380da5a81f30976f5e7d Mon Sep 17 00:00:00 2001 From: Valentin Aitken Date: Fri, 13 Jan 2017 15:45:16 +0200 Subject: [PATCH] Add @Override annotation for ContainerRequestFilter#filter implementations --- .../apache/cxf/jaxrs/security/JAASAuthenticationFilter.java | 3 ++- .../cxf/jaxrs/security/KerberosAuthenticationFilter.java | 1 + .../org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java | 3 ++- .../apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java | 1 + .../org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java | 2 +- .../cxf/rs/security/cors/CrossOriginResourceSharingFilter.java | 2 ++ .../cxf/rs/security/oauth/filters/OAuthRequestFilter.java | 1 + .../rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java | 3 ++- .../cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 ++ .../apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java | 1 + .../cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java | 1 + .../apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java | 1 + .../org/apache/cxf/rs/security/saml/SamlFormInHandler.java | 3 ++- .../org/apache/cxf/rs/security/saml/SamlHeaderInHandler.java | 1 + .../security/saml/authorization/ClaimsAuthorizingFilter.java | 1 + .../java/org/apache/cxf/rs/security/xml/XmlEncInHandler.java | 1 + .../java/org/apache/cxf/rs/security/xml/XmlSigInHandler.java | 1 + .../org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java | 1 + 18 files changed, 24 insertions(+), 5 deletions(-) diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java index 79922429119..9730f45d349 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java @@ -104,7 +104,8 @@ public void setRealmName(String name) { protected CallbackHandler getCallbackHandler(String name, String password) { return new NamePasswordCallbackHandler(name, password); } - + + @Override public void filter(ContainerRequestContext context) { Message m = JAXRSUtils.getCurrentMessage(); try { diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java index 455083caa44..33901049d9f 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java @@ -69,6 +69,7 @@ public class KerberosAuthenticationFilter implements ContainerRequestFilter { private String servicePrincipalName; private String realm; + @Override public void filter(ContainerRequestContext context) { List authHeaders = messageContext.getHttpHeaders() diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java index 22c24757d8a..50e7f0d3e36 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java @@ -32,7 +32,8 @@ public class SimpleAuthorizingFilter implements ContainerRequestFilter { private AbstractAuthorizingInInterceptor interceptor; - + + @Override public void filter(ContainerRequestContext context) { try { interceptor.handleMessage(JAXRSUtils.getCurrentMessage()); diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java index 28842f0674c..65806634645 100644 --- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java +++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java @@ -90,6 +90,7 @@ public void testCustomTestAndWadlHandler() { @PreMatching private static class TestHandler implements ContainerRequestFilter { + @Override public void filter(ContainerRequestContext context) { // complete } diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java index cf368062059..de7c6a5a2a5 100644 --- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java +++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java @@ -74,7 +74,7 @@ public void testWadlInJsonFormat() throws Exception { m.put(Message.PROTOCOL_HEADERS, headers); WadlGenerator wg = new WadlGenerator() { - public void filter(ContainerRequestContext context) { + @Override public void filter(ContainerRequestContext context) { super.doFilter(context, m); } }; diff --git a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java index f0518e3308a..bbe2b4fd093 100644 --- a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java +++ b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java @@ -110,6 +110,7 @@ private T getAnnotation(Method m, return ReflectionUtil.getAnnotationForMethodOrContainingClass(m, annClass); } + @Override public void filter(ContainerRequestContext context) { Message m = JAXRSUtils.getCurrentMessage(); @@ -338,6 +339,7 @@ private void setAllowOriginAndCredentials(Message m, } + @Override public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) { diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java index 5373ce11c0b..605c051485b 100644 --- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java @@ -40,6 +40,7 @@ @PreMatching public class OAuthRequestFilter extends AbstractAuthFilter implements ContainerRequestFilter { + @Override public void filter(ContainerRequestContext context) { try { Message m = JAXRSUtils.getCurrentMessage(); diff --git a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java index 1616c6714d6..6c934990236 100644 --- a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java +++ b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java @@ -54,7 +54,8 @@ public Saml2BearerAuthHandler() { public void setSamlOAuthValidator(SamlOAuthValidator validator) { samlOAuthValidator = validator; } - + + @Override public void filter(ContainerRequestContext context) { Message message = JAXRSUtils.getCurrentMessage(); Form form = readFormData(message); diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java index 1416dd414ed..5cc3e6cd646 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java @@ -78,6 +78,8 @@ public class OAuthRequestFilter extends AbstractAccessTokenValidator private boolean allPermissionsMatch; private boolean blockPublicClients; private AuthenticationMethod am; + + @Override public void filter(ContainerRequestContext context) { validateRequest(JAXRSUtils.getCurrentMessage()); } diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java index 9f2fe743c36..ee38ba66928 100644 --- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java +++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java @@ -56,6 +56,7 @@ public void setUseDeflateEncoding(boolean useDeflateEncoding) { this.useDeflateEncoding = useDeflateEncoding; } + @Override public void filter(ContainerRequestContext context) { Message m = JAXRSUtils.getCurrentMessage(); if (checkSecurityContext(m)) { diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java index 485f6d5b83d..6e2b5346110 100644 --- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java +++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java @@ -47,6 +47,7 @@ public class SamlRedirectBindingFilter extends AbstractServiceProviderFilter { + @Override public void filter(ContainerRequestContext context) { Message m = JAXRSUtils.getCurrentMessage(); if (checkSecurityContext(m)) { diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java index ee10d35d64d..0801a80a562 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java @@ -48,6 +48,7 @@ public class SamlEnvelopedInHandler extends AbstractSamlInHandler { public SamlEnvelopedInHandler() { } + @Override public void filter(ContainerRequestContext context) { Message message = JAXRSUtils.getCurrentMessage(); String method = (String)message.get(Message.HTTP_REQUEST_METHOD); diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormInHandler.java index b75b6d8b368..65cf4c74829 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormInHandler.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormInHandler.java @@ -41,7 +41,8 @@ public class SamlFormInHandler extends AbstractSamlBase64InHandler { public SamlFormInHandler() { } - + + @Override public void filter(ContainerRequestContext context) { Message message = JAXRSUtils.getCurrentMessage(); diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderInHandler.java index abf8ada2c0a..da6622a59a9 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderInHandler.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderInHandler.java @@ -36,6 +36,7 @@ public class SamlHeaderInHandler extends AbstractSamlBase64InHandler { @Context private HttpHeaders headers; + @Override public void filter(ContainerRequestContext context) { Message message = JAXRSUtils.getCurrentMessage(); diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingFilter.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingFilter.java index 09c3d2672f0..e0cc2d182a4 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingFilter.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingFilter.java @@ -35,6 +35,7 @@ public class ClaimsAuthorizingFilter implements ContainerRequestFilter { private ClaimsAuthorizingInterceptor interceptor = new ClaimsAuthorizingInterceptor(); + @Override public void filter(ContainerRequestContext context) { Message message = JAXRSUtils.getCurrentMessage(); try { diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncInHandler.java index 495b0435dfa..ad97a516ac7 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncInHandler.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncInHandler.java @@ -29,6 +29,7 @@ @PreMatching public class XmlEncInHandler extends AbstractXmlEncInHandler implements ContainerRequestFilter { + @Override public void filter(ContainerRequestContext context) { Message message = JAXRSUtils.getCurrentMessage(); diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigInHandler.java index 9366ebd2ade..53bbcdde6ad 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigInHandler.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigInHandler.java @@ -29,6 +29,7 @@ @PreMatching public class XmlSigInHandler extends AbstractXmlSigInHandler implements ContainerRequestFilter { + @Override public void filter(ContainerRequestContext context) { Message message = JAXRSUtils.getCurrentMessage(); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java index 8dd9a0bc11c..78b8d41539e 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java @@ -31,6 +31,7 @@ public class FaultyRequestHandler implements ContainerRequestFilter { @Context private UriInfo uriInfo; + @Override public void filter(ContainerRequestContext context) { if (uriInfo.getPath().endsWith("/propogateExceptionVar/1")) { MultivaluedMap vars = uriInfo.getPathParameters();