1 files changed, 12 insertions, 3 deletions
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java
index 8454bc61a8..c3d32df447 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/json/JsonUtil.java
@@ -32,8 +32,10 @@ import org.everit.json.schema.ValidationException;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONObject;
 import org.openecomp.core.utilities.CommonMethods;
+import org.openecomp.core.utilities.deserializers.RequirementDefinitionDeserializer;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
+import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -51,6 +53,15 @@ import java.util.stream.Collectors;
  */
 public class JsonUtil {
   private static final Logger logger = LoggerFactory.getLogger(JsonUtil.class);
+  private static final GsonBuilder gsonBuilder;
+  private static final Gson gson;
+
+  static {
+    gsonBuilder = new GsonBuilder();
+    gsonBuilder.registerTypeAdapter(RequirementDefinition.class, new
+        RequirementDefinitionDeserializer());
+    gson = gsonBuilder.create();
+  }
 
   /**
    * Object 2 json string.
@@ -86,9 +97,7 @@ public class JsonUtil {
     T typ;
     try {
       try (Reader br = new StringReader(json)) {
-        typ = new Gson().fromJson(br, classOfT);
-      } catch (IOException exception) {
-        throw exception;
+        typ = gson.fromJson(br, classOfT);
       }
     } catch (JsonIOException | JsonSyntaxException | IOException exception) {
       throw new RuntimeException(exception);