minor refactoring related to exception handling

Author: cowtowncoder

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

@@ -1133,6 +1133,25 @@ public JsonMappingException mappingException(String msgTemplate, Object... args)
     /**********************************************************
      */
 
+    /**
+     * Helper method for constructing {@link JsonMappingException} to indicated
+     * that the token encountered was of type different than what <b>should</b>
+     * be seen at that position, usually within a sequence of expected tokens.
+     * Note that most of the time this method should NOT be directly called;
+     * instead, {@link #reportWrongTokenException} should be called and will
+     * call this method as necessary.
+     */
+    public JsonMappingException wrongTokenException(JsonParser p, JsonToken expToken,
+            String msg0)
+    {
+        String msg = String.format("Unexpected token (%s), expected %s",
+                p.getCurrentToken(), expToken);
+        if (msg0 != null) {
+            msg = msg + ": "+msg0;
+        }
+        return JsonMappingException.from(p, msg);
+    }
+
     /**
      * Helper method for constructing exception to indicate that given JSON
      * Object field name was not in format to be able to deserialize specified
@@ -1234,22 +1253,6 @@ public JsonMappingException instantiationException(Class<?> instClass, String ms
                         instClass.getName(), msg));
     }
 
-    /**
-     * Helper method for indicating that the current token was expected to be another
-     * token.
-     * 
-     * @deprecated Since 2.8 use {@link #reportWrongTokenException} instead
-     */
-    @Deprecated
-    public JsonMappingException wrongTokenException(JsonParser p, JsonToken expToken, String msg0) {
-        String msg = String.format("Unexpected token (%s), expected %s",
-                p.getCurrentToken(), expToken);
-        if (msg0 != null) {
-            msg = msg + ": "+msg0;
-        }
-        return JsonMappingException.from(p, msg);
-    }
-
     /**
      * @since 2.5
      *

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.java

@@ -131,7 +131,8 @@ protected String _locateTypeId(JsonParser p, DeserializationContext ctxt) throws
             if (_defaultImpl != null) {
                 return _idResolver.idFromBaseType();
             }
-             ctxt.reportWrongTokenException(p, JsonToken.START_ARRAY, "need JSON Array to contain As.WRAPPER_ARRAY type information for class "+baseTypeName());
+             ctxt.reportWrongTokenException(p, JsonToken.START_ARRAY,
+                     "need JSON Array to contain As.WRAPPER_ARRAY type information for class "+baseTypeName());
              return null;
         }
         // And then type id as a String