Improve error reporting wrt #1338 to add more info on which property caused the problem

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.introspect.Annotated;
+import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.*;
 import com.fasterxml.jackson.databind.ser.impl.FailingSerializer;
@@ -1145,6 +1146,41 @@ public void reportMappingProblem(Throwable t, String message, Object... args) th
         throw mappingException(t, message, args);
     }
 
+    /**
+     * Helper method called to indicate problem in POJO (serialization) definitions or settings
+     * regarding specific Java type, unrelated to actual JSON content to map.
+     * Default behavior is to construct and throw a {@link JsonMappingException}.
+     *
+     * @since 2.9
+     */
+    public <T> T reportBadTypeDefinition(BeanDescription bean,
+            String message, Object... args) throws JsonMappingException {
+        if (args != null && args.length > 0) {
+            message = String.format(message, args);
+        }
+        String beanDesc = (bean == null) ? "N/A" : _desc(bean.getType().getGenericSignature());
+        throw mappingException("Invalid type definition for type %s: %s",
+                beanDesc, message);
+    }
+
+    /**
+     * Helper method called to indicate problem in POJO (serialization) definitions or settings
+     * regarding specific property (of a type), unrelated to actual JSON content to map.
+     * Default behavior is to construct and throw a {@link JsonMappingException}.
+     *
+     * @since 2.9
+     */
+    public <T> T reportBadPropertyDefinition(BeanDescription bean, BeanPropertyDefinition prop,
+            String message, Object... args) throws JsonMappingException {
+        if (args != null && args.length > 0) {
+            message = String.format(message, args);
+        }
+        String propName = (prop == null)  ? "N/A" : _desc(prop.getName());
+        String beanDesc = (bean == null) ? "N/A" : _desc(bean.getType().getGenericSignature());
+        throw mappingException("Invalid definition for property %s (of type %s): %s",
+                propName, beanDesc, message);
+    }
+
     /**
      * @since 2.8
      */
@@ -1304,6 +1340,13 @@ protected JsonSerializer<Object> _handleResolvable(JsonSerializer<?> ser)
     /**********************************************************
      */
 
+    protected String _desc(Object value) {
+        if (value == null) {
+            return "N/A";
+        }
+        return "'"+value+"'";
+    }
+
     protected final DateFormat _dateFormat()
     {
         if (_dateFormat != null) {

src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java

@@ -143,8 +143,17 @@ public JsonSerializer<Object> createSerializer(SerializerProvider prov,
         boolean staticTyping;
         // Next: we may have annotations that further indicate actual type to use (a super type)
         final AnnotationIntrospector intr = config.getAnnotationIntrospector();
-        JavaType type = (intr == null) ? origType
-                : intr.refineSerializationType(config, beanDesc.getClassInfo(), origType);
+        JavaType type;
+
+        if (intr == null) {
+            type = origType;
+        } else {
+            try {
+                type = intr.refineSerializationType(config, beanDesc.getClassInfo(), origType);
+            } catch (JsonMappingException e) {
+                return prov.reportBadTypeDefinition(beanDesc, e.getMessage());
+            }
+        }
         if (type == origType) { // no changes, won't force static typing
             staticTyping = false;
         } else { // changes; assume static typing; plus, need to re-introspect if class differs

src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java

@@ -94,7 +94,12 @@ protected BeanPropertyWriter buildWriter(SerializerProvider prov,
         throws JsonMappingException
     {
         // do we have annotation that forces type to use (to declared type or its super type)?
-        JavaType serializationType = findSerializationType(am, defaultUseStaticTyping, declaredType);
+        JavaType serializationType;
+        try {
+            serializationType = findSerializationType(am, defaultUseStaticTyping, declaredType);
+        } catch (JsonMappingException e) {
+            return prov.reportBadPropertyDefinition(_beanDesc, propDef, e.getMessage());
+        }
 
         // Container types can have separate type serializers for content (value / element) type
         if (contentTypeSer != null) {
@@ -109,13 +114,13 @@ protected BeanPropertyWriter buildWriter(SerializerProvider prov,
             JavaType ct = serializationType.getContentType();
             // Not exactly sure why, but this used to occur; better check explicitly:
             if (ct == null) {
-                throw new IllegalStateException("Problem trying to create BeanPropertyWriter for property '"
-                        +propDef.getName()+"' (of type "+_beanDesc.getType()+"); serialization type "+serializationType+" has no content");
+                prov.reportBadPropertyDefinition(_beanDesc, propDef,
+                        "serialization type "+serializationType+" has no content");
             }
             serializationType = serializationType.withContentTypeHandler(contentTypeSer);
             ct = serializationType.getContentType();
         }
-        
+
         Object valueToSuppress = null;
         boolean suppressNulls = false;
 
@@ -221,6 +226,7 @@ protected JavaType findSerializationType(Annotated a, boolean useStaticTyping, J
         throws JsonMappingException
     {
         JavaType secondary = _annotationIntrospector.refineSerializationType(_config, a, declaredType);
+
         // 11-Oct-2015, tatu: As of 2.7, not 100% sure following checks are needed. But keeping
         //    for now, just in case
         if (secondary != declaredType) {