warnings cleanup

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java

@@ -676,7 +676,6 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
 
         TokenBuffer tokens = new TokenBuffer(p, ctxt);
         tokens.writeStartObject();
-        Object builder = null;
 
         JsonToken t = p.currentToken();
         for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
@@ -688,6 +687,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
                 // Last creator property to set?
                 if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
                     t = p.nextToken(); // to move to following FIELD_NAME/END_OBJECT
+                    Object builder = null;
                     try {
                         builder = creator.build(ctxt, buffer);
                     } catch (Exception e) {
@@ -723,12 +723,11 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
             }
         }
         // We hit END_OBJECT, so:
-        if (builder == null) {
-            try {
-                builder = creator.build(ctxt, buffer);
-            } catch (Exception e) {
-                return wrapInstantiationProblem(e, ctxt);
-            }
+        Object builder = null;
+        try {
+            builder = creator.build(ctxt, buffer);
+        } catch (Exception e) {
+            return wrapInstantiationProblem(e, ctxt);
         }
         return _unwrappedPropertyHandler.processUnwrapped(p, ctxt, builder, tokens);
     }

src/main/java/com/fasterxml/jackson/databind/type/PlaceholderForType.java

@@ -83,7 +83,6 @@ public JavaType refine(Class<?> rawType, TypeBindings bindings, JavaType superCl
         return _unsupported();
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public boolean isContainerType() {
         return false;

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKCollectionsDeserTest.java

@@ -2,8 +2,6 @@
 
 import java.util.*;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import com.fasterxml.jackson.databind.*;

src/test/java/com/fasterxml/jackson/databind/deser/jdk/UntypedDeserializationTest.java

@@ -176,7 +176,6 @@ public void testSampleDoc() throws Exception
         // and that's all folks!
     }
 
-    @SuppressWarnings("unlikely-arg-type")
     public void testUntypedMap() throws Exception
     {
         // to get "untyped" default map-to-map, pass Object.class