You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/01 23:38:07 UTC
[03/10] incubator-usergrid git commit: Fixes method removal on merge
Fixes method removal on merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/490e2cb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/490e2cb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/490e2cb2
Branch: refs/heads/two-dot-o-dev
Commit: 490e2cb2ec58f8acd0411e5154e70ca8b801aaec
Parents: 9c9fb27
Author: Todd Nine <tn...@apigee.com>
Authored: Thu May 28 06:37:41 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu May 28 06:37:41 2015 -0600
----------------------------------------------------------------------
.../persistence/index/impl/EsApplicationEntityIndexImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/490e2cb2/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
index 0f0e6a5..fb2dc86 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
@@ -206,7 +206,7 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex {
//I can't just search on the entity Id.
FilterBuilder entityEdgeFilter = FilterBuilders.termFilter( IndexingUtils.EDGE_NODE_ID_FIELDNAME,
- IndexingUtils.idString( edge.getNodeId() ));
+ IndexingUtils.nodeId( edge.getNodeId() ));
srb.setPostFilter(entityEdgeFilter);
@@ -276,7 +276,7 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex {
final SearchRequestBuilder srb = searchRequestBuilderStrategyV2.getBuilder();
FilterBuilder entityIdFilter = FilterBuilders.termFilter( IndexingUtils.ENTITY_ID_FIELDNAME,
- IndexingUtils.idString( entityId ) );
+ IndexingUtils.entityId( entityId ) );
FilterBuilder entityVersionFilter = FilterBuilders.rangeFilter( IndexingUtils.ENTITY_VERSION_FIELDNAME ).lte( markedVersion );