Merge branch '2.18' into 2.19

Author: cowtowncoder

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

@@ -319,9 +319,8 @@ public static JsonMappingException from(SerializerProvider ctxt, String msg) {
      * @since 2.7
      */
     public static JsonMappingException from(SerializerProvider ctxt, String msg, Throwable problem) {
-        /* 17-Aug-2015, tatu: As per [databind#903] this is bit problematic as
-         *   SerializerProvider instance does not currently hold on to generator...
-         */
+        // 17-Aug-2015, tatu: As per [databind#903] this is bit problematic as
+        //   SerializerProvider instance does not currently hold on to generator...
         return new JsonMappingException(_generator(ctxt), msg, problem);
     }
 
@@ -509,15 +508,7 @@ protected String _buildMessage()
             return msg;
         }
         StringBuilder sb = (msg == null) ? new StringBuilder() : new StringBuilder(msg);
-        /* 18-Feb-2009, tatu: initially there was a linefeed between
-         *    message and path reference; but unfortunately many systems
-         *   (loggers, junit) seem to assume linefeeds are only added to
-         *   separate stack trace.
-         */
-        sb.append(" (through reference chain: ");
-        sb = getPathReference(sb);
-        sb.append(')');
-        return sb.toString();
+        return _appendReferenceChain(sb).toString();
     }
 
     @Override
@@ -532,6 +523,26 @@ public String toString()
     /**********************************************************************
      */
 
+    /**
+     * Method that is called to add reference chain
+     * information to message, but may be overridden to customize
+     * handling, including appending other information or removing
+     * the reference chain altogether.
+     *
+     * @since 2.18.2
+     */
+    protected StringBuilder _appendReferenceChain(StringBuilder sb)
+    {
+        // 18-Feb-2009, tatu: initially there was a linefeed between
+        //    message and path reference; but unfortunately many systems
+        //   (loggers, junit) seem to assume linefeeds are only added to
+        //   separate stack trace.
+        sb.append(" (through reference chain: ");
+        sb = getPathReference(sb);
+        sb.append(')');
+        return sb;
+    }
+
     protected void _appendPathDesc(StringBuilder sb)
     {
         if (_path == null) {

src/main/java/com/fasterxml/jackson/databind/exc/PropertyBindingException.java

@@ -19,20 +19,22 @@ public abstract class PropertyBindingException
     extends MismatchedInputException // since 2.9
 {
     /**
-     * Class that does not contain mapping for the unrecognized property.
+     * Class that has the problem with mapping of a property (unrecognized,
+     * missing, etc).
      */
     protected final Class<?> _referringClass;
 
     /**
+     * Name of property that has the problem being reported.
      *<p>
-     * Note: redundant information since it is also included in the
-     * reference path.
+     * Note: possibly redundant information since it may also included
+     * in the reference path.
      */
     protected final String _propertyName;
 
     /**
-     * Set of ids of properties that are known for the type, if this
-     * can be statically determined.
+     * Set of ids of properties that are known for the type (see
+     * {@code _referringClass}, if ids can be statically determined.
      */
     protected final Collection<Object> _propertyIds;
 
@@ -119,17 +121,17 @@ public String getMessageSuffix()
      */
 
     /**
-     * Method for accessing type (class) that is missing definition to allow
-     * binding of the unrecognized property.
+     * Method for accessing type (class) that has the problematic property.
      */
     public Class<?> getReferringClass() {
         return _referringClass;
     }
 
     /**
      * Convenience method for accessing logical property name that could
-     * not be mapped. Note that it is the last path reference in the
-     * underlying path.
+     * not be mapped (see {@link #_propertyName}).
+     * Note that it is likely the last path reference in the underlying path
+     * (but not necessarily, depending on the type of problem).
      */
     public String getPropertyName() {
         return _propertyName;