Policy 1707 commit to LF

Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

1 files changed, 26 insertions, 3 deletions

diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryType.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryType.java
index 0935f64b9..b50f398a9 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryType.java
+++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/DictionaryType.java
@@ -20,19 +20,25 @@
 
 package org.openecomp.policy.api;
 
-public enum DictionaryType {
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+public enum DictionaryType{
 	/**
 	 * Indicates Common Dictionaries. 
 	 */
 	Common("Common"),
 	/**
+	 * Indicates Action Policy Dictionaries
+	 */
+	Action("Action"),
+	/**
 	 * Indicates ClosedLoop Policy Dictionaries. 
 	 */
 	ClosedLoop("ClosedLoop"),
 	/**
 	 * Indicates Firewall Config Policy Dictionaries. 
 	 */
-	Firewall("FW"),
+	Firewall("Firewall"),
 	/**
 	 * Indicates Decision Policy Dictionaries. 
 	 */
@@ -44,7 +50,7 @@ public enum DictionaryType {
 	/**
 	 * Indicates DCAE Micro Service Policy Dictionaries. 
 	 */
-	MicroService("MS"),
+	MicroService("MicroService"),
 	/**
 	 * Indicates Descriptive Scope Dictionaries
 	 */
@@ -53,6 +59,14 @@ public enum DictionaryType {
 	 * Indicates Policy Scope Dictionaries
 	 */
 	PolicyScope("PolicyScope"),
+	/**
+	 * Indicates Enforcer Dictionaries
+	 */
+	Enforcer("Enforcer"),
+	/**
+	 * Indicates SafePolicy Dictionaries
+	 */
+	SafePolicy("SafePolicy"),
 	;
 	
 	private String name;
@@ -69,5 +83,14 @@ public enum DictionaryType {
 		return this.name;
 	}
 	
+	@JsonCreator
+    public static DictionaryType create (String value) {
+        for(DictionaryType type: values()){
+            if(type.toString().equals(value) || type.equals(DictionaryType.valueOf(value))){
+                return type;
+            }
+        }
+        throw new IllegalArgumentException();
+    }
 
 }