Fixed #1868

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -707,3 +707,7 @@ Tim Bartley (tbartley@github)
   * Reported, suggested fix for #1705: Non-generic interface method hides type resolution info
     from generic base class
    (2.9.1)
+
+Rob Winch (rwinch@github)
+  * Reported #1868: Class name handling for JDK unmodifiable Collection types changed
+   (2.9.4)

release-notes/VERSION-2.x

@@ -10,6 +10,8 @@ Project: jackson-databind
 #1854: NPE deserializing collection with `@JsonCreator` and `ACCEPT_CASE_INSENSITIVE_PROPERTIES`
  (reported by rue-jw@github)
 #1855: Blacklist for more serialization gadgets (dbcp/tomcat, spring)
+#1868: Class name handling for JDK unmodifiable Collection types changed
+ (reported by Rob W)
 
 2.9.3 (09-Dec-2017)
 

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java

@@ -134,8 +134,7 @@ private static boolean isJavaUtilCollectionClass(String clz, String type)
         if (clz.startsWith("Collections$")) {
             // 02-Jan-2017, tatu: As per [databind#1868], may need to leave Unmodifiable variants as is
             return (clz.indexOf(type) > 0)
-//                    && !clz.contains("Unmodifiable");
-                    ;
+                    && !clz.contains("Unmodifiable");
         }
         if (clz.startsWith("Arrays$")) {
             return (clz.indexOf(type) > 0);

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKCollectionsDeserTest.java

@@ -2,6 +2,7 @@
 
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import com.fasterxml.jackson.databind.*;
@@ -44,8 +45,7 @@ public void testSingletonCollections() throws Exception
         assertEquals(28, result.iterator().next().x);
     }
 
-    // [databind#1868]: Not sure if this should or should not pass...
-    /*
+    // [databind#1868]: Verify class name serialized as is
     public void testUnmodifiableSet() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
@@ -56,10 +56,16 @@ public void testUnmodifiableSet() throws Exception
 
         assertEquals("[\"java.util.Collections$UnmodifiableSet\",[\"a\"]]", json);
 
-        // and back...
+        // 04-Jan-2018, tatu: Alas, no way to make this actually work well, at this point.
+        //   In theory could jiggle things back on deser, using one of two ways:
+        //
+        //   1) Do mapping to regular Set/List types (abstract type mapping): would work, but get rid of immutability
+        //   2) Have actually separate deserializer OR ValueInstantiator
+        
+        /*
         Set<String> result = mapper.readValue(json, Set.class);
         assertNotNull(result);
         assertEquals(1, result.size());
+        */
     }
-    */
 }

src/test/java/perf/ManualReadPerfUntyped.java

@@ -21,8 +21,8 @@ public static void main(String[] args) throws Exception
         boolean doIntern = true;
 
         JsonFactory f = JsonFactory.builder()
-            .configure(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, doIntern)
-            .configure(JsonFactory.Feature.INTERN_FIELD_NAMES, doIntern)
+            .set(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, doIntern)
+            .set(JsonFactory.Feature.INTERN_FIELD_NAMES, doIntern)
             .build();
 
         ObjectMapper m = new ObjectMapper(f);

src/test/java/perf/ManualReadPerfUntypedReader.java

@@ -22,8 +22,8 @@ public static void main(String[] args) throws Exception
         boolean doIntern = true;
 
         JsonFactory f = JsonFactory.builder()
-            .configure(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, doIntern)
-            .configure(JsonFactory.Feature.INTERN_FIELD_NAMES, doIntern)
+            .set(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, doIntern)
+            .set(JsonFactory.Feature.INTERN_FIELD_NAMES, doIntern)
             .build();
         ObjectMapper m = new ObjectMapper(f);
         Object input1 = m.readValue(data, Object.class);

src/test/java/perf/ManualReadPerfUntypedStream.java

@@ -21,8 +21,8 @@ public static void main(String[] args) throws Exception
 
         boolean doIntern = true;
         JsonFactory f = JsonFactory.builder()
-                .configure(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, doIntern)
-                .configure(JsonFactory.Feature.INTERN_FIELD_NAMES, doIntern)
+                .set(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, doIntern)
+                .set(JsonFactory.Feature.INTERN_FIELD_NAMES, doIntern)
                 .build();
         ObjectMapper m = new ObjectMapper(f);
         Object input1 = m.readValue(data, Object.class);