You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/07/14 19:10:18 UTC
[13/14] incubator-usergrid git commit: Merge branch 'pr/304' into
USERGRID-840
Merge branch 'pr/304' into USERGRID-840
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a9c9581b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a9c9581b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a9c9581b
Branch: refs/heads/observable-query-fix
Commit: a9c9581b59b666a5319ad0bb040c02fd18d610df
Parents: d342875 a721558
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jul 13 18:19:48 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jul 13 18:19:48 2015 -0600
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 3 +-
.../usergrid/persistence/queue/QueueScope.java | 14 +++
.../persistence/queue/impl/QueueScopeImpl.java | 7 +-
.../queue/impl/SNSQueueManagerImpl.java | 96 ++++++++++++++------
.../queue/util/AmazonNotificationUtils.java | 42 +++++++++
.../persistence/queue/QueueManagerTest.java | 2 +-
.../notifications/NotificationsService.java | 2 +-
.../services/notifications/QueueListener.java | 2 +-
.../usergrid/services/queues/QueueListener.java | 2 +-
9 files changed, 134 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9c9581b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
index 70eb361,bd97d66..11ca2d3
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
@@@ -106,10 -104,9 +107,10 @@@ public class AmazonAsyncEventService im
this.indexService = indexService;
this.entityCollectionManagerFactory = entityCollectionManagerFactory;
- this.rxTaskScheduler = rxTaskScheduler;
+ this.indexLocationStrategyFactory = indexLocationStrategyFactory;
+ this.entityIndexFactory = entityIndexFactory;
- final QueueScope queueScope = new QueueScopeImpl(QUEUE_NAME);
+ this.queueScope = new QueueScopeImpl(QUEUE_NAME, QueueScope.RegionImplementation.ALLREGIONS);
this.queue = queueManagerFactory.getQueueManager(queueScope);
this.indexProcessorFig = indexProcessorFig;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a9c9581b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
index 1214a39,60138ee..f41d238
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
@@@ -372,9 -407,9 +408,9 @@@ public class SNSQueueManagerImpl implem
if (logger.isDebugEnabled()) logger.debug("Publishing Message...{} to arn: {}", stringBody, topicArn);
- PublishRequest publishRequest = new PublishRequest(topicArn, toString(body));
+ PublishRequest publishRequest = new PublishRequest(topicArn, stringBody);
- sns.publishAsync(publishRequest, new AsyncHandler<PublishRequest, PublishResult>() {
+ snsAsync.publishAsync(publishRequest, new AsyncHandler<PublishRequest, PublishResult>() {
@Override
public void onError(Exception e) {
logger.error("Error publishing message... {}", e);