2 files changed, 13 insertions, 5 deletions
diff --git a/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java b/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java
index a36f8a07..ad270910 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java
@@ -62,9 +62,17 @@ public class GsonMessageBodyHandler implements MessageBodyReader<Object>, Messag
      * into Integer/Long, where possible.
      */
     public GsonMessageBodyHandler() {
-        this(new GsonBuilder().registerTypeAdapterFactory(new MapDoubleAdapterFactory()).create());
+        this(new GsonBuilder());
+    }
 
-        logger.info("Using GSON for REST calls");
+    /**
+     * Constructs the object, using a Gson object that translates Doubles inside of Maps
+     * into Integer/Long, where possible.
+     *
+     * @param builder builder to use to create the gson object
+     */
+    public GsonMessageBodyHandler(GsonBuilder builder) {
+        this(builder.registerTypeAdapterFactory(new MapDoubleAdapterFactory()).create());
     }
 
     /**
@@ -74,6 +82,8 @@ public class GsonMessageBodyHandler implements MessageBodyReader<Object>, Messag
      */
     public GsonMessageBodyHandler(Gson gson) {
         this.gson = gson;
+
+        logger.info("Using GSON for REST calls");
     }
 
     @Override
diff --git a/gson/src/main/java/org/onap/policy/common/gson/JacksonHandler.java b/gson/src/main/java/org/onap/policy/common/gson/JacksonHandler.java
index ad9692f4..6d946439 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/JacksonHandler.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/JacksonHandler.java
@@ -49,9 +49,7 @@ public class JacksonHandler extends GsonMessageBodyHandler {
         super(builder
                         .registerTypeAdapterFactory(new JacksonFieldAdapterFactory())
                         .registerTypeAdapterFactory(new JacksonMethodAdapterFactory())
-                        .registerTypeAdapterFactory(new MapDoubleAdapterFactory())
-                        .setExclusionStrategies(new JacksonExclusionStrategy())
-                        .create());
+                        .setExclusionStrategies(new JacksonExclusionStrategy()));
     }
 
 }