Backport #486 in 2.3 as well

Author: cowtowncoder

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

@@ -127,12 +127,8 @@ public Object deserialize(JsonParser jp, DeserializationContext ctxt)
     }
 
     protected final Object _deserializeOther(JsonParser jp, DeserializationContext ctxt,
-            JsonToken t)
-        throws IOException, JsonProcessingException
+            JsonToken t) throws IOException
     {
-        if (t == null) {
-            return _missingToken(jp, ctxt);
-        }
         // and then others, generally requiring use of @JsonCreator
         switch (t) {
         case VALUE_STRING:
@@ -142,7 +138,7 @@ protected final Object _deserializeOther(JsonParser jp, DeserializationContext c
         case VALUE_NUMBER_FLOAT:
 	    return deserializeFromDouble(jp, ctxt);
         case VALUE_EMBEDDED_OBJECT:
-            return jp.getEmbeddedObject();
+            return deserializeFromEmbedded(jp, ctxt);
         case VALUE_TRUE:
         case VALUE_FALSE:
             return deserializeFromBoolean(jp, ctxt);

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

@@ -967,8 +967,7 @@ protected Object _handleTypedObjectId(JsonParser jp, DeserializationContext ctxt
      */
     @SuppressWarnings("resource") // TokenBuffers don't need close, nor parser thereof
     protected Object _convertObjectId(JsonParser jp, DeserializationContext ctxt,
-            Object rawId, JsonDeserializer<Object> idDeser)
-        throws IOException, JsonProcessingException
+            Object rawId, JsonDeserializer<Object> idDeser) throws IOException
     {
         TokenBuffer buf = new TokenBuffer(jp);
         if (rawId instanceof String) {
@@ -979,6 +978,8 @@ protected Object _convertObjectId(JsonParser jp, DeserializationContext ctxt,
             buf.writeNumber(((Integer) rawId).intValue());
         } else {
             // should we worry about UUIDs? They should be fine, right?
+            // 07-Aug-2014, tatu: Maybe, but not necessarily; had issues with
+            //   Smile format; [Smile#19], possibly related.
             buf.writeObject(rawId);
         }
         JsonParser bufParser = buf.asParser();
@@ -1045,8 +1046,7 @@ protected Object deserializeWithObjectId(JsonParser jp, DeserializationContext c
      * Method called in cases where it looks like we got an Object Id
      * to parse and use as a reference.
      */
-    protected Object deserializeFromObjectId(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
+    protected Object deserializeFromObjectId(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
         Object id = _objectIdReader.readObjectReference(jp, ctxt);
         ReadableObjectId roid = ctxt.findObjectId(id, _objectIdReader.generator);
@@ -1060,8 +1060,7 @@ protected Object deserializeFromObjectId(JsonParser jp, DeserializationContext c
     }
 
     protected Object deserializeFromObjectUsingNonDefault(JsonParser jp,
-            DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
+            DeserializationContext ctxt) throws IOException
     {        
         if (_delegateDeserializer != null) {
             return _valueInstantiator.createUsingDelegate(ctxt,
@@ -1084,8 +1083,7 @@ protected abstract Object _deserializeUsingPropertyBased(final JsonParser jp,
         throws IOException, JsonProcessingException;
 
     @SuppressWarnings("incomplete-switch")
-    public Object deserializeFromNumber(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
+    public Object deserializeFromNumber(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
         // First things first: id Object Id is used, most likely that's it
         if (_objectIdReader != null) {
@@ -1127,8 +1125,7 @@ public Object deserializeFromNumber(JsonParser jp, DeserializationContext ctxt)
         throw ctxt.instantiationException(getBeanClass(), "no suitable creator method found to deserialize from JSON integer number");
     }
 
-    public Object deserializeFromString(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
+    public Object deserializeFromString(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
         // First things first: id Object Id is used, most likely that's it
         if (_objectIdReader != null) {
@@ -1155,8 +1152,7 @@ public Object deserializeFromString(JsonParser jp, DeserializationContext ctxt)
      * number.
      */
     @SuppressWarnings("incomplete-switch")
-    public Object deserializeFromDouble(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
+    public Object deserializeFromDouble(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
         switch (jp.getNumberType()) {
         case FLOAT: // no separate methods for taking float...
@@ -1182,8 +1178,7 @@ public Object deserializeFromDouble(JsonParser jp, DeserializationContext ctxt)
     /**
      * Method called to deserialize POJO value from a JSON boolean value (true, false)
      */
-    public Object deserializeFromBoolean(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
+    public Object deserializeFromBoolean(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
         if (_delegateDeserializer != null) {
             if (!_valueInstantiator.canCreateFromBoolean()) {
@@ -1198,8 +1193,7 @@ public Object deserializeFromBoolean(JsonParser jp, DeserializationContext ctxt)
         return _valueInstantiator.createFromBoolean(ctxt, value);
     }
 
-    public Object deserializeFromArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
+    public Object deserializeFromArray(JsonParser jp, DeserializationContext ctxt) throws IOException
     {
         if (_delegateDeserializer != null) {
             try {
@@ -1214,6 +1208,19 @@ public Object deserializeFromArray(JsonParser jp, DeserializationContext ctxt)
         }
         throw ctxt.mappingException(getBeanClass());
     }
+
+    public Object deserializeFromEmbedded(JsonParser jp, DeserializationContext ctxt) throws IOException
+    {
+        // First things first: id Object Id is used, most likely that's it; specifically,
+        // true for UUIDs when written as binary (with Smile, other binary formats)
+        if (_objectIdReader != null) {
+            return deserializeFromObjectId(jp, ctxt);
+        }
+
+        // TODO: maybe add support for ValueInstantiator, embedded?
+        
+        return jp.getEmbeddedObject();
+    }
 
     /*
     /**********************************************************