Partial fix for #59

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/module/afterburner/deser/OptimizedSettableBeanProperty.java

@@ -149,7 +149,6 @@ protected final boolean _deserializeBoolean(JsonParser p, DeserializationContext
         if (t == JsonToken.VALUE_FALSE) return false;
         if (t == JsonToken.VALUE_NULL) return false;
 
-        // [JACKSON-78]: should accept ints too, (0 == false, otherwise true)
         if (t == JsonToken.VALUE_NUMBER_INT) {
             // 11-Jan-2012, tatus: May be outside of int...
             if (p.getNumberType() == NumberType.INT) {
@@ -160,7 +159,6 @@ protected final boolean _deserializeBoolean(JsonParser p, DeserializationContext
         // And finally, let's allow Strings to be converted too
         if (t == JsonToken.VALUE_STRING) {
             String text = p.getText().trim();
-            // [#422]: Allow aliases
             if ("true".equals(text) || "True".equals(text)) {
                 return true;
             }

src/main/java/com/fasterxml/jackson/module/afterburner/ser/OptimizedBeanPropertyWriter.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.core.SerializableString;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
 
 /**
@@ -54,6 +55,30 @@ private BeanPropertyWriter unwrapFallbackWriter(BeanPropertyWriter srcIn)
         return srcIn;
     }
 
+    // Overridden since 2.6.3
+    @Override
+    public void assignTypeSerializer(TypeSerializer typeSer) {
+        super.assignTypeSerializer(typeSer);
+        if (fallbackWriter != null) {
+            fallbackWriter.assignTypeSerializer(typeSer);
+        }
+        // 04-Oct-2015, tatu: Should we handle this wrt [module-afterburner#59]?
+        //    Seems unlikely, as String/long/int/boolean are final types; and for
+        //    basic 'Object' we delegate to deserializer as expected
+    }
+
+    // Overridden since 2.6.3
+    @Override
+    public void assignSerializer(JsonSerializer<Object> ser) {
+        super.assignSerializer(ser);
+        if (fallbackWriter != null) {
+            fallbackWriter.assignSerializer(ser);
+        }
+        // 04-Oct-2015, tatu: To fix [module-afterburner#59], need to disable use of
+        //    fully optimized variant
+        broken = true;
+    }
+
     public abstract T withAccessor(BeanPropertyAccessor acc);
 
     public abstract BeanPropertyWriter withSerializer(JsonSerializer<Object> ser);

src/test/java/com/fasterxml/jackson/module/afterburner/failing/TestStdDeserializerOverrides59.java

@@ -4,8 +4,10 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.deser.Deserializers;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+
 import com.fasterxml.jackson.module.afterburner.AfterburnerTestBase;
 
 @SuppressWarnings("serial")
@@ -32,21 +34,43 @@ public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
     /**********************************************************************
      */
 
-    // for [module-afterburner#59]
-    public void testStringDeserializerOveride59() throws Exception
+    public void testStringDeserOverideNoAfterburner() throws Exception
     {
         final String json = "{\"field\": \"value & value\"}";
         final String EXP = "value & value";
-
-        final Module module = new SimpleModule("module", Version.unknownVersion())
-                .addDeserializer(String.class, new DeAmpDeserializer());
-
-        // First; passes with vanilla ObjectMapper
         SimpleRO resultVanilla = new ObjectMapper()
-            .registerModule(module)
+            .registerModule(new SimpleModule("module", Version.unknownVersion())
+                .addDeserializer(String.class, new DeAmpDeserializer()))
             .readValue(json, SimpleRO.class);
         assertEquals(EXP, resultVanilla.field);
+    }
+
+    // for [module-afterburner#59]
+    public void testStringDeserOverideWithAfterburner() throws Exception
+    {
+        final String json = "{\"field\": \"value & value\"}";
+        final String EXP = "value & value";
 
+        final Module module = new SimpleModule("module", Version.unknownVersion()) {
+            @Override
+            public void setupModule(SetupContext context) {
+                context.addDeserializers(
+                        new Deserializers.Base() {
+                            @Override
+                            public JsonDeserializer<?> findBeanDeserializer(
+                                    JavaType type,
+                                    DeserializationConfig config,
+                                    BeanDescription beanDesc)
+                                    throws JsonMappingException {
+                                if (type.hasRawClass(String.class)) {
+                                    return new DeAmpDeserializer();
+                                }
+                                return null;
+                            }
+                        });
+            }
+        };
+        
         // but then fails with Afterburner
         SimpleRO resultAB = mapperWithModule()
             .registerModule(module)

src/test/java/com/fasterxml/jackson/module/afterburner/failing/TestStdSerializerOverrides.java

@@ -0,0 +1,62 @@
+package com.fasterxml.jackson.module.afterburner.failing;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.fasterxml.jackson.module.afterburner.AfterburnerTestBase;
+
+public class TestStdSerializerOverrides extends AfterburnerTestBase
+{
+    // for [module-afterburner#59]
+    static class SimpleRO {
+        public String field = "foo";
+    }
+
+    @SuppressWarnings("serial")
+    static class MeaningOfLifeSerializer extends StdSerializer<String>
+    {
+        public MeaningOfLifeSerializer() { super(String.class); }
+
+        @Override
+        public void serialize(String value, JsonGenerator gen,
+                SerializerProvider provider) throws IOException {
+            gen.writeNumber(42);
+        }
+    }    
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    public void testStringSerOverideNoAfterburner() throws Exception
+    {
+        final SimpleRO input = new SimpleRO();
+        final String EXP = "{\"field\":42}";
+        String json = new ObjectMapper()
+            .registerModule(new SimpleModule("module", Version.unknownVersion())
+                .addSerializer(String.class, new MeaningOfLifeSerializer()))
+            .writeValueAsString(input);
+        assertEquals(EXP, json);
+    }
+
+    public void testStringSerOverideWithAfterburner() throws Exception
+    {
+        final SimpleRO input = new SimpleRO();
+        final String EXP = "{\"field\":42}";
+        String json = mapperWithModule()
+            .registerModule(new SimpleModule("module", Version.unknownVersion())
+                .addSerializer(String.class, new MeaningOfLifeSerializer()))
+            .writeValueAsString(input);
+        assertEquals(EXP, json);
+    }
+}