Repository: jclouds-labs-openstack Updated Branches: refs/heads/master e7a52c1ae -> 978234238
JCLOUDS-686: Glance API ListImageOptions should support changesSince() 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/97823423 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/97823423 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/97823423 Branch: refs/heads/master Commit: 978234238abc5f2a8771dffca054feb3a22dfb3c Parents: e7a52c1 Author: Jeremy Daggett <[email protected]> Authored: Wed Aug 27 16:44:49 2014 -0700 Committer: Jeremy Daggett <[email protected]> Committed: Thu Sep 4 10:01:36 2014 -0700 ---------------------------------------------------------------------- .../glance/v1_0/options/ListImageOptions.java | 37 +++++++++++--------- 1 file changed, 21 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/97823423/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java index 2e69f88..22e8697 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java @@ -16,6 +16,7 @@ */ package org.jclouds.openstack.glance.v1_0.options; +import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.openstack.glance.v1_0.options.ImageField.CONTAINER_FORMAT; import static org.jclouds.openstack.glance.v1_0.options.ImageField.DISK_FORMAT; import static org.jclouds.openstack.glance.v1_0.options.ImageField.IS_PUBLIC; @@ -45,8 +46,7 @@ import org.jclouds.openstack.v2_0.options.PaginationOptions; * // this will list the first 10 images with the name "name", minimum required disk of 5GB. * list = api.list(name("newName"), limit(10), minDisk(5)); * <code> - * - * @see <a href="http://glance.openstack.org/glanceapi.html"/> + * */ public class ListImageOptions extends PaginationOptions { public static final ListImageOptions NONE = new ListImageOptions(); @@ -54,6 +54,25 @@ public class ListImageOptions extends PaginationOptions { /** * Return only those images having a matching name attribute */ + public ListImageOptions changesSince(Date ifModifiedSince) { + queryParameters.put("changes-since", + checkNotNull(ifModifiedSince, "modification date should not be null").getTime() / 1000 + ""); + return this; + } + + @Override + public ListImageOptions marker(String marker) { + return ListImageOptions.class.cast(super.marker(marker)); + } + + @Override + public ListImageOptions limit(int limit) { + return ListImageOptions.class.cast(super.limit(limit)); + } + + /** + * Return only those images having a matching name attribute + */ public ListImageOptions name(String name) { queryParameters.put(NAME.asParam(), name); return this; @@ -250,18 +269,4 @@ public class ListImageOptions extends PaginationOptions { } } - @Override - public ListImageOptions changesSince(Date ifModifiedSince) { - return ListImageOptions.class.cast(super.changesSince(ifModifiedSince)); - } - - @Override - public ListImageOptions marker(String marker) { - return ListImageOptions.class.cast(super.marker(marker)); - } - - @Override - public ListImageOptions limit(int limit) { - return ListImageOptions.class.cast(super.limit(limit)); - } }
