Merge branch '2.12'

Author: cowtowncoder

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

@@ -3,8 +3,6 @@
 import java.util.List;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.BeanDeserializer;
-import com.fasterxml.jackson.databind.deser.BeanDeserializerFactory;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
 import com.fasterxml.jackson.databind.type.ArrayType;
 import com.fasterxml.jackson.databind.type.CollectionLikeType;

src/main/java/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.java

@@ -127,7 +127,7 @@ private static boolean isCglibGetCallbacks(AnnotatedMethod am)
 
             Class<?> compType = rt.getComponentType();
             // Actually, let's just verify it's a "net.sf.cglib.*" class/interface
-            String className = compType.getName();
+            final String className = compType.getName();
             if (className.contains(".cglib")) {
                 return className.startsWith("net.sf.cglib")
                     // also, as per [JACKSON-177]

src/test/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMapTest.java

@@ -4,9 +4,6 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.deser.impl.BeanPropertyMap;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdValueProperty;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 // for [databind#884]

src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java

@@ -8,10 +8,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.TextNode;
-import com.fasterxml.jackson.databind.node.TreeTraversingParser;
+
 import static java.util.Arrays.asList;
 
 /**

src/test/java/com/fasterxml/jackson/databind/ser/BeanSerializerModifier1612Test.java

@@ -7,9 +7,6 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-import com.fasterxml.jackson.databind.ser.BeanSerializerBuilder;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 
 public class BeanSerializerModifier1612Test extends BaseMapTest
 {

src/test/java/com/fasterxml/jackson/databind/ser/BeanSerializerModifierTest.java

@@ -9,10 +9,6 @@
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import com.fasterxml.jackson.databind.introspect.POJOPropertyBuilder;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-import com.fasterxml.jackson.databind.ser.BeanSerializer;
-import com.fasterxml.jackson.databind.ser.BeanSerializerBuilder;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.databind.type.ArrayType;
 import com.fasterxml.jackson.databind.type.CollectionType;