Updated Branches: refs/heads/master 22bf21f5b -> 318da8046
Prefer Iterables.getOnlyElement(). Document checkNotNull(). Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/aec6a70e Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/aec6a70e Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/aec6a70e Branch: refs/heads/master Commit: aec6a70ed47759760a464cb041fd2c0e76d4ee2e Parents: 22bf21f Author: Everett Toews <[email protected]> Authored: Sat Nov 16 10:35:33 2013 -0600 Committer: Everett Toews <[email protected]> Committed: Sat Nov 16 10:53:47 2013 -0600 ---------------------------------------------------------------------- .../glance/v1_0/functions/internal/ParseImageDetails.java | 4 ++-- .../openstack/glance/v1_0/functions/internal/ParseImages.java | 4 ++-- .../java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/aec6a70e/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java index 6a6f3ac..82037f5 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.glance.v1_0.functions.internal; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.collect.Iterables.getOnlyElement; import static org.jclouds.openstack.glance.v1_0.options.ListImageOptions.Builder.marker; import java.beans.ConstructorProperties; @@ -25,7 +26,6 @@ import java.util.Collection; import javax.inject.Inject; import javax.inject.Singleton; -import com.google.common.collect.Iterables; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.IterableWithMarkers; import org.jclouds.collect.internal.Arg0ToPagedIterable; @@ -88,7 +88,7 @@ public class ParseImageDetails extends ParseJson<Images> { Collection<String> markers = paginationOptions.buildQueryParameters().get("marker"); if (!markers.isEmpty()) { - return IterableWithMarker.class.cast(imageApi.listInDetail(marker(Iterables.get(markers, 0)))); + return IterableWithMarker.class.cast(imageApi.listInDetail(marker(getOnlyElement(markers)))); } else { return IterableWithMarkers.EMPTY; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/aec6a70e/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java index c9c8d6e..23de00d 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java @@ -17,6 +17,7 @@ package org.jclouds.openstack.glance.v1_0.functions.internal; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.collect.Iterables.getOnlyElement; import static org.jclouds.openstack.glance.v1_0.options.ListImageOptions.Builder.marker; import java.beans.ConstructorProperties; @@ -25,7 +26,6 @@ import java.util.Collection; import javax.inject.Inject; import javax.inject.Singleton; -import com.google.common.collect.Iterables; import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.IterableWithMarkers; import org.jclouds.collect.internal.Arg0ToPagedIterable; @@ -88,7 +88,7 @@ public class ParseImages extends ParseJson<Images> { Collection<String> markers = paginationOptions.buildQueryParameters().get("marker"); if (!markers.isEmpty()) { - return IterableWithMarker.class.cast(imageApi.listInDetail(marker(Iterables.get(markers, 0)))); + return IterableWithMarker.class.cast(imageApi.listInDetail(marker(getOnlyElement(markers)))); } else { return IterableWithMarkers.EMPTY; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/aec6a70e/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java index fe991ba..c4aaee6 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java @@ -32,7 +32,7 @@ public class QueueStats { private final MessagesStats messages; protected QueueStats(MessagesStats messageStats) { - this.messages = checkNotNull(messageStats); + this.messages = checkNotNull(messageStats, "messageStats required"); } /**
