Merge branch 'master' of github.com:gluster/console

4 files changed, 27 insertions, 16 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 fedfacaa..4aa029b8 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
@@ -26,24 +26,26 @@ public abstract class AbstractClient {
 	private String securityToken;

 	private String authHeader;

 

+	/**

+	 * This constructor will work only after the data model manager has been initialized.

+	 */

 	public AbstractClient() {

-		createResource();

+		this(GlusterDataModelManager.getInstance().getSecurityToken(), GlusterDataModelManager.getInstance().getClusterName());

 	}

 

-	private void createResource() {

-		URI baseURI = new ClientUtil().getServerBaseURI();

-		resource = Client.create(new DefaultClientConfig()).resource(baseURI).path(getResourcePath());

+	/**

+	 * This constructor will work only after the data model manager has been initialized.

+	 */

+	public AbstractClient(String clusterName) {

+		this(GlusterDataModelManager.getInstance().getSecurityToken(), clusterName);

 	}

 

 	public AbstractClient(String securityToken, String clusterName) {

 		this.clusterName = clusterName;

 		setSecurityToken(securityToken);

+		URI baseURI = new ClientUtil().getServerBaseURI();

 		// this must be after setting clusterName as sub-classes may refer to cluster name in the getResourcePath method

-		createResource();

-	}

-

-	public AbstractClient(String clusterName) {

-		this(GlusterDataModelManager.getInstance().getSecurityToken(), clusterName);

+		resource = Client.create(new DefaultClientConfig()).resource(baseURI).path(getResourcePath());

 	}

 

 	/**

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 06400b86..35d8cbfc 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
@@ -120,8 +120,7 @@ public class GlusterDataModelManager {
 	}
 
 	private void initializeGlusterServers(Cluster cluster) {
-		GlusterServerListResponse glusterServerListResponse = new GlusterServersClient(clusterName)
-				.getServers();
+		GlusterServerListResponse glusterServerListResponse = new GlusterServersClient().getServers();
 		if (!glusterServerListResponse.getStatus().isSuccess()) {
 			throw new GlusterRuntimeException(glusterServerListResponse.getStatus().getMessage());
 		}
@@ -138,7 +137,7 @@ public class GlusterDataModelManager {
 	}
 
 	private void initializeVolumes(Cluster cluster) {
-		VolumesClient volumeClient = new VolumesClient(clusterName);
+		VolumesClient volumeClient = new VolumesClient();
 		VolumeListResponse response = volumeClient.getAllVolumes();
 		if (!response.getStatus().isSuccess()) {
 			throw new GlusterRuntimeException("Error fetching volume list: [" + response.getStatus() + "]");
@@ -147,7 +146,7 @@ public class GlusterDataModelManager {
 	}
 
 	private void initializeVolumeOptionsDefaults() {
-		VolumeOptionInfoListResponse response = new VolumesClient(clusterName).getVolumeOptionsDefaults();
+		VolumeOptionInfoListResponse response = new VolumesClient().getVolumeOptionsDefaults();
 		if (!response.getStatus().isSuccess()) {
 			throw new GlusterRuntimeException("Error fetching volume option defaults: ["
 					+ response.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 3d1720ec..f5609584 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+* Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
  * Gluster Management Console is free software; you can redistribute it and/or 
@@ -18,12 +18,14 @@
  *******************************************************************************/
 package com.gluster.storage.management.client;
 
+import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
+
 import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
 import com.gluster.storage.management.core.constants.RESTConstants;
-import static com.gluster.storage.management.core.constants.RESTConstants.*;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.model.Status;
@@ -34,6 +36,11 @@ import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 public class GlusterServersClient extends AbstractClient {
+	
+	public GlusterServersClient() {
+		super();
+	}
+	
 	public GlusterServersClient(String clusterName) {
 		super(clusterName);
 	}
@@ -88,7 +95,6 @@ public class GlusterServersClient extends AbstractClient {
 			 GlusterServerResponse response = glusterServersClient.addServer(srv);
 			 System.out.println(response.getGlusterServer().getName());
 			 System.out.println(response.getStatus().isSuccess());
-			
 		}
 	}
 }
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
index d38a41b3..4ab21a01 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
@@ -42,6 +42,10 @@ import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 public class VolumesClient extends AbstractClient {
+	public VolumesClient() {
+		super();
+	}
+	
 	public VolumesClient(String clusterName) {
 		super(clusterName);
 	}