Jackson databind changes for draft v4 schema generator

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

@@ -1,14 +1,16 @@
 package com.fasterxml.jackson.databind.jsontype.impl;
 
-import java.util.*;
-
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.DatabindContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.TreeSet;
+
 public class TypeNameIdResolver extends TypeIdResolverBase
 {
     protected final MapperConfig<?> _config;
@@ -80,7 +82,16 @@ public static TypeNameIdResolver construct(MapperConfig<?> config, JavaType base
     @Override
     public String idFromValue(Object value)
     {
-        Class<?> cls = _typeFactory.constructType(value.getClass()).getRawClass();
+       return idFromClass(value.getClass());
+    }
+
+
+    protected String idFromClass(Class<?> clazz)
+    {
+        if(clazz==null){
+            return null;
+        }
+        Class<?> cls = _typeFactory.constructType(clazz).getRawClass();
         final String key = cls.getName();
         String name;
         synchronized (_typeToId) {
@@ -108,7 +119,7 @@ public String idFromValueAndType(Object value, Class<?> type) {
          *   it seems; nothing much we can figure out that way.
          */
         if (value == null) {
-            return null;
+            return idFromClass(type);
         }
         return idFromValue(value);
     }

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

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.databind.jsontype;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+
+/**
+ * Created by zoliszel on 22/06/2015.
+ */
+public class TestTypeIdResolver {
+
+    private ObjectMapper mapper;
+
+    @JsonTypeName(TestClass.NAME)
+    public static class TestClass{
+            public static final String NAME = "TEST_CLASS";
+    }
+
+    @Before
+    public void setup(){
+        mapper = new ObjectMapper();
+
+        TypeResolverBuilder<?> typerBuilder = new ObjectMapper.DefaultTypeResolverBuilder(ObjectMapper.DefaultTyping.NON_FINAL);
+        typerBuilder = typerBuilder.init(JsonTypeInfo.Id.NAME, null);
+        typerBuilder = typerBuilder.inclusion(JsonTypeInfo.As.PROPERTY);
+        mapper.setDefaultTyping(typerBuilder);
+    }
+
+    @Test
+    public void testTypeIdResolutionForClasses(){
+        SerializationConfig config= mapper.getSerializationConfig();
+        BeanDescription beanDescription = config.introspectClassAnnotations(TestClass.class);
+        Assert.assertNotNull("BeanDescription should not be null",beanDescription);
+
+        TypeResolverBuilder<?> typer = config.getDefaultTyper(mapper.constructType(TestClass.class));
+        Assert.assertNotNull("Typer should not be null",typer);
+
+        TypeSerializer typeSerializer = typer.buildTypeSerializer(config, mapper.constructType(TestClass.class), Collections.EMPTY_LIST);
+
+        Assert.assertNotNull("TypeSerializer should not be null",typeSerializer);
+        Assert.assertNotNull("TypeId resolver should not be null",typeSerializer.getTypeIdResolver() );
+
+        String typeName = typeSerializer.getTypeIdResolver().idFromValueAndType(null, TestClass.class);
+        Assert.assertEquals("TypeName was not resolved correctly",TestClass.NAME,typeName);
+    }
+}