Update release notes wrt #1823

Author: cowtowncoder

release-notes/CREDITS

@@ -717,3 +717,8 @@ Vincent Demay (vdemay@github)
   * Reported #1793: `java.lang.NullPointerException` in `ObjectArraySerializer.acceptJsonFormatVisitor()`
     for array value with `@JsonValue`
    (2.9.2)
+
+Peter Jurkovic (peterjurkovic@github)
+  * Reported #1823: ClassNameIdResolver doesn't handle resolve Collections$SingletonMap,
+    Collections$SingletonSet
+   (2.9.3)

release-notes/VERSION

@@ -13,6 +13,8 @@ Project: jackson-databind
  (reported byb henryptung@github)
 #1807: Jackson-databind caches plain map deserializer and use it even map has `@JsonDeserializer`
  (reported by lexas2509@github)
+#1823: ClassNameIdResolver doesn't handle resolve Collections$SingletonMap & Collections$SingletonSet
+ (reported by Peter J)
 #1842: `null` String for `Exception`s deserialized as String "null" instead of `null`
  (reported by ZeleniJure@github)
 #1843: Include name of unsettable property in exception from `SetterlessProperty.set()`

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

@@ -70,7 +70,7 @@ protected String _idFrom(Object value, Class<?> cls, TypeFactory typeFactory)
             }
         }
         String str = cls.getName();
-        if (str.startsWith("java.util")) {
+        if (str.startsWith("java.util.")) {
             // 25-Jan-2009, tatu: There are some internal classes that we cannot access as is.
             //     We need better mechanism; for now this has to do...
 
@@ -87,22 +87,20 @@ protected String _idFrom(Object value, Class<?> cls, TypeFactory typeFactory)
                 // not optimal: but EnumMap is not a customizable type so this is sort of ok
                 str = typeFactory.constructMapType(EnumMap.class, enumClass, valueClass).toCanonical();
             } else {
-                /* 17-Feb-2010, tatus: Another such case: result of
-                 *    Arrays.asList() is named like so in Sun JDK...
-                 *   Let's just plain old ArrayList in its place
-                 * NOTE: chances are there are plenty of similar cases
-                 * for other wrappers... (immutable, singleton, synced etc)
-                 */
-                if (isJavaUtilCollectionClass(str, "List")) {
-                    str = "java.util.ArrayList";
-                }else if(isJavaUtilCollectionClass(str, "Map")){
-                    str = "java.util.HashMap";
-                }else if(isJavaUtilCollectionClass(str, "Set")){
-                    str = "java.util.HashSet";
+                // 17-Feb-2010, tatus: Another such case: result of Arrays.asList() is
+                // named like so in Sun JDK... Let's just plain old ArrayList in its place.
+                // ... also, other similar cases exist...
+                String suffix = str.substring(10);
+                if (isJavaUtilCollectionClass(suffix, "List")) {
+                    str = ArrayList.class.getName();
+                } else if(isJavaUtilCollectionClass(suffix, "Map")){
+                    str = HashMap.class.getName();
+                } else if(isJavaUtilCollectionClass(suffix, "Set")){
+                    str = HashSet.class.getName();
                 }
             }
         } else if (str.indexOf('$') >= 0) {
-            /* Other special handling may be needed for inner classes, [JACKSON-584].
+            /* Other special handling may be needed for inner classes,
              * The best way to handle would be to find 'hidden' constructor; pass parent
              * value etc (which is actually done for non-anonymous static classes!),
              * but that is just not possible due to various things. So, we will instead
@@ -131,8 +129,8 @@ public String getDescForKnownTypeIds() {
         return "class name used as type id";
     }
 
-    private static boolean isJavaUtilCollectionClass(String clazzName, String type){
-        String end = clazzName.substring(9);
-        return (end.startsWith(".Collections$") || end.startsWith(".Arrays$")) && clazzName.indexOf(type) > 0;
+    private static boolean isJavaUtilCollectionClass(String clz, String type){
+        return (clz.startsWith("Collections$") || clz.startsWith("Arrays$"))
+                && clz.indexOf(type) > 0;
     }
 }

src/test/java/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolverTest.java

@@ -20,15 +20,14 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(TypeFactory.class)
-public class ClassNameIdResolverTest {
-
+public class ClassNameIdResolverTest
+{
     @Mock
     private JavaType javaType;
 
     @Mock
     private TypeFactory typeFactory;
-    
-    
+
     private ClassNameIdResolver classNameIdResolver;
 
     @Before