remove optional args
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bc3cafb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bc3cafb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bc3cafb0 Branch: refs/heads/USERGRID-643 Commit: bc3cafb00fcf8eda2ec314132906d3e4df5c7dd1 Parents: 9995576 Author: Shawn Feldman <[email protected]> Authored: Mon May 11 10:37:08 2015 -0700 Committer: Shawn Feldman <[email protected]> Committed: Mon May 11 10:37:08 2015 -0700 ---------------------------------------------------------------------- .../usergrid/corepersistence/CpRelationManager.java | 4 ++-- .../java/org/apache/usergrid/persistence/Query.java | 13 ++++--------- .../usergrid/services/AbstractCollectionService.java | 4 ++-- .../org/apache/usergrid/services/ServiceRequest.java | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/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 7082a26..fb66b97 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 @@ -627,7 +627,7 @@ public class CpRelationManager implements RelationManager { //set our fields applicable to both operations readPipelineBuilder.withCursor(query.getCursor()); - readPipelineBuilder.withLimit(query.getLimit()); + readPipelineBuilder.withLimit( Optional.of( query.getLimit() )); //TODO, this should be removed when the CP relation manager is removed readPipelineBuilder.setStartId( cpHeadEntity.getId() ); @@ -928,7 +928,7 @@ public class CpRelationManager implements RelationManager { //set our fields applicable to both operations readPipelineBuilder .withCursor(query.getCursor()) - .withLimit(query.getLimit()) + .withLimit(Optional.of(query.getLimit())) //TODO, this should be removed when the CP relation manager is removed .setStartId( cpHeadEntity.getId() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java b/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java index 16f3ed0..4b655bd 100644 --- a/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java +++ b/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java @@ -522,21 +522,16 @@ public class Query { } - public Optional<Integer> getLimit() { + public int getLimit() { return getLimit( DEFAULT_LIMIT ); } - public Optional<Integer> getLimit( int defaultLimit ) { + public int getLimit( int defaultLimit ) { if ( limit <= 0 ) { - if ( defaultLimit > 0 ) { - return Optional.of( defaultLimit); - } - else { - return Optional.of( DEFAULT_LIMIT ); - } + return defaultLimit > 0 ? defaultLimit : DEFAULT_LIMIT; } - return Optional.of( limit ); + return limit; } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/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 ffb1d65..b84598d 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 ).get() ); + query.setLimit( query.getLimit( count ) ); 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().get() ); + query.setLimit( query.getLimit() ); if ( !query.isReversedSet() ) { query.setReversed( isCollectionReversed( context ) ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/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 a122004..90c3b7e 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().get(); + int limit = p.getQuery().getLimit(); if ( limit != Query.DEFAULT_LIMIT ) { if ( has_prev_param ) { sb.append( '&' );
