Merge branch '2.10' into 2.11

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -611,6 +611,9 @@ Ivo Studens ([email protected])
   * Contributed #1585: Invoke ServiceLoader.load() inside of a privileged block
     when loading modules using `ObjectMapper.findModules()`
    (2.8.9)
+  * Contributed fix for #2482: `JSONMappingException` `Location` column number
+    is one line Behind the actual location
+   (2.10.3)
 
 Javy Luo (AnywnYu@github)
   * Reported #1595: `JsonIgnoreProperties.allowSetters` is not working in Jackson 2.8
@@ -1023,6 +1026,11 @@ Greg Arakelian (arakelian@github)
     of empty string
   (2.10.2)
 
+Kamal Aslam (aslamkam@github)
+  * Reported #2482: `JSONMappingException` `Location` column number is one line
+    Behind the actual location
+  (2.10.3)
+
 Tobias Preuss (johnjohndoe@github)
   * Reported #2599: NoClassDefFoundError at DeserializationContext.<init> on Android 4.1.2
     and Jackson 2.10.0

release-notes/VERSION-2.x

@@ -41,6 +41,9 @@ Project: jackson-databind
 
 2.10.3 (not yet released)
 
+#2482: `JSONMappingException` `Location` column number is one line Behind the actual
+  location
+ (reported by Kamal A, fixed by Ivo S)
 #2599: NoClassDefFoundError at DeserializationContext.<init> on Android 4.1.2
   and Jackson 2.10.0
  (reported by Tobias P)

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

@@ -251,7 +251,10 @@ public JsonMappingException(Closeable processor, String msg) {
     public JsonMappingException(Closeable processor, String msg, Throwable problem) {
         super(msg, problem);
         _processor = processor;
-        if (processor instanceof JsonParser) {
+        // 31-Jan-2020: [databind#2482] Retain original location
+        if (problem instanceof JsonProcessingException) {
+            _location = ((JsonProcessingException) problem).getLocation();
+        } else if (processor instanceof JsonParser) {
             _location = ((JsonParser) processor).getTokenLocation();
         }
     }

src/test/java/com/fasterxml/jackson/databind/exc/BasicExceptionTest.java

@@ -1,20 +1,19 @@
 package com.fasterxml.jackson.databind.exc;
 
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 public class BasicExceptionTest extends BaseMapTest
 {
-    final ObjectMapper MAPPER = new ObjectMapper();
-    final JsonFactory JSON_F = MAPPER.getFactory();
+    private final ObjectMapper MAPPER = newJsonMapper();
+    private final JsonFactory JSON_F = MAPPER.getFactory();
 
     public void testBadDefinition() throws Exception
     {
@@ -114,18 +113,30 @@ public void testUnrecognizedProperty() throws Exception
     }
 
     // [databind#2128]: ensure Location added once and only once
+    // [databind#2482]: ensure Location is the original one
     public void testLocationAddition() throws Exception
     {
+        String problemJson = "{\n\t\"userList\" : [\n\t{\n\t user : \"1\"\n\t},\n\t{\n\t \"user\" : \"2\"\n\t}\n\t]\n}";
         try {
-            /*Map<?,?> map =*/ MAPPER.readValue("{\"value\":\"foo\"}",
-                    new TypeReference<Map<ABC, Integer>>() { });
+            MAPPER.readValue(problemJson, Users.class);
             fail("Should not pass");
-        } catch (MismatchedInputException e) {
+        } catch (JsonMappingException e) { // becomes "generic" due to wrapping for passing path info
             String msg = e.getMessage();
             String[] str = msg.split(" at \\[");
             if (str.length != 2) {
                 fail("Should only get one 'at [' marker, got "+(str.length-1)+", source: "+msg);
             }
+            JsonLocation loc = e.getLocation();
+//          String expectedLocation = "line: 4, column: 4";
+            assertEquals(4, loc.getLineNr());
+            assertEquals(4, loc.getColumnNr());
         }
     }
+    static class User {
+        public String user;
+    }
+
+    static class Users {
+        public ArrayList<User> userList;
+    }
 }