Merge branch '2.12'

Author: cowtowncoder

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

@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.deser.impl.ValueInjector;
 import com.fasterxml.jackson.databind.introspect.*;
 import com.fasterxml.jackson.databind.util.Annotations;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
  * Builder class used for aggregating deserialization information about
@@ -395,7 +396,7 @@ public JsonDeserializer<?> buildBuilderBased(JavaType valueType, String expBuild
             if (!expBuildMethodName.isEmpty()) {
                 _context.reportBadDefinition(_beanDesc.getType(),
                         String.format("Builder class %s does not have build method (name: '%s')",
-                        _beanDesc.getBeanClass().getName(),
+                        ClassUtil.getTypeDescription(_beanDesc.getType()),
                         expBuildMethodName));
             }
         } else {
@@ -406,10 +407,10 @@ public JsonDeserializer<?> buildBuilderBased(JavaType valueType, String expBuild
                     && !rawBuildType.isAssignableFrom(rawValueType)
                     && !rawValueType.isAssignableFrom(rawBuildType)) {
                 _context.reportBadDefinition(_beanDesc.getType(),
-                        String.format("Build method '%s' has wrong return type (%s), not compatible with POJO type (%s)",
+                        String.format("Build method `%s` has wrong return type (%s), not compatible with POJO type (%s)",
                         _buildMethod.getFullName(),
-                        rawBuildType.getName(),
-                        valueType.getRawClass().getName()));
+                        ClassUtil.getClassDescription(rawBuildType),
+                        ClassUtil.getTypeDescription(valueType)));
             }
         }
         _fixAccess(_properties.values());

src/main/java/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.java

@@ -142,6 +142,9 @@ public AccessPattern getEmptyAccessPattern() {
     public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
             BeanProperty property) throws JsonMappingException
     {
+        // 07-May-2020, tatu: Is the argument `EnumSet.class` correct here?
+        //    In a way seems like it should rather refer to value class... ?
+        //    (as it's individual value of element type, not Container)...
         final Boolean unwrapSingle = findFormatFeature(ctxt, property, EnumSet.class,
                 JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
         JsonDeserializer<?> deser = _enumDeserializer;

src/main/java/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.java

@@ -116,6 +116,9 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
             BeanProperty property) throws JsonMappingException
     {
         JsonDeserializer<?> valueDeser = _elementDeserializer;
+        // 07-May-2020, tatu: Is the argument `containerType.getRawClass()` right here?
+        //    In a way seems like it should rather refer to value class... ?
+        //    (as it's individual value of element type, not Container)...
         Boolean unwrapSingle = findFormatFeature(ctxt, property, _containerType.getRawClass(),
                 JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
         // May have a content converter

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderFailTest.java

@@ -70,7 +70,8 @@ public void testBuilderMethodReturnInvalidType() throws Exception
             MAPPER.readValue(json, ValueClassWrongBuildType.class);
             fail("Missing expected InvalidDefinitionException exception");
         } catch (InvalidDefinitionException e) {
-            verifyException(e, "Build method");
+            verifyException(e, "Build method ");
+            verifyException(e, "#build(0 params)");
             verifyException(e, "has wrong return type");
         }
     }