You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/11/18 17:27:23 UTC
[02/50] usergrid git commit: Fix annotations so that CORS and tracing
filters work, and add JIRA issue for the TODO on the Metering Filter.
Fix annotations so that CORS and tracing filters work, and add JIRA issue for the TODO on the Metering Filter.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/de42b9cb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/de42b9cb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/de42b9cb
Branch: refs/heads/USERGRID-872
Commit: de42b9cb0ee77ab40f2f0af5f34dc4d7df56dac5
Parents: 40e002b
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 10 15:21:21 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 10 15:21:21 2015 -0500
----------------------------------------------------------------------
.../org/apache/usergrid/rest/filters/MeteringFilter.java | 8 ++++----
.../java/org/apache/usergrid/rest/filters/TracingFilter.java | 5 ++---
.../usergrid/rest/security/CrossOriginRequestFilter.java | 4 ++--
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/de42b9cb/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
index 2735cdf..b8adc9a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
@@ -36,6 +36,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.container.*;
import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -46,10 +47,9 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
-// TODO: Metering for Jersey 2
-@Resource
-@PreMatching
-@Component
+// TODO: Metering for Jersey 2 (https://issues.apache.org/jira/browse/USERGRID-1103)
+
+@Provider
public class MeteringFilter implements ContainerRequestFilter, ContainerResponseFilter {
@Override
http://git-wip-us.apache.org/repos/asf/usergrid/blob/de42b9cb/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
index 64d0209..1c23f63 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
@@ -30,6 +30,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.container.*;
import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
/**
@@ -37,9 +38,7 @@ import javax.ws.rs.core.Context;
*
* @author zznate
*/
-@Resource
-@PreMatching
-@Component
+@Provider
public class TracingFilter implements ContainerRequestFilter, ContainerResponseFilter {
private Logger logger = LoggerFactory.getLogger( TracingFilter.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/de42b9cb/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
index 00c12d7..f150b2b 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
@@ -21,14 +21,14 @@ import org.apache.usergrid.rest.utils.CORSUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.Provider;
import java.io.IOException;
-@Resource
+@Provider
public class CrossOriginRequestFilter implements ContainerResponseFilter {
public static final Logger logger = LoggerFactory.getLogger( CrossOriginRequestFilter.class );