VolumeOptions data model change

1 files changed, 4 insertions, 16 deletions

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 296de3d6..6db98ed4 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
@@ -604,10 +604,10 @@ public class GlusterDataModelManager {
 		}
 	}
 
-	public void setVolumeOption(Volume volume, Entry<String, String> entry) {
-		volume.setOption(entry.getKey(), (String) entry.getValue());
+	public void setVolumeOption(Volume volume, String optionKey, String optionValue) {
+		volume.setOption(optionKey, optionValue);
 		for (ClusterListener listener : listeners) {
-			listener.volumeChanged(volume, new Event(EVENT_TYPE.VOLUME_OPTION_SET, entry));
+			listener.volumeChanged(volume, new Event(EVENT_TYPE.VOLUME_OPTION_SET, optionKey));
 		}
 	}
 
@@ -672,8 +672,7 @@ public class GlusterDataModelManager {
 	}
 
 	public void setAccessControlList(Volume volume, String accessControlList) {
-		volume.setAccessControlList(accessControlList);
-		setVolumeOption(volume, getOptionEntry(volume, Volume.OPTION_AUTH_ALLOW));
+		setVolumeOption(volume, Volume.OPTION_AUTH_ALLOW, accessControlList);
 	}
 
 	public Server getGlusterServer(String serverName) {
@@ -685,17 +684,6 @@ public class GlusterDataModelManager {
 		return null;
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private Entry<String, String> getOptionEntry(Volume volume, String optionKey) {
-		for (Entry entry : volume.getOptions().entrySet()) {
-			if (entry.getKey().equals(optionKey)) {
-				return entry;
-			}
-		}
-		throw new GlusterRuntimeException("Couldn't find entry for option [" + optionKey + "] on volume ["
-				+ volume.getName());
-	}
-
 	private Boolean isDiskUsed(Volume volume, Disk disk) {
 		for (Brick brick : volume.getBricks()) {
 			if (disk.getName().equals(brick.getDiskName()) && disk.getServerName().equals(brick.getServerName())) {