diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-05-16 12:13:03 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-05-16 12:13:03 +0530 |
| commit | 1196a18cbc94ddee4158d9b182beaf5f60b9f818 (patch) | |
| tree | 4dbea46eb73a8487ffbef3dc84aad17ad020071c /src/com.gluster.storage.management.client | |
| parent | d7edef2afca7d1927a0db671da47029889f081f4 (diff) | |
| parent | b6307c6c12a9240a1652c9e3586f54db69ef7730 (diff) | |
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
Diffstat (limited to 'src/com.gluster.storage.management.client')
2 files changed, 12 insertions, 2 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) { |