You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/05/10 13:00:16 UTC
[23/39] incubator-usergrid git commit: fix limit in services
fix limit in services
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8a37850d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8a37850d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8a37850d
Branch: refs/heads/USERGRID-614
Commit: 8a37850dfd0eb281b2323ba1738743309cd4e59d
Parents: 9954b21
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu May 7 08:32:24 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu May 7 08:32:24 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/management/importer/ImportServiceImpl.java | 6 +++---
.../apache/usergrid/services/AbstractCollectionService.java | 4 ++--
.../main/java/org/apache/usergrid/services/ServiceRequest.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8a37850d/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
index c86bfc7..18879c0 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
@@ -144,7 +144,7 @@ public class ImportServiceImpl implements ImportService {
final Entity appInfo = getApplicationInfoEntity(rootEm, applicationId);
Query query = Query.fromQLNullSafe( ql );
- query.setOffsetFromCursor( cursor );
+ query.setCursor( cursor );
//set our entity type
query.setEntityType( Schema.getDefaultSchema().getEntityType( Import.class ) );
@@ -205,7 +205,7 @@ public class ImportServiceImpl implements ImportService {
final Import importEntity = getImport( applicationId, importId );
Query query = Query.fromQLNullSafe( ql );
- query.setOffsetFromCursor( cursor );
+ query.setCursor( cursor );
query.setConnectionType( IMPORT_FILE_INCLUDES_CONNECTION );
query.setResultsLevel( Level.ALL_PROPERTIES );
@@ -264,7 +264,7 @@ public class ImportServiceImpl implements ImportService {
final FileImport importEntity = getFileImport(applicationId, importId, fileImportId);
Query query = Query.fromQLNullSafe( ql );
- query.setOffsetFromCursor( cursor );
+ query.setCursor( cursor );
query.setConnectionType( FileImportTracker.ERRORS_CONNECTION_NAME );
query.setResultsLevel( Level.ALL_PROPERTIES );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8a37850d/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java b/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
index b84598d..ffb1d65 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
@@ -200,7 +200,7 @@ public class AbstractCollectionService extends AbstractService {
query = new Query( query );
query.setResultsLevel( level );
- query.setLimit( query.getLimit( count ) );
+ query.setLimit( query.getLimit( count ).get() );
if ( !query.isReversedSet() ) {
query.setReversed( isCollectionReversed( context ) );
@@ -507,7 +507,7 @@ public class AbstractCollectionService extends AbstractService {
query = new Query( query );
query.setResultsLevel( Level.ALL_PROPERTIES );
- query.setLimit( query.getLimit() );
+ query.setLimit( query.getLimit().get() );
if ( !query.isReversedSet() ) {
query.setReversed( isCollectionReversed( context ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8a37850d/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java b/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
index 90c3b7e..a122004 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
@@ -325,7 +325,7 @@ public class ServiceRequest {
}
has_prev_param = true;
}
- int limit = p.getQuery().getLimit();
+ int limit = p.getQuery().getLimit().get();
if ( limit != Query.DEFAULT_LIMIT ) {
if ( has_prev_param ) {
sb.append( '&' );