You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/18 01:14:09 UTC
[1/2] git commit: removing all devices hack
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o f7ab17460 -> 955b5870a
removing all devices hack
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/09faf5b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/09faf5b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/09faf5b1
Branch: refs/heads/two-dot-o
Commit: 09faf5b1947c541f48210016addb37febcced2bb
Parents: f7ab174
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 17 16:51:42 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 17 16:51:42 2014 -0600
----------------------------------------------------------------------
.../usergrid/services/notifications/NotificationsService.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/09faf5b1/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
index ee5c1cb..d63ef7d 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
@@ -176,9 +176,7 @@ public class NotificationsService extends AbstractCollectionService {
org.apache.usergrid.persistence.index.query.Query query = sp.getQuery();
if (query == null) {
query = new Query();
- if(!sp.isName() || (sp.isName() && !sp.getName().equals("notifications"))) {
- query.addIdentifier(sp.getIdentifier());
- }
+ query.addIdentifier(sp.getIdentifier());
}
query.setLimit(PAGE);
query.setCollection(collection);
[2/2] git commit: add comments for all devices query
Posted by sf...@apache.org.
add comments for all devices query
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/955b5870
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/955b5870
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/955b5870
Branch: refs/heads/two-dot-o
Commit: 955b5870adda07a5af76712323bff2d1e8a49dde
Parents: 09faf5b
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 17 17:03:39 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 17 17:03:39 2014 -0600
----------------------------------------------------------------------
.../usergrid/services/notifications/NotificationsService.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/955b5870/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
index d63ef7d..f98ebfc 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
@@ -176,7 +176,11 @@ public class NotificationsService extends AbstractCollectionService {
org.apache.usergrid.persistence.index.query.Query query = sp.getQuery();
if (query == null) {
query = new Query();
- query.addIdentifier(sp.getIdentifier());
+ if(!sp.isName() ||
+ (collection == "devices" && sp.isName() && !sp.getName().equals("notifications"))) {
+ //look for queries to /devices;ql=/notifications
+ query.addIdentifier(sp.getIdentifier());
+ }
}
query.setLimit(PAGE);
query.setCollection(collection);