Simplify code with 2.7

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/datatype/jdk8/Jdk8OptionalBeanPropertyWriter.java

@@ -8,7 +8,9 @@
 
 import java.util.Optional;
 
-public class Jdk8OptionalBeanPropertyWriter extends BeanPropertyWriter {
+public class Jdk8OptionalBeanPropertyWriter extends BeanPropertyWriter
+{
+    private static final long serialVersionUID = 1L;
 
     protected Jdk8OptionalBeanPropertyWriter(BeanPropertyWriter base) {
         super(base);
@@ -18,18 +20,7 @@ protected Jdk8OptionalBeanPropertyWriter(BeanPropertyWriter base, PropertyName n
         super(base, newName);
     }
 
-    // !!! TODO: in 2.7, no need to override
     @Override
-    public BeanPropertyWriter rename(NameTransformer transformer) {
-        String newName = transformer.transform(_name.getValue());
-        if (newName.equals(_name.toString())) {
-            return this;
-        }
-        return _new(PropertyName.construct(newName));
-    }
-
-    // NOTE: 
-//    @Override
     protected BeanPropertyWriter _new(PropertyName newName) {
         return new Jdk8OptionalBeanPropertyWriter(this, newName);
     }

src/main/java/com/fasterxml/jackson/datatype/jdk8/Jdk8UnwrappingOptionalBeanPropertyWriter.java

@@ -11,33 +11,19 @@
 
 public class Jdk8UnwrappingOptionalBeanPropertyWriter extends UnwrappingBeanPropertyWriter
 {
+    private static final long serialVersionUID = 1L;
+
     public Jdk8UnwrappingOptionalBeanPropertyWriter(BeanPropertyWriter base,
             NameTransformer transformer) {
         super(base, transformer);
     }
 
     protected Jdk8UnwrappingOptionalBeanPropertyWriter(UnwrappingBeanPropertyWriter base,
             NameTransformer transformer, SerializedString name) {
-        // TODO: in 2.7 call this ctor instead:
-//        super(base, transformer, name);
-        super(base, transformer);
+        super(base, transformer, name);
     }
 
-    // TODO: In 2.7, should not need to override this method, just _new(...)
     @Override
-    public UnwrappingBeanPropertyWriter rename(NameTransformer transformer)
-    {
-        String oldName = _name.getValue();
-        String newName = transformer.transform(oldName);
-
-        // important: combine transformers:
-        transformer = NameTransformer.chainedTransformer(transformer, _nameTransformer);
-    
-        return _new(transformer, new SerializedString(newName));
-    }
-
-    // NOTE: was added in one of later 2.6.0 RCs; uncomment once available
-//    @Override
     protected UnwrappingBeanPropertyWriter _new(NameTransformer transformer, SerializedString newName)
     {
         return new Jdk8UnwrappingOptionalBeanPropertyWriter(this, transformer, newName);

src/main/java/com/fasterxml/jackson/datatype/jdk8/OptionalDeserializer.java

@@ -5,10 +5,10 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 
 final class OptionalDeserializer
@@ -74,20 +74,6 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
         JavaType refType = _referenceType;
 
         if (deser == null) {
-            // 08-Oct-2015, tatu: As per [datatype-jdk8#13], need to use type
-            //    override, if any
-            if (property != null) {
-                AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-                AnnotatedMember member = property.getMember();
-                if ((intr != null)  && (member != null)) {
-                    Class<?> cc = intr.findDeserializationContentType(member, refType);
-                    if ((cc != null) && !refType.hasRawClass(cc)) {
-                        // 08-Oct-2015, tatu: One open question is whether we should also
-                        //   modify "full type"; seems like it's not needed quite yet
-                        refType = refType.narrowBy(cc);
-                    }
-                }
-            }
             deser = ctxt.findContextualValueDeserializer(refType, property);
         } else { // otherwise directly assigned, probably not contextual yet:
             deser = ctxt.handleSecondaryContextualization(deser, property, refType);