clean up 2.8-warnings

Author: cowtowncoder

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

@@ -187,7 +187,7 @@ protected final boolean _deserializeBoolean(JsonParser p, DeserializationContext
             return parsed;            
         }
         // Otherwise, no can do:
-        throw ctxt.mappingException(Boolean.TYPE, t);
+        return (Boolean) ctxt.handleUnexpectedToken(Boolean.TYPE, p);
     }
 
     protected final short _deserializeShort(JsonParser jp, DeserializationContext ctxt)
@@ -252,7 +252,7 @@ protected final int _deserializeInt(JsonParser p, DeserializationContext ctxt)
             return parsed;            
         }
         // Otherwise, no can do:
-        throw ctxt.mappingException(Integer.TYPE, t);
+        return (Integer) ctxt.handleUnexpectedToken(Integer.TYPE, p);
     }
 
     protected final long _deserializeLong(JsonParser p, DeserializationContext ctxt)
@@ -290,7 +290,7 @@ protected final long _deserializeLong(JsonParser p, DeserializationContext ctxt)
             }
             break;
         }
-        throw ctxt.mappingException(Long.TYPE, p.getCurrentToken());
+        return (Long) ctxt.handleUnexpectedToken(Long.TYPE, p);
     }
 
     protected final String _deserializeString(JsonParser p, DeserializationContext ctxt) throws IOException
@@ -328,7 +328,7 @@ protected final String _deserializeString(JsonParser p, DeserializationContext c
                 return text;
             }
         }
-        throw ctxt.mappingException(String.class, p.getCurrentToken());
+        return (String) ctxt.handleUnexpectedToken(String.class, p);
     }
 
     protected final boolean _deserializeBooleanFromOther(JsonParser p, DeserializationContext ctxt)

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

@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 
 /**
  * Base class for concrete bytecode-generated value instantiators.
@@ -18,7 +19,7 @@ public abstract class OptimizedValueInstantiator
      * dummy instance to call factory method.
      */
     protected OptimizedValueInstantiator() {
-        super(/*DeserializationConfig*/null, (Class<?>)String.class);
+        super(/*DeserializationConfig*/null, TypeFactory.unknownType());
     }
 
     /**

guice/src/main/java/com/fasterxml/jackson/module/guice/GuiceAnnotationIntrospector.java

@@ -72,14 +72,17 @@ else if (m instanceof AnnotatedMethod)
          * Depending on whether we have an annotation (or not) return the
          * correct Guice key that Jackson will use to query the Injector.
          */
-        if (guiceAnnotation == null)
-        {
-            return Key.get(guiceMember.getGenericType());
+        if (guiceAnnotation == null) {
+            // 19-Sep-2016, tatu: Used to pass `getGenericType()`, but that is now deprecated.
+            //    Looking at code in Guice Key, I don't think it does particularly good job
+            //    in resolving generic types, so I don't think change
+//            return Key.get(guiceMember.getGenericType());
+            return Key.get((java.lang.reflect.Type) guiceMember.getRawType());
         }
-        return Key.get(guiceMember.getGenericType(), guiceAnnotation);
+//        return Key.get(guiceMember.getGenericType(), guiceAnnotation);
+        return Key.get((java.lang.reflect.Type) guiceMember.getRawType(), guiceAnnotation);
     }
 
-
     /*
      * We want to figure out if a @BindingAnnotation or @Qualifier
      * annotation are present on what we're trying to inject.