...

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/JsonDeserializer.java

@@ -275,6 +275,7 @@ public Collection<Object> getKnownPropertyNames() {
      * 
      * @since 2.6 Added to replace earlier no-arguments variant
      */
+    @Override
     public T getNullValue(DeserializationContext ctxt) throws JsonMappingException {
         // Change the direction in 2.7
         return getNullValue();

src/main/java/com/fasterxml/jackson/databind/deser/impl/NullsConstantProvider.java

@@ -22,7 +22,7 @@ public class NullsConstantProvider
 
     protected final AccessPattern _access;
 
-    public NullsConstantProvider(Object nvl) {
+    protected NullsConstantProvider(Object nvl) {
         _nullValue = nvl;
         _access = (_nullValue == null) ? AccessPattern.ALWAYS_NULL
                 : AccessPattern.CONSTANT;
@@ -41,6 +41,13 @@ public static NullsConstantProvider nuller() {
         return NULLER;
     }
 
+    public static NullsConstantProvider forValue(Object nvl) {
+        if (nvl == null) {
+            return NULLER;
+        }
+        return new NullsConstantProvider(nvl);
+    }
+
     @Override
     public AccessPattern getNullAccessPattern() {
         return _access;

src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java

@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.databind.deser.impl.NullsFailProvider;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
+import com.fasterxml.jackson.databind.util.AccessPattern;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.databind.util.Converter;
 
@@ -1145,6 +1146,16 @@ protected final NullValueProvider _findNullProvider(DeserializationContext ctxt,
                                 String.format("Can not create empty instance of %s, no default Creator", type));
                     }
                 }
+                // Second: can with pre-fetch value?
+                {
+                    AccessPattern access = valueDeser.getEmptyAccessPattern();
+                    if (access == AccessPattern.ALWAYS_NULL) {
+                        return NullsConstantProvider.nuller();
+                    }
+                    if (access == AccessPattern.CONSTANT) {
+                        return NullsConstantProvider.forValue(valueDeser.getEmptyValue(ctxt));
+                    }
+                }
                 return new NullsAsEmptyProvider(valueDeser);
             case SKIP: // not handled here
             default: // SET/DEFAULT, nothing to do; S

src/test/java/com/fasterxml/jackson/databind/filter/IgnoreCreatorProp1317Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/filter/IgnoreCreatorProp1317Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.deser.filter;
 
 import java.beans.ConstructorProperties;
 

src/test/java/com/fasterxml/jackson/databind/filter/IgnorePropertyOnDeser1217Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/filter/IgnorePropertyOnDeser1217Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.deser.filter;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.BaseMapTest;

src/test/java/com/fasterxml/jackson/databind/filter/NullConversionsForContentTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/filter/NullConversionsForContentTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.deser.filter;
 
 import java.util.*;
 

src/test/java/com/fasterxml/jackson/databind/filter/NullConversionsTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/filter/NullConversionsTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.deser.filter;
 
 import java.util.List;
 import java.util.Map;

src/test/java/com/fasterxml/jackson/databind/filter/ProblemHandlerTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/filter/ProblemHandlerTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.deser.filter;
 
 import java.io.IOException;
 import java.util.Map;

src/test/java/com/fasterxml/jackson/databind/filter/TestUnknownPropertyDeserialization.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/filter/TestUnknownPropertyDeserialization.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.deser.filter;
 
 import java.io.*;
 import java.util.*;

src/test/java/com/fasterxml/jackson/databind/filter/IgnorePropsForSerTest.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/IgnorePropsForSerTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.util.*;
 

src/test/java/com/fasterxml/jackson/databind/filter/JsonInclude1327Test.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonInclude1327Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.util.*;
 

src/test/java/com/fasterxml/jackson/databind/filter/JsonIncludeArrayTest.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeArrayTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.io.IOException;
 

src/test/java/com/fasterxml/jackson/databind/filter/JsonIncludeCollectionTest.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeCollectionTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.util.Arrays;
 import java.util.EnumSet;

src/test/java/com/fasterxml/jackson/databind/filter/JsonIncludeCustomTest.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeCustomTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

src/test/java/com/fasterxml/jackson/databind/filter/JsonIncludeTest.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.io.IOException;
 import java.util.*;

src/test/java/com/fasterxml/jackson/databind/filter/MapInclusionTest.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/MapInclusionTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;

src/test/java/com/fasterxml/jackson/databind/filter/NullSerializationTest.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/NullSerializationTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.io.*;
 

src/test/java/com/fasterxml/jackson/databind/filter/ReadOnlyProperties95Test.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/ReadOnlyProperties95Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.*;

src/test/java/com/fasterxml/jackson/databind/filter/TestAnyGetterFiltering.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/TestAnyGetterFiltering.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.util.*;
 

src/test/java/com/fasterxml/jackson/databind/filter/TestIgnoredTypes.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/TestIgnoredTypes.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/com/fasterxml/jackson/databind/filter/TestJsonFilter.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/TestJsonFilter.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import com.fasterxml.jackson.annotation.*;
 

src/test/java/com/fasterxml/jackson/databind/filter/TestMapFiltering.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/TestMapFiltering.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.io.IOException;
 import java.lang.annotation.*;

src/test/java/com/fasterxml/jackson/databind/filter/TestSimpleSerializationIgnore.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/filter/TestSimpleSerializationIgnore.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.filter;
+package com.fasterxml.jackson.databind.ser.filter;
 
 import java.util.*;