merge from two-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/d4bb9ef7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d4bb9ef7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d4bb9ef7 Branch: refs/heads/USERGRID-652 Commit: d4bb9ef7085801f674034a8eff71cc04643f6d41 Parents: 12ae65c 05f8172 Author: Shawn Feldman <sfeld...@apache.org> Authored: Fri Jun 5 10:42:29 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Fri Jun 5 10:42:29 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 38 ++++++- .../corepersistence/CpRelationManager.java | 18 +-- .../usergrid/corepersistence/CpWalker.java | 4 +- .../asyncevents/EventBuilderImpl.java | 4 +- .../corepersistence/util/CpNamingUtils.java | 52 ++++++++- .../usergrid/persistence/AbstractEntity.java | 11 ++ .../usergrid/persistence/EntityManager.java | 19 ++++ .../apache/usergrid/persistence/EntityRef.java | 5 + .../persistence/MultiQueryIterator.java | 10 ++ .../persistence/SimpleCollectionRef.java | 8 ++ .../usergrid/persistence/SimpleEntityRef.java | 7 ++ .../usergrid/persistence/SimpleRoleRef.java | 8 ++ .../cassandra/ConnectionRefImpl.java | 8 ++ .../rx/AllEntitiesInSystemObservableIT.java | 2 +- .../apache/usergrid/utils/EdgeTestUtils.java | 4 +- .../impl/stage/NodeDeleteListenerImpl.java | 113 ++++++++----------- .../usergrid/services/AbstractService.java | 16 ++- 17 files changed, 226 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d4bb9ef7/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java ---------------------------------------------------------------------- diff --cc stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java index f17a088,7dfc1ec..31d4e40 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java @@@ -97,7 -97,8 +97,7 @@@ public class AllEntitiesInSystemObserva final ApplicationScope scope = CpNamingUtils.getApplicationScope( app.getId() ); final GraphManager gm = managerCache.getGraphManager( scope ); - -- AtomicLong counter = new AtomicLong(); ++ final AtomicLong counter = new AtomicLong(); allEntitiesInSystemObservableImpl.getData().doOnNext( new Action1<EntityIdScope>() { @Override public void call( final EntityIdScope entityIdScope ) {
