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 2015/07/27 20:43:35 UTC
[1/2] incubator-usergrid git commit: move conversion methods
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 5efe71203 -> 4a7ce9a17
move conversion methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/902d33ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/902d33ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/902d33ed
Branch: refs/heads/two-dot-o-dev
Commit: 902d33edaf6a9d21d1a5f56cde04a6a53473845b
Parents: c4312ef
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jul 27 12:10:37 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jul 27 12:10:37 2015 -0600
----------------------------------------------------------------------
.../persistence/entities/Notification.java | 44 ++++++++++----------
.../impl/ApplicationQueueManagerImpl.java | 2 +-
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/902d33ed/stack/core/src/main/java/org/apache/usergrid/persistence/entities/Notification.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/entities/Notification.java b/stack/core/src/main/java/org/apache/usergrid/persistence/entities/Notification.java
index 728727f..009911d 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/entities/Notification.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/entities/Notification.java
@@ -229,28 +229,6 @@ public class Notification extends TypedEntity {
return State.CREATED;
}
- @JsonIgnore
- public PathQuery<Device> getPathQuery() {
- PathQuery pathQuery = null;
- for (PathToken pathToken : pathTokens.getPathTokens()) {
- String collection = pathToken.getCollection();
- Query query = new Query();
- if (pathToken.getIdentifier()!=null) {
- query.addIdentifier(pathToken.getIdentifier());
- }
- query.setLimit(100);
- query.setCollection(collection);
-
- if (pathQuery == null) {
- pathQuery = new PathQuery(pathTokens.getApplicationRef(), query);
- } else {
- pathQuery = pathQuery.chain(query);
- }
- }
-
- return pathQuery;
- }
-
@JsonIgnore
public int getExpireTimeInSeconds() {
@@ -307,6 +285,28 @@ public class Notification extends TypedEntity {
this.applicationRef = applicationRef;
}
+ @JsonIgnore
+ public PathQuery<Device> getPathQuery() {
+ PathQuery pathQuery = null;
+ for (PathToken pathToken : getPathTokens()) {
+ String collection = pathToken.getCollection();
+ Query query = new Query();
+ if (pathToken.getIdentifier()!=null) {
+ query.addIdentifier(pathToken.getIdentifier());
+ }
+ query.setLimit(100);
+ query.setCollection(collection);
+
+ if (pathQuery == null) {
+ pathQuery = new PathQuery(getApplicationRef(), query);
+ } else {
+ pathQuery = pathQuery.chain(query);
+ }
+ }
+
+ return pathQuery;
+ }
+
}
public static class PathToken{
private String collection;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/902d33ed/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
index 5f2f544..37ced91 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
@@ -94,7 +94,7 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
LOG.info("notification {} start queuing", notification.getUuid());
- final PathQuery<Device> pathQuery = notification.getPathQuery() ; //devices query
+ final PathQuery<Device> pathQuery = notification.getPathTokens().getPathQuery() ; //devices query
final AtomicInteger deviceCount = new AtomicInteger(); //count devices so you can make a judgement on batching
final ConcurrentLinkedQueue<String> errorMessages = new ConcurrentLinkedQueue<String>(); //build up list of issues
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Posted by sf...@apache.org.
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4a7ce9a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4a7ce9a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4a7ce9a1
Branch: refs/heads/two-dot-o-dev
Commit: 4a7ce9a17f9dceb32a61afaca5d21fb28aeb703e
Parents: 902d33e 5efe712
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jul 27 12:43:29 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jul 27 12:43:29 2015 -0600
----------------------------------------------------------------------
stack/awscluster/gatling-cluster-cf.json | 28 +++++++++++++--------------
1 file changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------