Refactoring/cleanup to prepare for #561

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/base/ParserBase.java

@@ -1047,6 +1047,26 @@ protected void _throwUnquotedSpace(int i, String ctxtDesc) throws JsonParseExcep
         }
     }
 
+    /**
+     * @return Description to use as "valid tokens" in an exception message about
+     *    invalid (unrecognized) token
+     *
+     * @since 2.10
+     */
+    protected String _validJsonTokenList() throws IOException {
+        return "('null', 'true', 'false' or NaN)";
+    }
+
+    /**
+     * @return Description to use as "valid JSON values" in an exception message about
+     *    invalid (unrecognized) JSON value
+     *
+     * @since 2.10
+     */
+    protected String _validJsonValueList() throws IOException {
+        return "(number, String, array, object, 'true', 'false' or 'null')";
+    }
+
     /*
     /**********************************************************
     /* Base64 handling support

src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java

@@ -1910,10 +1910,10 @@ protected JsonToken _handleOddValue(int i) throws IOException
         }
         // [core#77] Try to decode most likely token
         if (Character.isJavaIdentifierStart(i)) {
-            _reportInvalidToken(""+((char) i), "('true', 'false' or 'null')");
+            _reportInvalidToken(""+((char) i), _validJsonTokenList());
         }
         // but if it doesn't look like a token:
-        _reportUnexpectedChar(i, "expected a valid value (number, String, array, object, 'true', 'false' or 'null')");
+        _reportUnexpectedChar(i, "expected a valid value "+_validJsonValueList());
         return null;
     }
 
@@ -2842,7 +2842,7 @@ private final void _updateNameLocation()
      */
 
     protected void _reportInvalidToken(String matchedPart) throws IOException {
-        _reportInvalidToken(matchedPart, "'null', 'true', 'false' or NaN");
+        _reportInvalidToken(matchedPart, _validJsonTokenList());
     }
 
     protected void _reportInvalidToken(String matchedPart, String msg) throws IOException

src/main/java/com/fasterxml/jackson/core/json/UTF8DataInputJsonParser.java

@@ -2061,10 +2061,10 @@ protected JsonToken _handleUnexpectedValue(int c)
         }
         // [core#77] Try to decode most likely token
         if (Character.isJavaIdentifierStart(c)) {
-            _reportInvalidToken(c, ""+((char) c), "('true', 'false' or 'null')");
+            _reportInvalidToken(c, ""+((char) c), _validJsonTokenList());
         }
         // but if it doesn't look like a token:
-        _reportUnexpectedChar(c, "expected a valid value (number, String, array, object, 'true', 'false' or 'null')");
+        _reportUnexpectedChar(c, "expected a valid value "+_validJsonValueList());
         return null;
     }
 
@@ -2673,7 +2673,7 @@ private final void _skipUtf8_4() throws IOException
 
     protected void _reportInvalidToken(int ch, String matchedPart) throws IOException
      {
-         _reportInvalidToken(ch, matchedPart, "'null', 'true', 'false' or NaN");
+         _reportInvalidToken(ch, matchedPart, _validJsonTokenList());
      }
 
     protected void _reportInvalidToken(int ch, String matchedPart, String msg)

src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java

@@ -2648,10 +2648,10 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException
         }
         // [core#77] Try to decode most likely token
         if (Character.isJavaIdentifierStart(c)) {
-            _reportInvalidToken(""+((char) c), "('true', 'false' or 'null')");
+            _reportInvalidToken(""+((char) c), _validJsonTokenList());
         }
         // but if it doesn't look like a token:
-        _reportUnexpectedChar(c, "expected a valid value (number, String, array, object, 'true', 'false' or 'null')");
+        _reportUnexpectedChar(c, "expected a valid value "+_validJsonValueList());
         return null;
     }
 
@@ -3525,11 +3525,11 @@ private int nextByte() throws IOException
 
     protected void _reportInvalidToken(String matchedPart, int ptr) throws IOException {
         _inputPtr = ptr;
-        _reportInvalidToken(matchedPart, "'null', 'true', 'false' or NaN");
+        _reportInvalidToken(matchedPart, _validJsonTokenList());
     }
 
     protected void _reportInvalidToken(String matchedPart) throws IOException {
-        _reportInvalidToken(matchedPart, "'null', 'true', 'false' or NaN");
+        _reportInvalidToken(matchedPart, _validJsonTokenList());
     }
 
     protected void _reportInvalidToken(String matchedPart, String msg) throws IOException

src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingJsonParser.java

@@ -919,7 +919,7 @@ protected JsonToken _startUnexpectedValue(boolean leadingComma, int ch) throws I
             return _finishNonStdToken(NON_STD_TOKEN_INFINITY, 1);
         }
         // !!! TODO: maybe try to collect more information for better diagnostics
-        _reportUnexpectedChar(ch, "expected a valid value (number, String, array, object, 'true', 'false' or 'null')");
+        _reportUnexpectedChar(ch, "expected a valid value "+_validJsonValueList());
         return null;
     }
 
@@ -1263,10 +1263,10 @@ protected JsonToken _reportErrorToken(String actualToken) throws IOException
     {
         // !!! TODO: Include non-standard ones if enabled
         _reportError("Unrecognized token '%s': was expecting %s", _textBuffer.contentsAsString(),
-                "'null', 'true' or 'false'");
+                _validJsonTokenList());
         return JsonToken.NOT_AVAILABLE; // never gets here
     }
-    
+
     /*
     /**********************************************************************
     /* Second-level decoding, Number decoding

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

@@ -20,7 +20,7 @@ public void testLongErrorMessage() throws Exception
 
     public void testLongErrorMessageReader() throws Exception
     {
-_testLongErrorMessage(MODE_READER);
+        _testLongErrorMessage(MODE_READER);
     }
 
     private void _testLongErrorMessage(int mode) throws Exception
@@ -36,9 +36,10 @@ private void _testLongErrorMessage(int mode) throws Exception
             fail("Expected an exception for unrecognized token");
         } catch (JsonParseException jpe) {
         	String msg = jpe.getMessage();
-        	final String expectedPrefix = "Unrecognized token '";
-        	final String expectedSuffix = "...': was expecting ('true', 'false' or 'null')";
-        	assertTrue(msg.startsWith(expectedPrefix));
+          final String expectedPrefix = "Unrecognized token '";
+          final String expectedSuffix = "...': was expecting";
+        	verifyException(jpe,  expectedPrefix);
+          verifyException(jpe,  expectedSuffix);
         	assertTrue(msg.contains(expectedSuffix));
           int tokenLen = msg.indexOf (expectedSuffix) - expectedPrefix.length();
         	assertEquals(EXPECTED_MAX_TOKEN_LEN, tokenLen);
@@ -65,10 +66,10 @@ public void _testShortErrorMessage(int mode) throws Exception
         } catch (JsonParseException jpe) {
             String msg = jpe.getMessage();
             final String expectedPrefix = "Unrecognized token '";
-            final String expectedSuffix = "': was expecting ('true', 'false' or 'null')";
-            assertTrue(msg.startsWith(expectedPrefix));
-            assertTrue(msg.contains(expectedSuffix));
-            int tokenLen = msg.indexOf (expectedSuffix) - expectedPrefix.length();
+            final String expectedSuffix = "': was expecting";
+            verifyException(jpe,  expectedPrefix);
+            verifyException(jpe,  expectedSuffix);
+            int tokenLen = msg.indexOf(expectedSuffix) - expectedPrefix.length();
             assertEquals(DOC.length(), tokenLen);
         }
         jp.close();