1 files changed, 30 insertions, 18 deletions
diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java
index 33f9e92..8391d76 100644
--- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java
+++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java
@@ -2,6 +2,8 @@ package org.onap.sdc.dcae.rule.editor.utils;
 
 import java.util.List;
 
+import org.onap.sdc.common.onaplog.Enums.LogLevel;
+import org.onap.sdc.common.onaplog.OnapLoggerError;
 import org.onap.sdc.dcae.composition.restmodels.sdc.Artifact;
 import org.onap.sdc.dcae.composition.restmodels.ruleeditor.*;
 
@@ -10,29 +12,39 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
 
 public class RulesPayloadUtils {
-	private static Gson gson = new GsonBuilder().serializeNulls()
-			.registerTypeAdapter(BaseAction.class, new ActionDeserializer())
-			.registerTypeAdapter(BaseCondition.class, new ConditionDeserializer()).create();
 
-	public static Rule parsePayloadToRule(String payload) throws JsonParseException {
-		return gson.fromJson(payload, Rule.class);
-	}
+    private static OnapLoggerError errLogger = OnapLoggerError.getInstance();
 
-	public static MappingRules parseMappingRulesArtifactPayload(String payload) throws JsonParseException {
-		return gson.fromJson(payload, MappingRules.class);
-	}
+    private static Gson gson = new GsonBuilder().serializeNulls()
+            .registerTypeAdapter(BaseAction.class, new ActionDeserializer())
+            .registerTypeAdapter(BaseCondition.class, new ConditionDeserializer()).create();
 
-	public static SchemaInfo extractInfoFromDescription(Artifact rulesArtifact) {
-		try {
-			return gson.fromJson(rulesArtifact.getArtifactDescription(), SchemaInfo.class);
-		}catch (JsonParseException e) {
-			return null;
-		}
-	}
+    private RulesPayloadUtils(){}
 
-	public static String buildSchemaAndRulesResponse(String payload, List<EventTypeDefinitionUI> schema) {
-		return  "{\"schema\":"+gson.toJson(schema)+","+payload.replaceFirst("\\{", "");
+    public static Rule parsePayloadToRule(String payload) {
+        return gson.fromJson(payload, Rule.class);
+    }
+
+    public static MappingRules parseMappingRulesArtifactPayload(String payload) {
+        return gson.fromJson(payload, MappingRules.class);
+    }
+
+	public static MappingRulesResponse parsePayloadToMappingRules(String payload) {
+		return gson.fromJson(payload, MappingRulesResponse.class);
 	}
 
+    public static SchemaInfo extractInfoFromDescription(Artifact rulesArtifact) {
+        try {
+            return gson.fromJson(rulesArtifact.getArtifactDescription(), SchemaInfo.class);
+        }catch (JsonParseException e) {
+            errLogger.log(LogLevel.ERROR, RulesPayloadUtils.class.getName(), "Exception thrown while parsing rule artifact description: {}", e);
+            return null;
+        }
+    }
+
+    public static String buildSchemaAndRulesResponse(String payload, List<EventTypeDefinitionUI> schema) {
+        return  "{\"schema\":"+gson.toJson(schema)+","+payload.replaceFirst("\\{", "");
+    }
+
 
 }