Story:#15 task:#81 Intergrate interface changes in the server, model and UI

3 files changed, 7 insertions, 14 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
index 3c3ef401..a1dad796 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
@@ -18,11 +18,8 @@
  *******************************************************************************/
 package com.gluster.storage.management.client;
 
-import java.util.List;
-
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.model.Response;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.response.GenericResponse;
 import com.gluster.storage.management.core.response.ServerListResponse;
@@ -32,7 +29,7 @@ import com.sun.jersey.core.util.MultivaluedMapImpl;
 public class DiscoveredServersClient extends AbstractClient {
 	private static final String RESOURCE_NAME = "discoveredservers";
 
-	public DiscoveredServersClient(String serverName, String securityToken) {
+	public DiscoveredServersClient(String securityToken) {
 		super(securityToken);
 	}
 
@@ -45,8 +42,7 @@ public class DiscoveredServersClient extends AbstractClient {
 	private Object getDiscoveredServers(Boolean getDetails, Class responseClass) {
 		MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
 		queryParams.putSingle("details", getDetails.toString());
-		// return ((Response) fetchResource(queryParams, responseClass)).getData();
-		return responseClass.cast(fetchResource(queryParams, responseClass));
+		return fetchResource(queryParams, responseClass);
 	}
 
 	public StringListResponse getDiscoveredServerNames() {
@@ -67,8 +63,7 @@ public class DiscoveredServersClient extends AbstractClient {
 	public static void main(String[] args) {
 		UsersClient usersClient = new UsersClient();
 		if (usersClient.authenticate("gluster", "gluster").isSuccess()) {
-			DiscoveredServersClient serverResource = new DiscoveredServersClient("localhost",
-					usersClient.getSecurityToken());
+			DiscoveredServersClient serverResource = new DiscoveredServersClient(usersClient.getSecurityToken());
 			StringListResponse discoveredServerNames = serverResource.getDiscoveredServerNames();
 			System.out.println(discoveredServerNames.getData());
 			ServerListResponse discoveredServers = serverResource.getDiscoveredServerDetails();
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index 3ef5f87f..1319cec5 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -55,7 +55,6 @@ public class GlusterDataModelManager {
 	private static GlusterDataModelManager instance = new GlusterDataModelManager();
 	private GlusterDataModel model;
 	private String securityToken;
-	private String serverName;
 	private List<ClusterListener> listeners = new ArrayList<ClusterListener>();
 	private List<VolumeOptionInfo> volumeOptionsDefaults;
 
@@ -107,7 +106,7 @@ public class GlusterDataModelManager {
 	}
 
 	private void initializeAutoDiscoveredServers(Cluster cluster) {
-		ServerListResponse discoveredServerListResponse = new DiscoveredServersClient(serverName, securityToken).getDiscoveredServerDetails();
+		ServerListResponse discoveredServerListResponse = new DiscoveredServersClient(securityToken).getDiscoveredServerDetails();
 		if (!discoveredServerListResponse.getStatus().isSuccess()) {
 			throw new GlusterRuntimeException(discoveredServerListResponse.getStatus().getMessage());
 		}
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 6d164993..8368ceea 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
@@ -44,7 +44,6 @@ public class GlusterServersClient extends AbstractClient {
 		return RESOURCE_NAME;
 	}
 
-	// public List<GlusterServer> getServers(String knownServer) {
 	public GlusterServerListResponse getServers(String knownServer) {
 		MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
 		queryParams.add(RESTConstants.QUERY_PARAM_KNOWN_SERVER, knownServer);
@@ -78,8 +77,8 @@ public class GlusterServersClient extends AbstractClient {
 		UsersClient usersClient = new UsersClient();
 		if (usersClient.authenticate("gluster", "gluster").isSuccess()) {
 
-			GlusterServersClient serverResource = new GlusterServersClient(usersClient.getSecurityToken());
-			List<GlusterServer> glusterServers = serverResource.getServers("127.0.0.1").getData();
+			GlusterServersClient glusterServersClient = new GlusterServersClient(usersClient.getSecurityToken());
+			List<GlusterServer> glusterServers = glusterServersClient.getServers("127.0.0.1").getData();
 			for (GlusterServer server : glusterServers) {
 				System.out.println(server.getName());
 			}
@@ -87,7 +86,7 @@ public class GlusterServersClient extends AbstractClient {
 			// Add server
 			 Server srv = new Server();
 			 srv.setName("server3");
-			 GlusterServerResponse response = serverResource.addServer(srv);
+			 GlusterServerResponse response = glusterServersClient.addServer(srv);
 			 System.out.println(response.getGlusterServer().getName());
 			 System.out.println(response.getStatus().isSuccess());