From d091229e214e54eedc360fbd78025b97200991de Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 26 Sep 2016 07:48:54 -0700
Subject: [PATCH 1/5] prepare for 2.7.8

---
 pom.xml               | 2 +-
 release-notes/VERSION | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d22835c6e..69e177cd3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.7.8-SNAPSHOT</version>
+      <version>2.7.8</version>
     </dependency>
 
     <!-- and for testing we need a few libraries
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 1c38d3f1dd..99d94aee9c 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -4,7 +4,7 @@ Project: jackson-databind
 === Releases ===
 ------------------------------------------------------------------------
 
-2.7.8 (not yet released)
+2.7.8 (26-Sep-2016)
 
 #877: @JsonIgnoreProperties`: ignoring the "cause" property of `Throwable` on GAE
 #1359: Improve `JsonNode` deserializer to create `FloatNode` if parser supports

From 753f460191133f5623ee3e24eac0dea6f20406ff Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 26 Sep 2016 07:49:58 -0700
Subject: [PATCH 2/5] [maven-release-plugin] prepare release
 jackson-databind-2.7.8

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 69e177cd3e..56a88442b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>com.fasterxml.jackson.core</groupId>
   <artifactId>jackson-databind</artifactId>
-  <version>2.7.8-SNAPSHOT</version>
+  <version>2.7.8</version>
   <name>jackson-databind</name>
   <packaging>bundle</packaging>
   <description>General data-binding functionality for Jackson: works on core streaming API</description>
@@ -21,7 +21,7 @@
     <connection>scm:git:git@github.com:FasterXML/jackson-databind.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-databind.git</developerConnection>
     <url>http://github.com/FasterXML/jackson-databind</url>
-    <tag>HEAD</tag>
+    <tag>jackson-databind-2.7.8</tag>
   </scm>
 
   <properties>

From 639ed6ca9cb46a7098984f72b029ed76763b215d Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 26 Sep 2016 07:50:08 -0700
Subject: [PATCH 3/5] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56a88442b6..07a9be6962 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>com.fasterxml.jackson.core</groupId>
   <artifactId>jackson-databind</artifactId>
-  <version>2.7.8</version>
+  <version>2.7.9-SNAPSHOT</version>
   <name>jackson-databind</name>
   <packaging>bundle</packaging>
   <description>General data-binding functionality for Jackson: works on core streaming API</description>
@@ -21,7 +21,7 @@
     <connection>scm:git:git@github.com:FasterXML/jackson-databind.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-databind.git</developerConnection>
     <url>http://github.com/FasterXML/jackson-databind</url>
-    <tag>jackson-databind-2.7.8</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>

From efc6b982e5070ce396be985a9727a178c477aa47 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 28 Sep 2016 14:26:22 -0700
Subject: [PATCH 4/5] minor test cleanup

