From 6543f3af7a3317f466edc01cbce95588ea04d2db Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Fri, 4 Mar 2011 15:47:31 -0500
Subject: [PATCH] Issue 493:bad http syntax deleting cloudsigma resources

---
 .../cloudsigma/CloudSigmaAsyncClient.java     |  8 +++----
 .../cloudsigma/CloudSigmaAsyncClientTest.java |  8 +++----
 .../cloudsigma/CloudSigmaClientLiveTest.java  | 24 ++++---------------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java
index c271e0ce7b..d886ecf841 100644
--- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java
+++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java
@@ -203,7 +203,7 @@ public interface CloudSigmaAsyncClient {
    /**
     * @see CloudSigmaClient#destroyServer
     */
-   @POST
+   @GET
    @Path("/servers/{uuid}/destroy")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> destroyServer(@PathParam("uuid") String uuid);
@@ -247,7 +247,7 @@ public interface CloudSigmaAsyncClient {
    /**
     * @see CloudSigmaClient#destroyDrive
     */
-   @POST
+   @GET
    @Path("/drives/{uuid}/destroy")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> destroyDrive(@PathParam("uuid") String uuid);
@@ -301,7 +301,7 @@ public interface CloudSigmaAsyncClient {
    /**
     * @see CloudSigmaClient#destroyVLAN
     */
-   @POST
+   @GET
    @Path("/resources/vlan/{uuid}/destroy")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> destroyVLAN(@PathParam("uuid") String uuid);
@@ -343,7 +343,7 @@ public interface CloudSigmaAsyncClient {
    /**
     * @see CloudSigmaClient#destroyStaticIP
     */
-   @POST
+   @GET
    @Path("/resources/ip/{uuid}/destroy")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> destroyStaticIP(@PathParam("uuid") String uuid);
diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java
index 6772a832d9..51df12ab58 100644
--- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java
+++ b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java
@@ -323,7 +323,7 @@ public class CloudSigmaAsyncClientTest extends RestClientTest<CloudSigmaAsyncCli
       Method method = CloudSigmaAsyncClient.class.getMethod("destroyServer", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "uuid");
 
-      assertRequestLineEquals(httpRequest, "POST https://api.cloudsigma.com/servers/uuid/destroy HTTP/1.1");
+      assertRequestLineEquals(httpRequest, "GET https://api.cloudsigma.com/servers/uuid/destroy HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: text/plain\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -430,7 +430,7 @@ public class CloudSigmaAsyncClientTest extends RestClientTest<CloudSigmaAsyncCli
       Method method = CloudSigmaAsyncClient.class.getMethod("destroyDrive", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "uuid");
 
-      assertRequestLineEquals(httpRequest, "POST https://api.cloudsigma.com/drives/uuid/destroy HTTP/1.1");
+      assertRequestLineEquals(httpRequest, "GET https://api.cloudsigma.com/drives/uuid/destroy HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: text/plain\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -536,7 +536,7 @@ public class CloudSigmaAsyncClientTest extends RestClientTest<CloudSigmaAsyncCli
       Method method = CloudSigmaAsyncClient.class.getMethod("destroyVLAN", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "uuid");
 
-      assertRequestLineEquals(httpRequest, "POST https://api.cloudsigma.com/resources/vlan/uuid/destroy HTTP/1.1");
+      assertRequestLineEquals(httpRequest, "GET https://api.cloudsigma.com/resources/vlan/uuid/destroy HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: text/plain\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -626,7 +626,7 @@ public class CloudSigmaAsyncClientTest extends RestClientTest<CloudSigmaAsyncCli
       Method method = CloudSigmaAsyncClient.class.getMethod("destroyStaticIP", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "uuid");
 
-      assertRequestLineEquals(httpRequest, "POST https://api.cloudsigma.com/resources/ip/uuid/destroy HTTP/1.1");
+      assertRequestLineEquals(httpRequest, "GET https://api.cloudsigma.com/resources/ip/uuid/destroy HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: text/plain\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java
index e9383a461f..724f79989b 100644
--- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java
+++ b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java
@@ -308,18 +308,8 @@ public class CloudSigmaClientLiveTest {
             client.destroyServer(server.getUuid());
             client.destroyDrive(drive.getUuid());
          }
-         try {
-            client.destroyStaticIP(ip.getAddress());
-         } catch (IllegalArgumentException e) {
-            // this shouldn't happen
-            assertEquals(e.getMessage(), "resource_exception:Missing resource");
-         }
-         try {
-            client.destroyStaticIP(ip2.getAddress());
-         } catch (IllegalArgumentException e) {
-            // this shouldn't happen
-            assertEquals(e.getMessage(), "resource_exception:Missing resource");
-         }
+         client.destroyStaticIP(ip.getAddress());
+         client.destroyStaticIP(ip2.getAddress());
       }
    }
 
@@ -439,16 +429,10 @@ public class CloudSigmaClientLiveTest {
 
    @AfterGroups(groups = "live")
    protected void tearDown() {
-      try {
+      if (server != null)
          client.destroyServer(server.getUuid());
-      } catch (Exception e) {
-         // no need to check null or anything as we swallow all
-      }
-      try {
+      if (server != null)
          client.destroyDrive(drive.getUuid());
-      } catch (Exception e) {
-
-      }
       if (context != null)
          context.close();
    }