Merge pull request #34 from Dhandapani/master

Delete Volume and Remove Disk confirmation lable changes
Story #20: Remove Server UI, Client and Resource changes

2 files changed, 15 insertions, 5 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
index a077c721..d532c754 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
@@ -216,12 +216,12 @@ public abstract class AbstractClient {
 				.post(responseClass, requestObject);

 	}

 

-	@SuppressWarnings("unchecked")

-	protected Object deleteResource(Class responseClass, Form form) {

-		return resource.header(HTTP_HEADER_AUTH, authHeader).delete(responseClass);

+	@SuppressWarnings({ "unchecked", "rawtypes" })

+	protected Object deleteResource(Class responseClass, MultivaluedMap<String, String> queryParams) {

+		return resource.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).delete(responseClass);

 	}

 

-	@SuppressWarnings("unchecked")

+	@SuppressWarnings({ "unchecked", "rawtypes" })

 	protected Object deleteSubResource(String subResourceName, Class responseClass,

 			MultivaluedMap<String, String> queryParams) {

 		return resource.path(subResourceName).queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader)

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
index 8ae64016..d4809daf 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
@@ -20,13 +20,17 @@ package com.gluster.storage.management.client;
 
 import java.util.List;
 
+import javax.ws.rs.core.MultivaluedMap;
+
+import com.gluster.storage.management.core.constants.RESTConstants;
 import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Response;
 import com.gluster.storage.management.core.model.Server;
+import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.response.GenericResponse;
 import com.gluster.storage.management.core.response.GlusterServerListResponse;
 import com.gluster.storage.management.core.response.GlusterServerResponse;
 import com.sun.jersey.api.representation.Form;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 public class GlusterServersClient extends AbstractClient {
 	private static final String RESOURCE_NAME = "/cluster/servers";
@@ -60,6 +64,12 @@ public class GlusterServersClient extends AbstractClient {
 		form.add("serverName", discoveredServer.getName());
 		return (GlusterServerResponse)postRequest(GlusterServerResponse.class, form);
 	}
+	
+	public Status removeServer(String serverName) {
+		MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
+		queryParams.add(RESTConstants.QUERY_PARAM_SERVER_NAME, serverName);
+		return (Status) deleteResource(Status.class, queryParams);
+	}
 
 	public static void main(String[] args) {
 		UsersClient usersClient = new UsersClient();