From 48f05f3aed1a8d3c4ebc204ea2f03ab2f3aa4187 Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Wed, 9 Nov 2011 11:50:25 +0200
Subject: [PATCH] Add SnapshotClient.getSnapshot(long id) et al to Cloudstack

---
 .../features/SnapshotAsyncClient.java         | 17 ++++++++++++++++
 .../cloudstack/features/SnapshotClient.java   |  8 ++++++++
 .../features/SnapshotAsyncClientTest.java     | 20 +++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java
index 03b2e5ef86..867134692c 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java
@@ -25,10 +25,13 @@ import org.jclouds.cloudstack.filters.QuerySigner;
 import org.jclouds.cloudstack.options.CreateSnapshotOptions;
 import org.jclouds.cloudstack.options.ListSnapshotsOptions;
 import org.jclouds.rest.annotations.ExceptionParser;
+import org.jclouds.rest.annotations.OnlyElement;
 import org.jclouds.rest.annotations.QueryParams;
 import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.annotations.Unwrap;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
+import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
 import javax.ws.rs.Consumes;
@@ -75,6 +78,20 @@ public interface SnapshotAsyncClient {
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<Snapshot>> listSnapshots(ListSnapshotsOptions... options);
 
+   /**
+    * Gets a snapshot by its ID.
+    *
+    * @param id the snapshot ID
+    * @return the snapshot with the requested ID
+    */
+   @GET
+   @Consumes(MediaType.APPLICATION_JSON)
+   @QueryParams(keys = "command", values = "listSnapshots")
+   @SelectJson("snapshot")
+   @OnlyElement
+   @ExceptionParser(ReturnNullOnNotFoundOr404.class)
+   ListenableFuture<Snapshot> getSnapshot(@QueryParam("id") long id);
+
    /**
     * Deletes a snapshot of a disk volume.
     *
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java
index 7c721b529f..97e9a6d97d 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java
@@ -55,6 +55,14 @@ public interface SnapshotClient {
     */
    Set<Snapshot> listSnapshots(ListSnapshotsOptions... options);
 
+   /**
+    * Gets a snapshot by its ID.
+    *
+    * @param id the snapshot ID
+    * @return the snapshot with the requested ID
+    */
+   Snapshot getSnapshot(long id);
+
    /**
     * Deletes a snapshot of a disk volume.
     *
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java
index 93d4c01bf5..7b1e31b85b 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java
@@ -18,15 +18,18 @@
  */
 package org.jclouds.cloudstack.features;
 
+import com.google.common.base.Functions;
 import com.google.inject.TypeLiteral;
 import org.jclouds.cloudstack.domain.Snapshot;
 import org.jclouds.cloudstack.options.CreateSnapshotOptions;
 import org.jclouds.cloudstack.options.ListSnapshotsOptions;
+import org.jclouds.functions.IdentityFunction;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.functions.ReleasePayloadAndReturn;
 import org.jclouds.http.functions.UnwrapOnlyJsonValue;
 import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
+import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.testng.annotations.Test;
@@ -92,6 +95,23 @@ public class SnapshotAsyncClientTest extends BaseCloudStackAsyncClientTest<Snaps
       checkFilters(httpRequest);
    }
 
+   public void testGetSnapshot() throws NoSuchMethodException {
+      Method method = SnapshotAsyncClient.class.getMethod("getSnapshot", long.class);
+      HttpRequest httpRequest = processor.createRequest(method, 5);
+
+      assertRequestLineEquals(httpRequest,
+            "GET http://localhost:8080/client/api?response=json&command=listSnapshots&id=5 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest,
+            Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
+      assertSaxResponseParserClassEquals(method, null);
+      assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+   }
+
    public void testListSnapshotsOptions() throws NoSuchMethodException {
       Method method = SnapshotAsyncClient.class.getMethod("listSnapshots", ListSnapshotsOptions[].class);
       HttpRequest httpRequest = processor.createRequest(method, ListSnapshotsOptions.Builder.accountInDomain("acc", 7).id(5).intervalType(Snapshot.SnapshotIntervalType.MONTHLY).isRecursive(true).keyword("fred").name("fred's snapshot").snapshotType(Snapshot.SnapshotType.RECURRING).volumeId(11));