Merge branch 'remove-server'

Conflicts:
	src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
	src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java

4 files changed, 24 insertions, 11 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 4f95ea5b..0d22d3c6 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
@@ -217,8 +217,13 @@ public abstract class AbstractClient {
 	}

 

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

+<<<<<<< HEAD:src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
 	protected Object deleteResource(Class responseClass, String resourceName) {

 		return resource.queryParam("serverName", resourceName).header(HTTP_HEADER_AUTH, authHeader).delete(responseClass);

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

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

+>>>>>>> remove-server:src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
 	}

 

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

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 f3acb2f7..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,14 +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";
@@ -63,7 +66,9 @@ public class GlusterServersClient extends AbstractClient {
 	}
 	
 	public Status removeServer(String serverName) {
-		return (Status) deleteResource(Status.class, 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) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index 6c7b69da..d5c1bad3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -55,6 +55,7 @@ public class RESTConstants {
 	public static final String QUERY_PARAM_FROM_TIMESTAMP = "fromTimestamp";
 	public static final String QUERY_PARAM_TO_TIMESTAMP = "toTimestamp";
 	public static final String QUERY_PARAM_DOWNLOAD = "download";
+	public static final String QUERY_PARAM_SERVER_NAME = "serverName";
 
 	// Running tasks resource
 	public static final String RESOURCE_PATH_RUNNING_TASKS = "/cluster/runningtasks";
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java
index a202f18c..acbba6c0 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java
@@ -40,17 +40,19 @@ public class RemoveServerAction extends AbstractActionDelegate {
 	@Override
 	protected void performAction(IAction action) {
 		final String actionDesc = action.getDescription();
-		boolean confirmed = showConfirmDialog(actionDesc,
-				"Are you sure you want to remove this server [" + server.getName() + "] ?");
-		if (!confirmed) {
-			return;
-		}
 
 		List<String> configuredVolumes = getServerVolumeNames(server.getName());
 
 		if (configuredVolumes.size() > 0) {
 			String volumes = StringUtil.ListToString(configuredVolumes, ", ");
-			showErrorDialog(actionDesc, "Server cannot be removed. The following volumes are configured.\n" + volumes);
+			showErrorDialog(actionDesc, "Server cannot be removed as it is being used by following volumes: ["
+					+ volumes + "]");
+			return;
+		}
+
+		boolean confirmed = showConfirmDialog(actionDesc,
+				"Are you sure you want to remove this server [" + server.getName() + "] ?");
+		if (!confirmed) {
 			return;
 		}
 
@@ -66,9 +68,9 @@ public class RemoveServerAction extends AbstractActionDelegate {
 
 	private List<String> getServerVolumeNames(String serverName) {
 		Cluster cluster = GlusterDataModelManager.getInstance().getModel().getCluster();
-		List<String> volumeNames  = new ArrayList<String>();
-		for(Volume volume : cluster.getVolumes()) {
-			for(String brick : volume.getDisks()) {
+		List<String> volumeNames = new ArrayList<String>();
+		for (Volume volume : cluster.getVolumes()) {
+			for (String brick : volume.getDisks()) {
 				if (serverName.equals(brick.split(":")[0])) {
 					volumeNames.add(volume.getName());
 					break;