Merge branch '2.12'

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/StreamReadCapability.java

@@ -24,12 +24,30 @@ public enum StreamReadCapability
      * Capability may be used for allowing secondary mapping of such duplicates
      * in case of using Tree Model (see {@link TreeNode}), or "untyped" databinding
      * (mapping content as generic {@link java.lang.Object}).
-     * 
      *<p>
-     * Capability is typically {@code false}, hence default.
+     * Capability is currently only enabled for XML format backend.
      */
     DUPLICATE_PROPERTIES(false),
 
+    /**
+     * Capability that indicates that data format may in some cases expose Scalar values
+     * (whether typed or untyped) as Object values. There are additional access methods
+     * at databind level: this capability may be used to decide whether to attempt to
+     * use such methods especially in potentially ambiguous cases.
+     *<p>
+     * Capability is currently only enabled for XML format backend.
+     */
+    SCALARS_AS_OBJECTS(false),
+
+    /**
+     * Capability that indicates that data format only exposed "untyped" scalars: that is,
+     * instead of Number, Boolean and String types all scalar values are reported as
+     * text ({@link JsonToken#VALUE_STRING})
+     * unless some sort of coercion is implied by caller.
+     *<p>
+     * This capability is true for many textual formats like CSV, Properties and XML.
+     */
+    UNTYPED_SCALARS(false),
     ;
 
     /**
@@ -50,5 +68,4 @@ private StreamReadCapability(boolean defaultState) {
     public boolean enabledIn(int flags) { return (flags & _mask) != 0; }
     @Override
     public int getMask() { return _mask; }
-
 }

src/test/java/com/fasterxml/jackson/core/json/JsonReadFeaturesTest.java

@@ -61,6 +61,8 @@ private void _testDefaultSettings(JsonParser p) throws Exception {
 
         // [core#619]:
         assertFalse(p.getReadCapabilities().isEnabled(StreamReadCapability.DUPLICATE_PROPERTIES));
+        assertFalse(p.getReadCapabilities().isEnabled(StreamReadCapability.SCALARS_AS_OBJECTS));
+        assertFalse(p.getReadCapabilities().isEnabled(StreamReadCapability.UNTYPED_SCALARS));
 
         p.close();
     }

src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java

@@ -269,16 +269,22 @@ public void testLongParsing() throws Exception
     public void testLongBoundsChecks() throws Exception
     {
         String minLong = String.valueOf(Long.MIN_VALUE).substring(1);
+        String belowMinLong = BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE)
+                .toString().substring(1);
         String maxLong = String.valueOf(Long.MAX_VALUE);
+        String aboveMaxLong = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE).toString();
         final String VALUE_491 = "1323372036854775807"; // is within range (JACKSON-491)
         final String OVERFLOW =  "9999999999999999999"; // and this one is clearly out
 
         assertTrue(NumberInput.inLongRange(minLong, true));
         assertTrue(NumberInput.inLongRange(maxLong, false));
         assertTrue(NumberInput.inLongRange(VALUE_491, true));
         assertTrue(NumberInput.inLongRange(VALUE_491, false));
+
         assertFalse(NumberInput.inLongRange(OVERFLOW, false));
         assertFalse(NumberInput.inLongRange(OVERFLOW, true));
+        assertFalse(NumberInput.inLongRange(belowMinLong, true));
+        assertFalse(NumberInput.inLongRange(aboveMaxLong, false));
 
         char[] cbuf = minLong.toCharArray();
         assertTrue(NumberInput.inLongRange(cbuf, 0, cbuf.length, true));
@@ -287,9 +293,13 @@ public void testLongBoundsChecks() throws Exception
         cbuf = VALUE_491.toCharArray();
         assertTrue(NumberInput.inLongRange(cbuf, 0, cbuf.length, true));
         assertTrue(NumberInput.inLongRange(cbuf, 0, cbuf.length, false));
+
         cbuf = OVERFLOW.toCharArray();
         assertFalse(NumberInput.inLongRange(cbuf, 0, cbuf.length, true));
         assertFalse(NumberInput.inLongRange(cbuf, 0, cbuf.length, false));
+
+        cbuf = aboveMaxLong.toCharArray();
+        assertFalse(NumberInput.inLongRange(cbuf, 0, cbuf.length, false));
     }
 
     /*