Merge branch '2.x' into 3.x

Author: cowtowncoder

src/main/java/tools/jackson/dataformat/xml/deser/FromXmlParser.java

@@ -372,7 +372,7 @@ public TokenStreamLocation currentLocation() {
      */
 
     /**
-     * Since xml representation can not really distinguish between array
+     * Since xml representation cannot really distinguish between array
      * and object starts (both are represented with elements), this method
      * is overridden and taken to mean that expectation is that the current
      * start element is to mean 'start array', instead of default of
@@ -403,7 +403,7 @@ public boolean isExpectedStartArrayToken()
     }
 
     /**
-     * Since xml representation can not really distinguish between different
+     * Since xml representation cannot really distinguish between different
      * scalar types (numbers, booleans) -- they are all just Character Data,
      * without schema -- we can try to infer type from intent here.
      * The main benefit is avoiding checks for coercion.
@@ -917,7 +917,7 @@ public byte[] getBinaryValue(Base64Variant b64variant) throws JacksonException
     {
         if (_currToken != JsonToken.VALUE_STRING &&
                 (_currToken != JsonToken.VALUE_EMBEDDED_OBJECT || _binaryValue == null)) {
-            _reportError("Current token ("+_currToken+") not VALUE_STRING or VALUE_EMBEDDED_OBJECT, can not access as binary");
+            _reportError("Current token ("+_currToken+") not VALUE_STRING or VALUE_EMBEDDED_OBJECT, cannot access as binary");
         }
         // To ensure that we won't see inconsistent data, better clear up state...
         if (_binaryValue == null) {
@@ -1062,7 +1062,7 @@ protected final void _checkNumericValue(int expType) throws JacksonException {
         if (_currToken == JsonToken.VALUE_NUMBER_INT) {
             return;
         }
-        throw _constructReadException("Current token (%s) not numeric, can not use numeric value accessors",
+        throw _constructReadException("Current token (%s) not numeric, cannot use numeric value accessors",
                 currentToken());
     }
 

src/test/java/tools/jackson/dataformat/xml/deser/XmlNumberParsingGetType1433Test.java

@@ -0,0 +1,57 @@
+package tools.jackson.dataformat.xml.deser;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.core.*;
+import tools.jackson.core.exc.StreamReadException;
+
+import tools.jackson.dataformat.xml.*;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class XmlNumberParsingGetType1433Test
+    extends XmlTestUtil
+{
+    private final XmlMapper XML_MAPPER = xmlMapper(false);
+
+    // Bit different for XML as there's rarely "native" number tokens
+    @Test
+    void getNumberType() throws Exception
+    {
+       JsonParser p;
+
+        p = _createParser("<root>123</root>");
+        _verifyGetNumberTypeFail(p, "null");
+        assertToken(JsonToken.START_OBJECT, p.nextToken());
+        _verifyGetNumberTypeFail(p, "START_OBJECT");
+        assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
+        _verifyGetNumberTypeFail(p, "PROPERTY_NAME");
+        assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertTrue(p.isExpectedNumberIntToken());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.currentToken());
+        assertEquals(JsonParser.NumberType.INT, p.getNumberType());
+        assertToken(JsonToken.END_OBJECT, p.nextToken());
+        _verifyGetNumberTypeFail(p, "END_OBJECT");
+        assertNull(p.nextToken());
+        _verifyGetNumberTypeFail(p, "null");
+        p.close();
+        _verifyGetNumberTypeFail(p, "null");
+    }
+
+    private void _verifyGetNumberTypeFail(JsonParser p, String token) throws Exception
+    {
+        try {
+            p.getNumberType();
+            fail("Should not pass");
+        } catch (StreamReadException e) {
+            verifyException(e, "Current token ("+token+") not numeric, cannot use numeric");
+        }
+    }
+
+    private JsonParser _createParser(String text) throws Exception {
+        return XML_MAPPER.createParser(text);
+    }
+}