You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ev...@apache.org on 2013/11/16 17:54:12 UTC
[1/2] git commit: Prefer Iterables.getOnlyElement(). Document
checkNotNull().
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 <ev...@rackspace.com>
Authored: Sat Nov 16 10:35:33 2013 -0600
Committer: Everett Toews <ev...@rackspace.com>
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");
}
/**
[2/2] git commit: Added openstack-marconi and
rackspace-cloudqueues-us.
Posted by ev...@apache.org.
Added openstack-marconi and rackspace-cloudqueues-us.
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/318da804
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/318da804
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/318da804
Branch: refs/heads/master
Commit: 318da80465372298bf6e2fd3703174d843207c9c
Parents: aec6a70
Author: Everett Toews <ev...@rackspace.com>
Authored: Sat Nov 16 10:39:51 2013 -0600
Committer: Everett Toews <ev...@rackspace.com>
Committed: Sat Nov 16 10:53:57 2013 -0600
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/318da804/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5d609ce..63dbace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,10 +57,12 @@
<module>openstack-neutron</module>
<module>openstack-trove</module>
<module>openstack-swift</module>
+ <module>openstack-marconi</module>
<module>rackspace-clouddatabases-us</module>
<module>rackspace-clouddatabases-uk</module>
<module>rackspace-autoscale</module>
<module>rackspace-autoscale-us</module>
+ <module>rackspace-cloudqueues-us</module>
</modules>
<build>