1 files changed, 11 insertions, 6 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java b/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java
index 3b13c9f8..d0b3c5f4 100644
--- a/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java
+++ b/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java
@@ -16,14 +16,14 @@
 
 package org.onap.cli.fw.input;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.onap.cli.fw.error.OnapCommandException;
 import org.onap.cli.fw.error.OnapCommandInvalidParameterValue;
 import org.onap.cli.fw.error.OnapCommandParameterMissing;
 import org.onap.cli.fw.utils.OnapCommandUtils;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -38,6 +38,11 @@ import java.util.UUID;
 public class OnapCommandParameter {
 
     /*
+     * Used locally for json conversion
+     */
+    private static Gson gson = new GsonBuilder().serializeNulls().create();
+
+    /*
      * Name, for positional parameters, the place is decided from schema file definition
      */
     private String cmdName;
@@ -211,16 +216,16 @@ public class OnapCommandParameter {
         switch (parameterType) {
             case MAP:
                 try {
-                    defaultValue = new ObjectMapper().readValue(processedValue, Map.class);
-                } catch (IOException e) {
+                    defaultValue = gson.fromJson(processedValue, Map.class);
+                } catch (Exception e) { // NOSONAR
                     throw new OnapCommandInvalidParameterValue("Invalid default value for " + this.getName(), e);
                 }
                 break;
 
             case ARRAY:
                 try {
-                    defaultValue = new ObjectMapper().readValue(processedValue, List.class);
-                } catch (IOException e) {
+                    defaultValue = gson.fromJson(processedValue, List.class);
+                } catch (Exception e) { // NOSONAR
                     throw new OnapCommandInvalidParameterValue("Invalid default value for " + this.getName(), e);
                 }
                 break;