summaryrefslogtreecommitdiffstats
path: root/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-04-10 20:08:30 -0400
committerJim Hahn <jrh3@att.com>2019-04-11 08:58:10 -0400
commitea29ed1a002ab282a36761448575ffc2e517284d (patch)
tree1127a1d9acd8899b5d39323b56465455e26320fe /gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java
parentf5586edf6bb68016b4259829b57ca7e3528b126a (diff)
Don't map JSON values to Double
By default, gson treats all numbers as Double when placed into a generic Map. This is not backward compatible with existing policy APIs. Added a type adapter that walks Map objects and converts the Double values to Integer or Long, where possible. Made this the default behavior in the GsonMessageBodyHandler, the JacksonHandler, and the StandardCoder. Also fixed a couple of checkstyle errors in the gson project. Change-Id: I9ac0c77e6592d1c039646f0662c077b77a1e9aaf Issue-ID: POLICY-1542 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java')
-rw-r--r--gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java45
1 files changed, 44 insertions, 1 deletions
diff --git a/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java b/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java
index 5a49a403..18a6fc73 100644
--- a/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java
+++ b/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java
@@ -34,7 +34,6 @@ import java.util.Map;
import java.util.TreeMap;
import javax.ws.rs.core.MediaType;
import org.junit.Test;
-import org.onap.policy.common.gson.JacksonHandler;
import org.onap.policy.common.gson.annotation.GsonJsonAnyGetter;
import org.onap.policy.common.gson.annotation.GsonJsonAnySetter;
@@ -83,6 +82,30 @@ public class JacksonHandlerTest {
assertEquals(data.toString(), data2.toString());
}
+ @Test
+ public void testMapDouble() throws Exception {
+ MyMap map = new MyMap();
+ map.props = new HashMap<>();
+ map.props.put("plainString", "def");
+ map.props.put("negInt", -10);
+ map.props.put("doubleVal", 12.5);
+ map.props.put("posLong", 100000000000L);
+
+ JacksonHandler hdlr = new JacksonHandler();
+ ByteArrayOutputStream outstr = new ByteArrayOutputStream();
+ hdlr.writeTo(map, map.getClass(), map.getClass(), null, null, null, outstr);
+
+ Object obj2 = hdlr.readFrom(Object.class, map.getClass(), null, null, null,
+ new ByteArrayInputStream(outstr.toByteArray()));
+ assertEquals(map.toString(), obj2.toString());
+
+ map = (MyMap) obj2;
+
+ assertEquals(-10, map.props.get("negInt"));
+ assertEquals(100000000000L, map.props.get("posLong"));
+ assertEquals(12.5, map.props.get("doubleVal"));
+ }
+
/**
* This class includes all policy-specific gson annotations.
*/
@@ -112,6 +135,7 @@ public class JacksonHandlerTest {
/**
* Sets a property.
+ *
* @param name property name
* @param value new value
*/
@@ -129,4 +153,23 @@ public class JacksonHandlerTest {
return "Data [id=" + id + ", value=" + value + ", props=" + props + "]";
}
}
+
+ private static class MyMap {
+ private Map<String, Object> props;
+
+ @Override
+ public String toString() {
+ return props.toString();
+ }
+
+ @SuppressWarnings("unused")
+ public Map<String, Object> getProps() {
+ return props;
+ }
+
+ @SuppressWarnings("unused")
+ public void setProps(Map<String, Object> props) {
+ this.props = props;
+ }
+ }
}