Migrate legacy reflection properties to use MethodHandles, attempt #2

Fixes #2083

Author: stevenschlansker

src/main/java/tools/jackson/databind/deser/BeanDeserializerFactory.java

@@ -1,5 +1,6 @@
 package tools.jackson.databind.deser;
 
+import java.lang.reflect.Modifier;
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
@@ -935,14 +936,10 @@ protected SettableBeanProperty constructSettableProperty(DeserializationContext
         // Does the Method specify the deserializer to use? If so, let's use it.
         TypeDeserializer typeDeser = (TypeDeserializer) type.getTypeHandler();
         SettableBeanProperty prop;
-        if (mutator instanceof AnnotatedMethod) {
-            prop = new MethodProperty(propDef, type, typeDeser,
-                    beanDesc.getClassAnnotations(), (AnnotatedMethod) mutator);
-        } else {
-            // 08-Sep-2016, tatu: wonder if we should verify it is `AnnotatedField` to be safe?
-            prop = new FieldProperty(propDef, type, typeDeser,
-                    beanDesc.getClassAnnotations(), (AnnotatedField) mutator);
+        if (isFinalField(mutator)) {
+            return null;
         }
+        prop = new MethodProperty(propDef, type, typeDeser, beanDesc.getClassAnnotations(), mutator);
         ValueDeserializer<?> deser = findDeserializerFromAnnotation(ctxt, mutator);
         if (deser == null) {
             deser = (ValueDeserializer<?>) type.getValueHandler();
@@ -963,6 +960,11 @@ protected SettableBeanProperty constructSettableProperty(DeserializationContext
         return prop;
     }
 
+    private boolean isFinalField(AnnotatedMember am) {
+        return am instanceof AnnotatedField
+                && Modifier.isFinal(am.getMember().getModifiers());
+    }
+
     /**
      * Method that will construct a regular bean property setter using
      * the given setter method.

src/main/java/tools/jackson/databind/deser/SettableBeanProperty.java

@@ -609,7 +609,7 @@ public SettableBeanProperty unwrapped(DeserializationContext ctxt, NameTransform
     /**********************************************************************
      */
 
-    protected void _throwAsJacksonE(JsonParser p, Exception e, Object value)
+    protected void _throwAsJacksonE(JsonParser p, Throwable e, Object value)
         throws JacksonException
     {
         if (e instanceof IllegalArgumentException) {
@@ -632,8 +632,9 @@ protected void _throwAsJacksonE(JsonParser p, Exception e, Object value)
         _throwAsJacksonE(p, e);
     }
 
-    protected void _throwAsJacksonE(JsonParser p, Exception e) throws JacksonException
+    protected void _throwAsJacksonE(JsonParser p, Throwable e) throws JacksonException
     {
+        ClassUtil.throwIfError(e);
         ClassUtil.throwIfRTE(e);
         ClassUtil.throwIfJacksonE(e);
         // let's wrap the innermost problem
@@ -643,7 +644,7 @@ protected void _throwAsJacksonE(JsonParser p, Exception e) throws JacksonExcepti
 
     // 10-Oct-2015, tatu: _Should_ be deprecated, too, but its remaining
     //   callers cannot actually provide a JsonParser
-    protected void _throwAsJacksonE(Exception e, Object value) throws JacksonException {
+    protected void _throwAsJacksonE(Throwable e, Object value) throws JacksonException {
         _throwAsJacksonE((JsonParser) null, e, value);
     }