Merge branch '2.7' into 2.8

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/failing/UnmodifiableSetTyping1392Test.java

@@ -0,0 +1,31 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.Collections;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.databind.*;
+
+public class UnmodifiableSetTyping1392Test extends BaseMapTest
+{
+    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
+    abstract static class UnmodifiableSetMixin {
+
+        @JsonCreator
+        public UnmodifiableSetMixin(Set<?> s) {}
+    }
+
+    public void testUnmodifiable() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        Class<?> unmodSetType = Collections.unmodifiableSet(Collections.<String>emptySet()).getClass();
+        mapper.addMixIn(unmodSetType, UnmodifiableSetMixin.class);
+        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+
+        final String EXPECTED_JSON = "[\""+unmodSetType.getName()+"\",[]]";
+
+        Set<?> foo = mapper.readValue(EXPECTED_JSON, Set.class);
+        assertTrue(foo.isEmpty());
+    }
+}