usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [3/5] incubator-usergrid git commit: Fix merge error.
Date Mon, 06 Apr 2015 13:53:36 GMT
Fix merge error.


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

Branch: refs/heads/two-dot-o-dev
Commit: 4cd2e942fbc5c14231e0468a5c86b362e907ac9e
Parents: 556fbc0
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Thu Apr 2 14:11:40 2015 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Thu Apr 2 14:11:40 2015 -0400

----------------------------------------------------------------------
 .../index/impl/EsApplicationEntityIndexImpl.java         | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4cd2e942/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 ed28cc3..25b926d 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
@@ -61,7 +61,7 @@ import static org.apache.usergrid.persistence.index.impl.IndexingUtils.SPLITTER;
 /**
  * Classy class class.
  */
-public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex {
+public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex{
 
     private static final Logger logger = LoggerFactory.getLogger(EsApplicationEntityIndexImpl.class);
 
@@ -130,7 +130,7 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex
{
     public CandidateResults search(final IndexScope indexScope, final SearchTypes searchTypes,
final Query query, final int limit){
 
         if(query.getCursor()!=null){
-            return getNextPage(query.getCursor(), query.getLimit() );
+            return getNextPage(query.getCursor(), query.getLimit());
         }
 
         SearchResponse searchResponse;
@@ -155,11 +155,6 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex
{
         }
         failureMonitor.success();
 
-        return parseResults(searchResponse, query.getLimit() );
-    }
-
-
-    public CandidateResults getNextPage(final String cursor, final int limit ){
         return parseResults(searchResponse, limit);
     }
 
@@ -265,7 +260,7 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex
{
 
 
 
-    private CandidateResults parseResults( final SearchResponse searchResponse, final int
limit ) {
+    private CandidateResults parseResults( final SearchResponse searchResponse,final int
limit) {
 
         final SearchHits searchHits = searchResponse.getHits();
         final SearchHit[] hits = searchHits.getHits();


Mime
View raw message