From 635b4f7f0475f2228d7e621c21376dc99b986c6c Mon Sep 17 00:00:00 2001
From: Ryan Brandt <ryan.brandt@hp.com>
Date: Thu, 28 Jan 2016 13:37:05 -0700
Subject: [PATCH] Add fromString and fromJson to AlarmSeverity

Change-Id: I8fc51565df2289d1ff17c90c8553f5ebb07d1a0c
---
 .../common/model/alarm/AlarmSeverity.java     | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSeverity.java b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSeverity.java
index 2a634dbf..e38dfa97 100644
--- a/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSeverity.java
+++ b/java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSeverity.java
@@ -16,6 +16,25 @@
  */
 package monasca.common.model.alarm;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public enum AlarmSeverity {
-  LOW, MEDIUM, HIGH, CRITICAL
+  LOW, MEDIUM, HIGH, CRITICAL;
+
+  public static AlarmSeverity fromString(String text) {
+    if (text != null) {
+      for (AlarmSeverity alarmSeverity : AlarmSeverity.values()) {
+        if (text.equalsIgnoreCase(alarmSeverity.toString())) {
+          return alarmSeverity;
+        }
+      }
+    }
+    return null;
+  }
+
+  @JsonCreator
+  public static AlarmSeverity fromJson(@JsonProperty("severity") String text) {
+    return AlarmSeverity.valueOf(text.toUpperCase());
+  }
 }