[18/23] usergrid git commit: merge

[sfeldman]

merge


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5ecc57f3
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5ecc57f3
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5ecc57f3

Branch: refs/heads/master
Commit: 5ecc57f388794decd53e25a404c5706eeda2baa9
Parents: efffe47 a09485a
Author: Shawn Feldman <sfeld...@apache.org>
Authored: Mon Oct 19 13:20:51 2015 -0600
Committer: Shawn Feldman <sfeld...@apache.org>
Committed: Mon Oct 19 13:20:51 2015 -0600

----------------------------------------------------------------------
 .../asyncevents/AmazonAsyncEventService.java    |  40 ++---
 .../asyncevents/AsyncIndexProvider.java         |   9 +-
 .../asyncevents/model/AsyncEvent.java           |  14 +-
 .../asyncevents/model/EdgeDeleteEvent.java      |   6 +-
 .../asyncevents/model/EdgeIndexEvent.java       |   9 +-
 .../asyncevents/model/EntityDeleteEvent.java    |   8 +-
 .../asyncevents/model/EntityIndexEvent.java     |   6 +-
 .../model/InitializeApplicationIndexEvent.java  |   4 +-
 .../index/AmazonAsyncEventServiceTest.java      |   6 +-
 .../cache/CachedEntityCollectionManager.java    | 147 -------------------
 .../EntityCollectionManagerFactoryImpl.java     |   6 -
 .../usergrid/persistence/queue/QueueFig.java    |   2 +-
 .../queue/impl/SNSQueueManagerImpl.java         |   6 +-
 .../queue/impl/SQSQueueManagerImpl.java         |   2 +-
 14 files changed, 64 insertions(+), 201 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/5ecc57f3/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/5ecc57f3/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncIndexProvider.java
----------------------------------------------------------------------
diff --cc 
stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncIndexProvider.java
index f5197d2,8b44714..fb63276
--- 
a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncIndexProvider.java
+++ 
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncIndexProvider.java
@@@ -27,7 -27,7 +27,8 @@@ import org.apache.usergrid.persistence.
  import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
  import org.apache.usergrid.persistence.index.EntityIndexFactory;
  import org.apache.usergrid.persistence.index.impl.IndexProducer;
 +import org.apache.usergrid.persistence.queue.LocalQueueManager;
+ import org.apache.usergrid.persistence.queue.QueueFig;
  import org.apache.usergrid.persistence.queue.QueueManagerFactory;
  
  import com.google.inject.Inject;
@@@ -96,16 -98,13 +99,16 @@@ public class AsyncIndexProvider impleme
  
          switch (impl) {
              case LOCAL:
 -                return new InMemoryAsyncEventService(eventBuilder, 
rxTaskScheduler, indexProducer,indexProcessorFig.resolveSynchronously());
 +                AmazonAsyncEventService eventService = new 
AmazonAsyncEventService(scope -> new LocalQueueManager(), indexProcessorFig, 
indexProducer, metricsFactory,
 +                    entityCollectionManagerFactory, 
indexLocationStrategyFactory, entityIndexFactory, eventBuilder, 
rxTaskScheduler);
 +                eventService.MAX_TAKE = 1000;
 +                return eventService;
              case SQS:
                  return new AmazonAsyncEventService(queueManagerFactory, 
indexProcessorFig, indexProducer, metricsFactory,
-                     entityCollectionManagerFactory, 
indexLocationStrategyFactory,entityIndexFactory, eventBuilder, rxTaskScheduler 
);
+                     entityCollectionManagerFactory, 
indexLocationStrategyFactory,entityIndexFactory, eventBuilder, 
rxTaskScheduler,queueFig );
              case SNS:
                  return new AmazonAsyncEventService(queueManagerFactory, 
indexProcessorFig, indexProducer, metricsFactory,
-                     entityCollectionManagerFactory, 
indexLocationStrategyFactory,entityIndexFactory, eventBuilder, rxTaskScheduler 
);
+                     entityCollectionManagerFactory, 
indexLocationStrategyFactory,entityIndexFactory, eventBuilder, rxTaskScheduler, 
queueFig);
              default:
                  throw new IllegalArgumentException("Configuration value of " 
+ getErrorValues() + " are allowed");
          }