[jbosstools-commits] JBoss Tools SVN: r24123 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: jjohnstn
Date: 2010-08-12 16:19:00 -0400 (Thu, 12 Aug 2010)
New Revision: 24123

Modified:
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
Log:
2010-08-12  Jeff Johnston  <jjohnstn at redhat.com>

	* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (destroyInstance): Fix to use
	DELETE request. 
	(sendRequest): Fix to allow DELETE request.
	* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (destroyInstance): New method.



Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog	2010-08-12 20:13:25 UTC (rev 24122)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog	2010-08-12 20:19:00 UTC (rev 24123)
@@ -1,3 +1,10 @@
+2010-08-12  Jeff Johnston  <jjohnstn at redhat.com>
+
+	* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (destroyInstance): Fix to use
+	DELETE request. 
+	(sendRequest): Fix to allow DELETE request.
+	* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (destroyInstance): New method.
+
 2010-08-11  Jeff Johnston  <jjohnstn at redhat.com>
 
 	* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (performInstanceAction): New method. 

Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java	2010-08-12 20:13:25 UTC (rev 24122)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java	2010-08-12 20:19:00 UTC (rev 24123)
@@ -96,6 +96,25 @@
 		return instanceArray;
 	}
 	
+	public DeltaCloudInstance[] destroyInstance(String instanceId) {
+		try {
+			client.destroyInstance(instanceId);
+			for (int i = 0; i < instances.size(); ++i) {
+				DeltaCloudInstance instance = instances.get(i);
+				if (instance.getId().equals(instanceId)) {
+					instances.remove(i);
+					break;
+				}
+			}
+		} catch (DeltaCloudClientException e) {
+			return null;
+		}
+		DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()];
+		instanceArray = instances.toArray(instanceArray);
+		notifyInstanceListListeners(instanceArray);
+		return instanceArray;
+	}
+	
 	public DeltaCloudInstance refreshInstance(String instanceId) {
 		DeltaCloudInstance retVal = null;
 		try {

Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java	2010-08-12 20:13:25 UTC (rev 24122)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java	2010-08-12 20:19:00 UTC (rev 24123)
@@ -25,6 +25,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -51,7 +52,7 @@
 		}
 	} 
 	
-	private static enum RequestType { POST, GET };
+	private static enum RequestType { POST, GET, DELETE };
 	
 	private URL baseUrl;
 	
@@ -86,6 +87,10 @@
 			{
 				request = new HttpPost(requestUrl);
 			}
+			else if (requestType == RequestType.DELETE)
+			{
+				request = new HttpDelete(requestUrl);
+			}
 			else
 			{
 				request = new HttpGet(requestUrl);
@@ -229,10 +234,11 @@
 	{
 		sendRequest(DCNS.INSTANCES + "/" + instanceId + DCNS.START, RequestType.GET);
 	}
-	
+
+	@Override
 	public void destroyInstance(String instanceId) throws DeltaCloudClientException
 	{
-		sendRequest(DCNS.INSTANCES + "/" + instanceId + DCNS.DESTROY, RequestType.GET);
+		sendRequest(DCNS.INSTANCES + "/" + instanceId, RequestType.DELETE);
 	}
 	
 	private void checkForErrors(Document d) throws DeltaCloudClientException