Try to straight out eof handling; for now there's no way to really catch that at databind

Author: cowtowncoder

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

@@ -867,7 +867,7 @@ public Object handleWeirdKey(Class<?> keyClass, String keyValue,
         while (h != null) {
             // Can bail out if it's handled
             Object key = h.value().handleWeirdKey(this, keyClass, keyValue, msg);
-            if (key  != DeserializationProblemHandler.NOT_HANDLED) {
+            if (key != DeserializationProblemHandler.NOT_HANDLED) {
                 return key;
             }
             h = h.next();
@@ -993,13 +993,6 @@ public JsonMappingException reportWrongTokenException(JsonParser p,
         throw wrongTokenException(p, expToken, msg);
     }
 
-    /**
-     * @since 2.8
-     */
-    public void reportEndOfInputException(Class<?> instClass) throws JsonMappingException {
-        throw endOfInputException(instClass);
-    }
-
     /**
      * @since 2.8
      */
@@ -1076,6 +1069,13 @@ public JsonMappingException mappingException(String msgTemplate, Object... args)
         return JsonMappingException.from(getParser(), msgTemplate);
     }
 
+    /*
+    /**********************************************************
+    /* Methods for constructing semantic exceptions; usually not
+    /* to be called direclty, call `handleXxx()` instead
+    /**********************************************************
+     */
+
     /**
      * Helper method for constructing exception to indicate that given JSON
      * Object field name was not in format to be able to deserialize specified
@@ -1089,6 +1089,18 @@ public JsonMappingException weirdKeyException(Class<?> keyClass, String keyValue
                 keyValue, keyClass);
     }
 
+    /**
+     * Helper method for constructing exception to indicate that end-of-input was
+     * reached while still expecting more tokens to deserialize value of specified type.
+     *
+     * @deprecated Since 2.8; currently no way to catch EOF at databind level
+     */
+    @Deprecated
+    public JsonMappingException endOfInputException(Class<?> instClass) {
+        return JsonMappingException.from(_parser, "Unexpected end-of-input when trying to deserialize a "
+                +instClass.getName());
+    }
+    
     /*
     /**********************************************************
     /* Methods for constructing semantic exceptions; mostly
@@ -1188,15 +1200,6 @@ public JsonMappingException unknownTypeException(JavaType type, String id,
         return JsonMappingException.from(_parser, msg);
     }
 
-    /**
-     * @deprecated Since 2.8 use {@link #reportEndOfInputException} instead
-     */
-    @Deprecated
-    public JsonMappingException endOfInputException(Class<?> instClass) {
-        return JsonMappingException.from(_parser, "Unexpected end-of-input when trying to deserialize a "
-                +instClass.getName());
-    }
-
     /*
     /**********************************************************
     /* Overridable internal methods

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java

@@ -172,9 +172,9 @@ protected final Object _deserializeOther(JsonParser p, DeserializationContext ct
         return null;
     }
 
+    @Deprecated // since 2.8; remove unless getting used
     protected Object _missingToken(JsonParser p, DeserializationContext ctxt) throws IOException {
-        ctxt.reportEndOfInputException(handledType());
-        return null;
+        throw ctxt.endOfInputException(handledType());
     }
 
     /**

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

@@ -265,10 +265,6 @@ protected final ArrayNode deserializeArray(JsonParser p, DeserializationContext
         ArrayNode node = nodeFactory.arrayNode();
         while (true) {
             JsonToken t = p.nextToken();
-            if (t == null) {
-                ctxt.reportEndOfInputException(ArrayNode.class);
-                return node;
-            }
             switch (t.id()) {
             case JsonTokenId.ID_START_OBJECT:
                 node.add(deserializeObject(p, ctxt, nodeFactory));
@@ -378,7 +374,6 @@ protected final JsonNode _fromFloat(JsonParser p, DeserializationContext ctxt,
     protected final JsonNode _fromEmbedded(JsonParser p, DeserializationContext ctxt,
             JsonNodeFactory nodeFactory) throws IOException
     {
-        // [JACKSON-796]
         Object ob = p.getEmbeddedObject();
         if (ob == null) { // should this occur?
             return nodeFactory.nullNode();

src/test/java/com/fasterxml/jackson/databind/filter/ProblemHandlerTest.java

@@ -7,6 +7,11 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 
+/**
+ * Tests to exercise handler methods of {@link DeserializationProblemHandler}.
+ *
+ * @since 2.8
+ */
 public class ProblemHandlerTest extends BaseMapTest
 {
     static class WeirdKeyHandler
@@ -54,7 +59,7 @@ static class Impl extends Base {
     static class BaseWrapper {
         public Base value;
     }
-    
+
     /*
     /**********************************************************
     /* Test methods