Merge remote-tracking branch 'origin/USERGRID-1048'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b51287cc Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b51287cc Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b51287cc Branch: refs/heads/remove-inmemory-event-service Commit: b51287cc2693ad2dea10ebe2197bce5dcd004992 Parents: a679aea fbb6c82 Author: Shawn Feldman <sfeld...@apache.org> Authored: Tue Oct 20 09:20:14 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Tue Oct 20 09:20:14 2015 -0600 ---------------------------------------------------------------------- .../asyncevents/AmazonAsyncEventService.java | 379 ++++++++---- .../asyncevents/AsyncEventService.java | 1 + .../asyncevents/AsyncIndexProvider.java | 12 +- .../asyncevents/model/AsyncEvent.java | 8 +- .../model/ElasticsearchIndexEvent.java | 51 ++ .../index/IndexProcessorFig.java | 11 + .../util/ObjectJsonSerializer.java | 92 +++ .../index/AmazonAsyncEventServiceTest.java | 6 +- .../index/AsyncIndexServiceTest.java | 2 +- .../corepersistence/index/PublishRxTest.java | 95 --- .../usergrid/corepersistence/index/RxTest.java | 108 ++++ .../persistence/core/astyanax/CassandraFig.java | 6 +- .../usergrid/persistence/map/MapManager.java | 25 +- .../persistence/map/impl/MapManagerImpl.java | 6 + .../persistence/map/impl/MapSerialization.java | 27 +- .../map/impl/MapSerializationImpl.java | 265 ++++---- .../index/impl/DeIndexOperation.java | 4 + .../persistence/index/impl/IndexOperation.java | 4 + .../index/impl/IndexOperationMessage.java | 5 + .../persistence/queue/DefaultQueueManager.java | 12 +- .../persistence/queue/QueueManager.java | 8 +- .../persistence/queue/guice/QueueModule.java | 1 - .../queue/impl/SNSQueueManagerImpl.java | 617 +++++++++++-------- .../queue/impl/SQSQueueManagerImpl.java | 352 ----------- .../services/queues/ImportQueueManager.java | 9 +- 25 files changed, 1126 insertions(+), 980 deletions(-) ----------------------------------------------------------------------