Merge pull request #128 from Selvasundaram/master

Alerts build on UI side

3 files changed, 19 insertions, 53 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
index db8a9018..2cfae3cb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
@@ -2,6 +2,9 @@ package com.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.eclipse.osgi.internal.signedcontent.Base64;
+
+@SuppressWarnings("restriction")
 @XmlRootElement(name = "alert")
 public class Alert {
 
@@ -17,8 +20,22 @@ public class Alert {
 	protected String reference; // [for server- "Server", for Disk- "Server:disk", for volume- "Volume:Server:disk"]
 	protected String message;
 
-	public String getAlertType(ALERT_TYPES alertType) {
-		return ALERT_TYPE_STR[alertType.ordinal()];
+	public String getAlertType() {
+		return ALERT_TYPE_STR[type.ordinal()];
+	}
+
+	public Alert() {
+	}
+
+	public Alert(ALERT_TYPES type, String reference, String Message) {
+		setType(type);
+		setReference(reference);
+		setMessage(Message);
+		setId(buildAlertId());
+	}
+
+	public String buildAlertId() {
+		return Base64.encode((getAlertType() + "-" + getReference()).getBytes()).toString();
 	}
 
 	public String getId() {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertListResponse.java
deleted file mode 100644
index 57885ac1..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertListResponse.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gluster.storage.management.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.gluster.storage.management.core.response.AbstractResponse;
-
-@XmlRootElement(name = "response")
-public class AlertListResponse extends AbstractResponse {
-	private List<Alert> alerts = new ArrayList<Alert>();
-
-	public AlertListResponse() {
-
-	}
-
-	public AlertListResponse(List<Alert> alerts) {
-		setAlerts(alerts);
-	}
-
-	public void setAlerts(List<Alert> alerts) {
-		this.alerts = alerts;
-	}
-
-	@XmlElementWrapper(name = "alerts")
-	@XmlElement(name = "alert", type = Alert.class)
-	public List<Alert> getAlerts() {
-		return this.alerts;
-	}
-
-	@Override
-	public Object getData() {
-		return getAlerts();
-	}
-}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertStatus.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertStatus.java
deleted file mode 100644
index 8c563f49..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/AlertStatus.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gluster.storage.management.core.model;
-
-public class AlertStatus {
-	protected String description;
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-}