You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/02/20 21:28:58 UTC
cxf git commit: [CXF-7256] CrossOriginResourceSharingFilter should
have @Provider annotation, patch from Dennis Kieselhorst applied,
This closes #239
Repository: cxf
Updated Branches:
refs/heads/master f91541bed -> 70b3bdd83
[CXF-7256] CrossOriginResourceSharingFilter should have @Provider annotation, patch from Dennis Kieselhorst applied, This closes #239
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/70b3bdd8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/70b3bdd8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/70b3bdd8
Branch: refs/heads/master
Commit: 70b3bdd8303ffade04b31ac4e344726e7a273c0e
Parents: f91541b
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Feb 20 21:28:42 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Feb 20 21:28:42 2017 +0000
----------------------------------------------------------------------
.../rs/security/cors/CrossOriginResourceSharingFilter.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/70b3bdd8/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
----------------------------------------------------------------------
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 404cd4e..812f82f 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
@@ -43,6 +43,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.jaxrs.impl.MetadataMap;
@@ -70,6 +71,7 @@ import org.apache.cxf.phase.Phase;
* </pre>
* or unless the <tt>defaultOptionsMethodsHandlePreflight</tt> property of this class is set to <tt>true</tt>.
*/
+@Provider
@PreMatching
@Priority(Priorities.AUTHENTICATION - 1)
public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
@@ -165,10 +167,6 @@ public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
* have additional headers based on what happens here.
*
* @param m the incoming message.
- * @param opResInfo
- * @param ann the annotation, if any, derived from a method that matched the OPTIONS request for the
- * preflight. probably completely useless.
- * @param resourceClass the resource class passed into the filter.
* @return
*/
//CHECKSTYLE:OFF
@@ -486,8 +484,8 @@ public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
/**
* CORS uses one header containing space-separated values (Origin) and then
* a raft of #field-name productions, which parse on commas and optional spaces.
- * @param m
* @param key
+ * @param spaceSeparated
* @return
*/
private List<String> getHeaderValues(String key, boolean spaceSeparated) {