Merge branch '2.9'

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/jsontype/DefaultTypingWithPrimitivesTest.java

@@ -25,11 +25,15 @@ protected static class TimeUnitBean {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Test methods
-    /**********************************************************
+    /**********************************************************************
      */
 
+    private final ObjectMapper DEFTYPING_MAPPER = ObjectMapper.builder()
+            .enableDefaultTyping()
+            .build();
+    
     public void testSimpleEnumBean() throws Exception
     {
         TimeUnitBean bean = new TimeUnitBean();
@@ -42,39 +46,29 @@ public void testSimpleEnumBean() throws Exception
         assertEquals(TimeUnit.SECONDS, result.timeUnit);
 
         // then with type info
-        m = ObjectMapper.builder()
-                .enableDefaultTyping()
-                .build();
-        json = m.writeValueAsString(bean);
-        result = m.readValue(json, TimeUnitBean.class);
+        json = DEFTYPING_MAPPER.writeValueAsString(bean);
+        result = DEFTYPING_MAPPER.readValue(json, TimeUnitBean.class);
 
         assertEquals(TimeUnit.SECONDS, result.timeUnit);
     }
 
     public void testSimpleEnumsInObjectArray() throws Exception
     {
-        ObjectMapper mapper = ObjectMapper.builder()
-                .enableDefaultTyping()
-                .build();
-        
         // Typing is needed for enums
-        String json = mapper.writeValueAsString(new Object[] { TestEnum.A });
-        assertEquals("[[\"com.fasterxml.jackson.databind.jsontype.TestDefaultForEnums$TestEnum\",\"A\"]]", json);
+        String json = DEFTYPING_MAPPER.writeValueAsString(new Object[] { TestEnum.A });
+        assertEquals("[[\"com.fasterxml.jackson.databind.jsontype.deftyping.TestDefaultForEnums$TestEnum\",\"A\"]]", json);
 
         // and let's verify we get it back ok as well:
-        Object[] value = mapper.readValue(json, Object[].class);
+        Object[] value = DEFTYPING_MAPPER.readValue(json, Object[].class);
         assertEquals(1, value.length);
         assertSame(TestEnum.A, value[0]);
     }
 
     public void testSimpleEnumsAsField() throws Exception
     {
-        ObjectMapper mapper = ObjectMapper.builder()
-                .enableDefaultTyping()
-                .build();
-        String json = mapper.writeValueAsString(new EnumHolder(TestEnum.B));
-        assertEquals("{\"value\":[\"com.fasterxml.jackson.databind.jsontype.TestDefaultForEnums$TestEnum\",\"B\"]}", json);
-        EnumHolder holder = mapper.readValue(json, EnumHolder.class);
+        String json = DEFTYPING_MAPPER.writeValueAsString(new EnumHolder(TestEnum.B));
+        assertEquals("{\"value\":[\"com.fasterxml.jackson.databind.jsontype.deftyping.TestDefaultForEnums$TestEnum\",\"B\"]}", json);
+        EnumHolder holder = DEFTYPING_MAPPER.readValue(json, EnumHolder.class);
         assertSame(TestEnum.B, holder.value);
     }
 }

src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/TestDefaultForEnums.java

@@ -344,7 +344,7 @@ public void testFeature432() throws Exception
                 .enableDefaultTypingAsProperty(DefaultTyping.OBJECT_AND_NON_CONCRETE, "*CLASS*")
                 .build();
         String json = mapper.writeValueAsString(new BeanHolder(new StringBean("punny")));
-        assertEquals("{\"bean\":{\"*CLASS*\":\"com.fasterxml.jackson.databind.jsontype.TestDefaultForObject$StringBean\",\"name\":\"punny\"}}", json);
+        assertEquals("{\"bean\":{\"*CLASS*\":\"com.fasterxml.jackson.databind.jsontype.deftyping.TestDefaultForObject$StringBean\",\"name\":\"punny\"}}", json);
     }
 
     public void testNoGoWithExternalProperty() throws Exception

src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/TestDefaultForObject.java

@@ -2,7 +2,9 @@
 
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 
 /**
  * Unit tests to verify that Java/JSON scalar values (non-structured values)
@@ -16,10 +18,15 @@ static class Jackson417Bean {
         public java.io.Serializable bar = new Integer(13);
     }
 
+    // [databind#1395]: prevent attempts at including type info for primitives
+    static class Data {
+        public long key;
+    }
+
     /*
-    /**********************************************************
-    /* Unit tests
-    /**********************************************************
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
      */
 
     private final ObjectMapper DEFAULT_TYPING_MAPPER = ObjectMapper.builder()
@@ -95,4 +102,30 @@ public void test417() throws Exception
         assertEquals(input.foo, result.foo);
         assertEquals(input.bar, result.bar);
     }
+
+    // [databind#1395]: prevent attempts at including type info for primitives
+    public void testDefaultTypingWithLong() throws Exception
+    {
+        Data data = new Data();
+        data.key = 1L;
+        Map<String, Object> mapData = new HashMap<String, Object>();
+        mapData.put("longInMap", 2L);
+        mapData.put("longAsField", data);
+
+        // Configure Jackson to preserve types
+        StdTypeResolverBuilder resolver = new StdTypeResolverBuilder(JsonTypeInfo.Id.CLASS,
+                JsonTypeInfo.As.PROPERTY, "__t");
+        ObjectMapper mapper = ObjectMapper.builder()
+                .enable(SerializationFeature.INDENT_OUTPUT)
+                .setDefaultTyping(resolver)
+                .build();
+
+        // Serialize
+        String json = mapper.writeValueAsString(mapData);
+
+        // Deserialize
+        Map<?,?> result = mapper.readValue(json, Map.class);
+        assertNotNull(result);
+        assertEquals(2, result.size());
+    }
 }