Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-659 1bd5edd76 -> e81bc1954
fix connections Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e81bc195 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e81bc195 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e81bc195 Branch: refs/heads/USERGRID-659 Commit: e81bc1954c685d9cbafd9dd818ed69b9a995d04a Parents: 1bd5edd Author: Shawn Feldman <[email protected]> Authored: Fri May 15 08:47:22 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri May 15 08:47:22 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e81bc195/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java index 797788e..010b2da 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java @@ -292,10 +292,10 @@ public class CpRelationManager implements RelationManager { final Set<String> indexes = new HashSet<String>(); - GraphManager gm = managerCache.getGraphManager( applicationScope ); + GraphManager gm = managerCache.getGraphManager(applicationScope); Observable<String> str = - gm.getEdgeTypesFromSource( new SimpleSearchEdgeType( cpHeadEntity.getId(), null, null ) ); + gm.getEdgeTypesFromSource(new SimpleSearchEdgeType(cpHeadEntity.getId(), null, null)); Iterator<String> iter = str.toBlocking().getIterator(); while ( iter.hasNext() ) { @@ -320,7 +320,7 @@ public class CpRelationManager implements RelationManager { ql = "select *"; } - Query query = Query.fromQL( ql ); + Query query = Query.fromQL(ql); query.setLimit( count ); query.setReversed( reversed ); @@ -391,11 +391,14 @@ public class CpRelationManager implements RelationManager { } indexService.queueNewEdge(applicationScope, memberEntity, edge); - //reverse + + //reverse the edge if(!cpHeadEntity.getId().getType().equals("application")) { - String pluralType = InflectionUtils.pluralize(cpHeadEntity.getId().getType()); - final Edge reverseEdge = createCollectionEdge(memberEntity.getId(), pluralType, cpHeadEntity.getId()); + //TODO this should be easier + final Edge reverseEdge = createCollectionEdgeFromTargetEntity(memberEntity.getId(),cpHeadEntity.getId()); + //add to graph gm.writeEdge(reverseEdge).toBlocking().last(); + //add to index indexService.queueNewEdge(applicationScope, cpHeadEntity, reverseEdge); } @@ -410,6 +413,10 @@ public class CpRelationManager implements RelationManager { return itemEntity; } + private Edge createCollectionEdgeFromTargetEntity(Id source, Id target) { + String pluralType = InflectionUtils.pluralize(target.getType()); + return createCollectionEdge(source, pluralType, target); + } @Override
