Merge branch '3.x' into 5342-fix-prevent-name-conflict-JsonAnyGetter

Author: cowtowncoder

src/main/java/tools/jackson/databind/BeanDescription.java

@@ -198,14 +198,22 @@ public AnnotatedMember findJsonKeyAccessor() {
      */
     public abstract AnnotatedMember findJsonValueAccessor();
 
+    /**
+     * Method used to locate the Method or Field of introspected class that
+     * is annotated with {@link com.fasterxml.jackson.annotation.JsonAnyGetter}
+     * (or equivalent annotation).
+     * If no such {@code AnnotatedMember} exists {@code null} is returned.
+     * If more than one are found, an exception is thrown.
+     */
     public abstract AnnotatedMember findAnyGetter();
 
     /**
      * Method used to locate a mutator (settable field, or 2-argument set method)
      * of introspected class that
-     * implements {@link com.fasterxml.jackson.annotation.JsonAnySetter}.
-     * If no such mutator exists null is returned. If more than one are found,
-     * an exception is thrown.
+     * is annotated with {@link com.fasterxml.jackson.annotation.JsonAnySetter}
+     * (or equivalent annotation).
+     * If no such mutator exists {@code null} is returned.
+     * If more than one are found an exception is thrown.
      * Additional checks are also made to see that method signature
      * is acceptable: needs to take 2 arguments, first one String or
      * Object; second any can be any type.

src/main/java/tools/jackson/databind/ser/BeanSerializerFactory.java

@@ -324,7 +324,7 @@ protected ValueSerializer<Object> constructBeanOrAddOnSerializer(SerializationCo
         // First: any detectable (auto-detect, annotations) properties to serialize?
         List<BeanPropertyWriter> props = findBeanProperties(ctxt, beanDescRef, builder);
         if (props == null) {
-            props = new ArrayList<BeanPropertyWriter>();
+            props = new ArrayList<>();
         } else {
             props = removeOverlappingTypeIds(ctxt, beanDescRef, builder, props);
         }