From c9030d804a614a193c2b39cf6ce09ae09426a411 Mon Sep 17 00:00:00 2001
From: Selvasundaram <selvam@gluster.com>
Date: Wed, 22 Jun 2011 19:47:58 +0530
Subject: URI path fixes

---
 .../src/com/gluster/storage/management/client/AbstractClient.java  | 7 +++----
 .../management/server/resources/DiscoveredServersResource.java     | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

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 9d9d6c5f..9eaaca93 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
@@ -20,7 +20,6 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
 import com.gluster.storage.management.client.utils.ClientUtil;
-import com.gluster.storage.management.core.constants.RESTConstants;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
@@ -124,7 +123,7 @@ public abstract class AbstractClient {
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private Object fetchResource(WebResource res, MultivaluedMap<String, String> queryParams, Class responseClass) {
 		try {
-			return res.path("." + RESTConstants.FORMAT_XML).queryParams(queryParams)
+			return res.queryParams(queryParams)
 					.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML).get(responseClass);
 		} catch(UniformInterfaceException e) {
 			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
@@ -272,7 +271,7 @@ public abstract class AbstractClient {
 	}
 
 	public Builder prepareFormRequestBuilder(WebResource resource) {
-		return resource.path("." + RESTConstants.FORMAT_XML).type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
+		return resource.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
 				.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML);
 	}
 	
@@ -314,7 +313,7 @@ public abstract class AbstractClient {
 
 	private void deleteResource(WebResource resource, MultivaluedMap<String, String> queryParams) {
 		try {
-			resource.path("." + RESTConstants.FORMAT_XML).queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader)
+			resource.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader)
 					.delete();
 		} catch (UniformInterfaceException e) {
 			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java
index 4359b7d5..aba88d82 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/DiscoveredServersResource.java
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package com.gluster.storage.management.server.resources;
 
+import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -37,14 +39,11 @@ import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.response.GenericResponse;
 import com.gluster.storage.management.core.response.ServerListResponse;
 import com.gluster.storage.management.core.response.StringListResponse;
-
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_FORMAT;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Component
 @Singleton
-@Path(RESOURCE_PATH_DISCOVERED_SERVERS + ".{" + PATH_PARAM_FORMAT + "}")
+@Path(RESOURCE_PATH_DISCOVERED_SERVERS)
 public class DiscoveredServersResource extends AbstractServersResource {
 	private List<String> discoveredServerNames = new ArrayList<String>();
 	
-- 
cgit