Updated Branches: refs/heads/master 310a898bc -> 4b52f1ff8
[trivial] Simplify use of Optional.or Also correct checkArgument call. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/4b52f1ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/4b52f1ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/4b52f1ff Branch: refs/heads/master Commit: 4b52f1ff862a08cc5bb75fca8355d02dc386511a Parents: 310a898 Author: Andrew Gaul <[email protected]> Authored: Thu Sep 5 16:52:32 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Sep 5 17:09:14 2013 -0700 ---------------------------------------------------------------------- apis/sqs/src/main/java/org/jclouds/sqs/SQS.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/4b52f1ff/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java index 20b2e79..af6b7e2 100644 --- a/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java @@ -17,7 +17,7 @@ package org.jclouds.sqs; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkArgument; import org.jclouds.collect.AdvanceUntilEmptyIterable; import org.jclouds.javax.annotation.Nullable; @@ -26,7 +26,7 @@ import org.jclouds.sqs.features.MessageApi; import org.jclouds.sqs.options.ReceiveMessageOptions; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; +import com.google.common.base.Objects; import com.google.common.base.Supplier; import com.google.common.collect.FluentIterable; @@ -68,9 +68,9 @@ public class SQS { private MoreMessages(MessageApi api, int max, @Nullable ReceiveMessageOptions options) { this.api = checkNotNull(api, "message api"); - checkState(max > 0, "max messages per request must be a positive number"); + checkArgument(max > 0, "max messages per request must be a positive number"); this.max = max; - this.options = Optional.fromNullable(options).or(NO_OPTIONS); + this.options = Objects.firstNonNull(options, NO_OPTIONS); } @Override