---
 .../databind/jsontype/TypeSerializer.java     | 46 +++++++++----------
 .../jsontype/TestDefaultForObject.java        |  8 ----
 .../jackson/databind/ser/TestJsonValue.java   |  4 +-
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java
index adb51393c9..3e5373e4e5 100644
--- a/src/main/java/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java
@@ -73,9 +73,9 @@ public abstract class TypeSerializer
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      */
-    public abstract void writeTypePrefixForScalar(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypePrefixForScalar(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called to write initial part of type information for given
@@ -86,9 +86,9 @@ public abstract class TypeSerializer
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      */
-    public abstract void writeTypePrefixForObject(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypePrefixForObject(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called to write initial part of type information for given
@@ -99,9 +99,9 @@ public abstract class TypeSerializer
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      */
-    public abstract void writeTypePrefixForArray(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypePrefixForArray(Object value, JsonGenerator gen) throws IOException;
     
     /**
      * Method called after value has been serialized, to close any scopes opened
@@ -109,7 +109,7 @@ public abstract class TypeSerializer
      * Actual action to take may depend on various factors, but has to match with
      * action {@link #writeTypePrefixForScalar} did (close array or object; or do nothing).
      */
-    public abstract void writeTypeSuffixForScalar(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypeSuffixForScalar(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called after value has been serialized, to close any scopes opened
@@ -117,7 +117,7 @@ public abstract class TypeSerializer
      * It needs to write closing END_OBJECT marker, and any other decoration
      * that needs to be matched.
      */
-    public abstract void writeTypeSuffixForObject(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypeSuffixForObject(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called after value has been serialized, to close any scopes opened
@@ -125,15 +125,15 @@ public abstract class TypeSerializer
      * It needs to write closing END_ARRAY marker, and any other decoration
      * that needs to be matched.
      */
-    public abstract void writeTypeSuffixForArray(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypeSuffixForArray(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Alternative version of the prefix-for-scalar method, which is given
      * actual type to use (instead of using exact type of the value); typically
      * a super type of actual value type
      */
-    public void writeTypePrefixForScalar(Object value, JsonGenerator jgen, Class<?> type) throws IOException {
-        writeTypePrefixForScalar(value, jgen);
+    public void writeTypePrefixForScalar(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+        writeTypePrefixForScalar(value, gen);
     }
 
     /**
@@ -141,8 +141,8 @@ public void writeTypePrefixForScalar(Object value, JsonGenerator jgen, Class<?>
      * actual type to use (instead of using exact type of the value); typically
      * a super type of actual value type
      */
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen, Class<?> type) throws IOException {
-        writeTypePrefixForObject(value, jgen);
+    public void writeTypePrefixForObject(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+        writeTypePrefixForObject(value, gen);
     }
 
     /**
@@ -150,8 +150,8 @@ public void writeTypePrefixForObject(Object value, JsonGenerator jgen, Class<?>
      * actual type to use (instead of using exact type of the value); typically
      * a super type of actual value type
      */
-    public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> type) throws IOException {
-        writeTypePrefixForArray(value, jgen);
+    public void writeTypePrefixForArray(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+        writeTypePrefixForArray(value, gen);
     }
 
     /*
@@ -170,10 +170,10 @@ public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> t
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      * @param typeId Exact type id to use
      */
-    public abstract void writeCustomTypePrefixForScalar(Object value, JsonGenerator jgen, String typeId) throws IOException, JsonProcessingException;
+    public abstract void writeCustomTypePrefixForScalar(Object value, JsonGenerator gen, String typeId) throws IOException;
     
     /**
      * Method called to write initial part of type information for given
@@ -185,16 +185,16 @@ public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> t
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      * @param typeId Exact type id to use
      */
-    public abstract void writeCustomTypePrefixForObject(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypePrefixForObject(Object value, JsonGenerator gen, String typeId) throws IOException;
     
-    public abstract void writeCustomTypePrefixForArray(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypePrefixForArray(Object value, JsonGenerator gen, String typeId) throws IOException;
 
-    public abstract void writeCustomTypeSuffixForScalar(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypeSuffixForScalar(Object value, JsonGenerator gen, String typeId) throws IOException;
 
-    public abstract void writeCustomTypeSuffixForObject(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypeSuffixForObject(Object value, JsonGenerator gen, String typeId) throws IOException;
 
-    public abstract void writeCustomTypeSuffixForArray(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypeSuffixForArray(Object value, JsonGenerator gen, String typeId) throws IOException;
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultForObject.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultForObject.java
index 71d5d4e5b2..081af8aa88 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultForObject.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultForObject.java
@@ -11,12 +11,6 @@
 public class TestDefaultForObject
     extends BaseMapTest
 {
-    /*
-    /**********************************************************
-    /* Helper types
-    /**********************************************************
-     */
-
     static abstract class AbstractBean { }
     
     static class StringBean extends AbstractBean { // ha, punny!
@@ -42,7 +36,6 @@ enum ComplexChoice {
         public String toString() { return String.valueOf(state); }
     }
 
-    // [JACKSON-311]
     static class PolymorphicType {
         public String foo;
         public Object bar;
@@ -70,7 +63,6 @@ public ObjectHolder() { }
         public ObjectHolder(Object v) { value = v; }
     }
 
-    // [JACKSON-352]
     static class DomainBean {
         public int weight;
     }
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java
index 53b01b8f7e..fedf8d648d 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java
@@ -249,7 +249,7 @@ public void testInList() throws Exception {
         assertEquals(json, "{\"values\":[{\"i\":1},{\"i\":2}]}");
     }
 
-    // [Issue#167]
+    // [databind#167]
     public void testPolymorphicSerdeWithDelegate() throws Exception
     {
 	    AdditionInterface adder = new AdditionInterfaceImpl(1);
@@ -262,7 +262,7 @@ public void testPolymorphicSerdeWithDelegate() throws Exception
 	    adder = new NegatingAdditionInterface(adder);
 	    assertEquals(0, adder.add(1));
 	    json = MAPPER.writeValueAsString(adder);
-	    
+
 	    assertEquals("{\"boingo\":\"boopsy\",\"toAdd\":1}", json);
 	    assertEquals(2, MAPPER.readValue(json, AdditionInterface.class).add(1));
     }

From be114a9a286c4d194cd268ac8153173c52619a8d Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 28 Sep 2016 15:49:01 -0700
Subject: [PATCH 5/5] Fix #1385

---
 release-notes/VERSION                         |   2 +
 .../databind/ser/std/JsonValueSerializer.java | 151 ++++++++++++++++--
 .../jsontype/TestDefaultWithCreators.java     |  51 +++++-
 .../jsontype/ext/ExternalTypeIdTest.java      |  10 +-
 .../jackson/databind/ser/TestJsonValue.java   |  31 +---
 5 files changed, 184 insertions(+), 61 deletions(-)

diff --git a/release-notes/VERSION b/release-notes/VERSION
index cf2038f6fc..0b51862da2 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -9,6 +9,8 @@ Project: jackson-databind
 #1384: `@JsonDeserialize(keyUsing = ...)` does not work correctly together with
   DefaultTyping.NON_FINAL
  (reported by Oleg Z)
+#1385: Polymorphic type lost when using `@JsonValue`
+ (reported by TomMarkuske@github)
 #1389 Problem with handling of multi-argument creator with Enums
  (fix contributed by Pavel P)
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
index 608a7c86a6..538796defe 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
@@ -6,6 +6,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
@@ -14,6 +15,7 @@
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonStringFormatVisitor;
 import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
+import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.BeanSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
@@ -44,7 +46,7 @@ public class JsonValueSerializer
     protected final JsonSerializer<Object> _valueSerializer;
 
     protected final BeanProperty _property;
-    
+
     /**
      * This is a flag that is set in rare (?) cases where this serializer
      * is used for "natural" types (boolean, int, String, double); and where
@@ -156,12 +158,12 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
      */
     
     @Override
-    public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov) throws IOException
+    public void serialize(Object bean, JsonGenerator gen, SerializerProvider prov) throws IOException
     {
         try {
             Object value = _accessorMethod.getValue(bean);
             if (value == null) {
-                prov.defaultSerializeNull(jgen);
+                prov.defaultSerializeNull(gen);
                 return;
             }
             JsonSerializer<Object> ser = _valueSerializer;
@@ -174,7 +176,7 @@ public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov)
                 // let's cache it, may be needed soon again
                 ser = prov.findTypedValueSerializer(c, true, _property);
             }
-            ser.serialize(value, jgen, prov);
+            ser.serialize(value, gen, prov);
         } catch (IOException ioe) {
             throw ioe;
         } catch (Exception e) {
@@ -193,7 +195,7 @@ public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov)
     }
 
     @Override
-    public void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvider provider,
+    public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider provider,
             TypeSerializer typeSer0) throws IOException
     {
         // Regardless of other parts, first need to find value to serialize:
@@ -202,11 +204,11 @@ public void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvide
             value = _accessorMethod.getValue(bean);
             // and if we got null, can also just write it directly
             if (value == null) {
-                provider.defaultSerializeNull(jgen);
+                provider.defaultSerializeNull(gen);
                 return;
             }
             JsonSerializer<Object> ser = _valueSerializer;
-            if (ser == null) { // already got a serializer? fabulous, that be easy...
+            if (ser == null) { // no serializer yet? Need to fetch
 //                ser = provider.findTypedValueSerializer(value.getClass(), true, _property);
                 ser = provider.findValueSerializer(value.getClass(), _property);
             } else {
@@ -214,18 +216,17 @@ public void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvide
                  *    this (note: type is for the wrapper type, not enclosed value!)
                  */
                 if (_forceTypeInformation) {
-                    typeSer0.writeTypePrefixForScalar(bean, jgen);
-                    ser.serialize(value, jgen, provider);
-                    typeSer0.writeTypeSuffixForScalar(bean, jgen);
+                    typeSer0.writeTypePrefixForScalar(bean, gen);
+                    ser.serialize(value, gen, provider);
+                    typeSer0.writeTypeSuffixForScalar(bean, gen);
                     return;
                 }
             }
-            /* 13-Feb-2013, tatu: Turns out that work-around should NOT be required
-             *   at all; it would not lead to correct behavior (as per #167).
-             */
-            // and then redirect type id lookups
-//            TypeSerializer typeSer = new TypeSerializerWrapper(typeSer0, bean);
-            ser.serializeWithType(value, jgen, provider, typeSer0);
+            // 28-Sep-2016, tatu: As per [databind#1385], we do need to do some juggling
+            //    to use different Object for type id (logical type) and actual serialization
+            //    (delegat type).
+            TypeSerializerRerouter rr = new TypeSerializerRerouter(typeSer0, bean);
+            ser.serializeWithType(value, gen, provider, rr);
         } catch (IOException ioe) {
             throw ioe;
         } catch (Exception e) {
@@ -339,7 +340,7 @@ protected boolean isNaturalTypeWithStdHandling(Class<?> rawType, JsonSerializer<
         }
         return isDefaultSerializer(ser);
     }
-    
+
     /*
     /**********************************************************
     /* Other methods
@@ -350,4 +351,120 @@ protected boolean isNaturalTypeWithStdHandling(Class<?> rawType, JsonSerializer<
     public String toString() {
         return "(@JsonValue serializer for method " + _accessorMethod.getDeclaringClass() + "#" + _accessorMethod.getName() + ")";
     }
+
+    /*
+    /**********************************************************
+    /* Helper class
+    /**********************************************************
+     */
+
+    /**
+     * Silly little wrapper class we need to re-route type serialization so that we can
+     * override Object to use for type id (logical type) even when asking serialization
+     * of something else (delegate type)
+     */
+    static class TypeSerializerRerouter
+        extends TypeSerializer
+    {
+        protected final TypeSerializer _typeSerializer;
+        protected final Object _forObject;
+
+        public TypeSerializerRerouter(TypeSerializer ts, Object ob) {
+            _typeSerializer = ts;
+            _forObject = ob;
+        }
+
+        @Override
+        public TypeSerializer forProperty(BeanProperty prop) { // should never get called
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public As getTypeInclusion() {
+            return _typeSerializer.getTypeInclusion();
+        }
+
+        @Override
+        public String getPropertyName() {
+            return _typeSerializer.getPropertyName();
+        }
+
+        @Override
+        public TypeIdResolver getTypeIdResolver() {
+            return _typeSerializer.getTypeIdResolver();
+        }
+
+        @Override
+        public void writeTypePrefixForScalar(Object value, JsonGenerator gen) throws IOException {
+            _typeSerializer.writeTypePrefixForScalar(_forObject, gen);
+        }
+
+        @Override
+        public void writeTypePrefixForObject(Object value, JsonGenerator gen) throws IOException {
+            _typeSerializer.writeTypePrefixForObject(_forObject, gen);
+        }
+
+        @Override
+        public void writeTypePrefixForArray(Object value, JsonGenerator gen) throws IOException {
+            _typeSerializer.writeTypePrefixForArray(_forObject, gen);
+        }
+
+        @Override
+        public void writeTypeSuffixForScalar(Object value, JsonGenerator gen) throws IOException {
+            _typeSerializer.writeTypeSuffixForScalar(_forObject, gen);
+        }
+
+        @Override
+        public void writeTypeSuffixForObject(Object value, JsonGenerator gen) throws IOException {
+            _typeSerializer.writeTypeSuffixForObject(_forObject, gen);
+        }
+
+        @Override
+        public void writeTypeSuffixForArray(Object value, JsonGenerator gen) throws IOException {
+            _typeSerializer.writeTypeSuffixForArray(_forObject, gen);
+        }
+
+        public void writeTypePrefixForScalar(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+            _typeSerializer.writeTypePrefixForScalar(_forObject, gen, type);
+        }
+
+        public void writeTypePrefixForObject(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+            _typeSerializer.writeTypePrefixForObject(_forObject, gen, type);
+        }
+
+        public void writeTypePrefixForArray(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+            _typeSerializer.writeTypePrefixForArray(_forObject, gen, type);
+        }
+        
+        @Override
+        public void writeCustomTypePrefixForScalar(Object value, JsonGenerator gen, String typeId)
+                throws IOException {
+            _typeSerializer.writeCustomTypePrefixForScalar(_forObject, gen, typeId);
+        }
+
+        @Override
+        public void writeCustomTypePrefixForObject(Object value, JsonGenerator gen, String typeId) throws IOException {
+            _typeSerializer.writeCustomTypePrefixForObject(_forObject, gen, typeId);
+        }
+
+        @Override
+        public void writeCustomTypePrefixForArray(Object value, JsonGenerator gen, String typeId) throws IOException {
+            _typeSerializer.writeCustomTypePrefixForArray(_forObject, gen, typeId);
+        }
+
+        @Override
+        public void writeCustomTypeSuffixForScalar(Object value, JsonGenerator gen, String typeId) throws IOException {
+            _typeSerializer.writeCustomTypeSuffixForScalar(_forObject, gen, typeId);
+        }
+
+        @Override
+        public void writeCustomTypeSuffixForObject(Object value, JsonGenerator gen, String typeId) throws IOException {
+            _typeSerializer.writeCustomTypeSuffixForObject(_forObject, gen, typeId);
+        }
+
+        @Override
+        public void writeCustomTypeSuffixForArray(Object value, JsonGenerator gen, String typeId) throws IOException {
+            _typeSerializer.writeCustomTypeSuffixForArray(_forObject, gen, typeId);
+        }
+    }
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultWithCreators.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultWithCreators.java
index 31f84b590d..785a3b5da3 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultWithCreators.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultWithCreators.java
@@ -1,5 +1,7 @@
 package com.fasterxml.jackson.databind.jsontype;
 
+import org.junit.Assert;
+
 import com.fasterxml.jackson.annotation.*;
 
 import com.fasterxml.jackson.databind.BaseMapTest;
@@ -8,12 +10,6 @@
 public class TestDefaultWithCreators
     extends BaseMapTest
 {
-    /*
-    /**********************************************************
-    /* Helper types
-    /**********************************************************
-     */
-
     static abstract class Job
     {
         public long id;
@@ -36,7 +32,31 @@ public UrlJob(@JsonProperty("id") long id, @JsonProperty("url") String url,
         public String getUrl() { return url; }
         public int getCount() { return count; }
     }
+
+    // [databind#1385]
+    static class Bean1385Wrapper
+    {
+        public Object value;
+
+        protected Bean1385Wrapper() { }
+        public Bean1385Wrapper(Object v) { value = v; }
+    }
+
+    static class Bean1385
+    {
+        private byte[] raw;
     
+        @JsonCreator(mode=JsonCreator.Mode.DELEGATING)
+        public Bean1385(byte[] raw) {
+            this.raw = raw.clone();
+        }
+
+        @JsonValue
+        public byte[] getBytes() {
+            return raw;
+        }
+    }
+
     /*
     /**********************************************************
     /* Unit tests
@@ -58,4 +78,21 @@ public void testWithCreators() throws Exception
         assertEquals("http://foo", o2.getUrl());
         assertEquals(3, o2.getCount());
     }
-}
+
+    // [databind#1385]
+    public void testWithCreatorAndJsonValue() throws Exception
+    {
+        final byte[] BYTES = new byte[] { 1, 2, 3, 4, 5 };
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.enableDefaultTyping();
+        String json = mapper.writeValueAsString(new Bean1385Wrapper(
+                new Bean1385(BYTES)
+        ));
+        Bean1385Wrapper result = mapper.readValue(json, Bean1385Wrapper.class);
+        assertNotNull(result);
+        assertNotNull(result.value);
+        assertEquals(Bean1385.class, result.value.getClass());
+        Bean1385 b = (Bean1385) result.value;
+        Assert.assertArrayEquals(BYTES, b.raw);
+    }
+ }
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java
index 3c54a387a8..8913f7a8f0 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java
@@ -473,22 +473,14 @@ public void testWithAsValue() throws Exception
         ExternalTypeWithNonPOJO input = new ExternalTypeWithNonPOJO(new AsValueThingy(12345L));
         String json = MAPPER.writeValueAsString(input);
         assertNotNull(json);
-        assertEquals("{\"value\":12345,\"type\":\"date\"}", json);
+        assertEquals("{\"value\":12345,\"type\":\"thingy\"}", json);
 
         // and get it back too:
         ExternalTypeWithNonPOJO result = MAPPER.readValue(json, ExternalTypeWithNonPOJO.class);
         assertNotNull(result);
         assertNotNull(result.value);
-        /* 13-Feb-2013, tatu: Urgh. I don't think this can work quite as intended...
-         *   since POJO type, and type of thing @JsonValue annotated method returns
-         *   are not related. Best we can do is thus this:
-         */
-        /*
         assertEquals(AsValueThingy.class, result.value.getClass());
         assertEquals(12345L, ((AsValueThingy) result.value).rawDate);
-        */
-        assertEquals(Date.class, result.value.getClass());
-        assertEquals(12345L, ((Date) result.value).getTime());
     }
 
     // for [databind#222]
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java
index fedf8d648d..4b5b4d6773 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java
@@ -120,10 +120,11 @@ static class External {
         External(Internal e) { i = e.value; }
     }
 
-    // [Issue#167]
+    // [databind#167]
     
     @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "boingo")
-    @JsonSubTypes(value = {@JsonSubTypes.Type(name = "boopsy", value = AdditionInterfaceImpl.class) })
+    @JsonSubTypes(value = {@JsonSubTypes.Type(name = "boopsy", value = AdditionInterfaceImpl.class)
+    })
     static interface AdditionInterface
     {
         public int add(int in);
@@ -148,25 +149,6 @@ public int add(int in) {
 	      return in + toAdd;
 	    }
     }
-	
-    public static class NegatingAdditionInterface implements AdditionInterface
-    {
-	    final AdditionInterface delegate;
-	
-	    public NegatingAdditionInterface(AdditionInterface delegate) {
-	        this.delegate = delegate;
-	    }
-	
-	    @Override
-	    public int add(int in) {
-	        return delegate.add(-in);
-	    }
-	
-	    @JsonValue
-	    public AdditionInterface getDelegate() {
-	        return delegate;
-	    }
-    }
 
     static class Bean838 {
         @JsonValue
@@ -258,13 +240,6 @@ public void testPolymorphicSerdeWithDelegate() throws Exception
 	    String json = MAPPER.writeValueAsString(adder);
 	    assertEquals("{\"boingo\":\"boopsy\",\"toAdd\":1}", json);
 	    assertEquals(2, MAPPER.readValue(json, AdditionInterface.class).add(1));
-	
-	    adder = new NegatingAdditionInterface(adder);
-	    assertEquals(0, adder.add(1));
-	    json = MAPPER.writeValueAsString(adder);
-
-	    assertEquals("{\"boingo\":\"boopsy\",\"toAdd\":1}", json);
-	    assertEquals(2, MAPPER.readValue(json, AdditionInterface.class).add(1));
     }
 
     public void testJsonValueWithCustomOverride() throws Exception