Fix #1003

Author: cowtowncoder

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

@@ -714,7 +714,13 @@ protected Object deserializeWithExternalTypeId(JsonParser p, DeserializationCont
             return deserializeUsingPropertyBasedWithExternalTypeId(p, ctxt);
         }
         if (_delegateDeserializer != null) {
-            return deserializeUsingDelegateWithExternalTypeId(p, ctxt);
+            /* 24-Nov-2015, tatu: Use of delegating creator needs to have precedence, and basically
+             *   external type id handling just has to be ignored, as they would relate to target
+             *   type and not delegate type. Whether this works as expected is another story, but
+             *   there's no other way to really mix these conflicting features.
+             */
+            return _valueInstantiator.createUsingDelegate(ctxt,
+                    _delegateDeserializer.deserialize(p, ctxt));
         }
 
         return deserializeWithExternalTypeId(p, ctxt, _valueInstantiator.createUsingDefault(ctxt));
@@ -855,21 +861,4 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
             return null; // never gets here
         }
     }
-
-    /**
-     * @since 2.7
-     */
-    protected Object deserializeUsingDelegateWithExternalTypeId(JsonParser p, DeserializationContext ctxt)
-        throws IOException
-    {
-        // 24-Nov-2015, tatu: Something along these lines would normally work, in absence
-        //   of external type id:
-        /*
-        Object delegate = _delegateDeserializer.deserialize(p, ctxt);
-        return _valueInstantiator.createUsingDelegate(ctxt, delegate);
-        */
-
-        throw ctxt.instantiationException(handledType(),
-                "Combination of External Type Id, Delegating Creator not yet supported");
-    }
 }

src/test/java/com/fasterxml/jackson/failing/DelegatingExternalProperty1003Test.java renamed to src/test/java/com/fasterxml/jackson/databind/creators/DelegatingExternalProperty1003Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.creators;
 
 import com.fasterxml.jackson.annotation.*;
 
@@ -35,8 +35,10 @@ static class Delegate {
     public interface Hero { }
 
     static class Superman implements Hero {
+        String name = "superman";
+
         public String getName() {
-            return "superman";
+            return name;
         }
     }    
 
@@ -46,11 +48,8 @@ public void testExtrnalPropertyDelegatingCreator() throws Exception
 
         final String json = mapper.writeValueAsString(new HeroBattle(new Superman()));
 
-//System.err.println("JSON: "+json);        
         final HeroBattle battle = mapper.readValue(json, HeroBattle.class);
 
-        assert battle.getHero() instanceof Superman;
+        assertTrue(battle.getHero() instanceof Superman);
     }
-
-    
 }