Refactor toString() down to JsonStreamContext

Author: cowtowncoder

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

@@ -5,6 +5,8 @@
 
 package com.fasterxml.jackson.core;
 
+import com.fasterxml.jackson.core.io.CharTypes;
+
 /**
  * Shared base class for streaming processing contexts used during
  * reading and writing of Json content using Streaming API.
@@ -247,4 +249,39 @@ public JsonPointer pathAsPointer(boolean includeRoot) {
     public JsonLocation getStartLocation(Object srcRef) {
         return JsonLocation.NA;
     }
+
+    /**
+     * Overridden to provide developer readable "JsonPath" representation
+     * of the context.
+     * 
+     * @since 2.9
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder(64);
+        switch (_type) {
+        case TYPE_ROOT:
+            sb.append("/");
+            break;
+        case TYPE_ARRAY:
+            sb.append('[');
+            sb.append(getCurrentIndex());
+            sb.append(']');
+            break;
+        case TYPE_OBJECT:
+        default:
+            sb.append('{');
+            String currentName = getCurrentName();
+            if (currentName != null) {
+                sb.append('"');
+                CharTypes.appendQuoted(sb, currentName);
+                sb.append('"');
+            } else {
+                sb.append('?');
+            }
+            sb.append('}');
+            break;
+        }
+        return sb.toString();
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.core.json;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.CharTypes;
 
 /**
  * Extension of {@link JsonStreamContext}, which implements
@@ -206,42 +205,4 @@ private void _checkDup(DupDetector dd, String name) throws JsonProcessingExcepti
                     "Duplicate field '"+name+"'");
         }
     }
-
-    /*
-    /**********************************************************
-    /* Overridden standard methods
-    /**********************************************************
-     */
-
-    /**
-     * Overridden to provide developer readable "JsonPath" representation
-     * of the context.
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder(64);
-        switch (_type) {
-        case TYPE_ROOT:
-            sb.append("/");
-            break;
-        case TYPE_ARRAY:
-            sb.append('[');
-            sb.append(getCurrentIndex());
-            sb.append(']');
-            break;
-        case TYPE_OBJECT:
-        default:
-            sb.append('{');
-            if (_currentName != null) {
-                sb.append('"');
-                CharTypes.appendQuoted(sb, _currentName);
-                sb.append('"');
-            } else {
-                sb.append('?');
-            }
-            sb.append('}');
-            break;
-        }
-        return sb.toString();
-    }
 }

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

@@ -204,40 +204,4 @@ public int writeValue() {
         ++_index;
         return (_index == 0) ? STATUS_OK_AS_IS : STATUS_OK_AFTER_SPACE;
     }
-
-    // // // Internally used abstract methods
-
-    protected void appendDesc(StringBuilder sb) {
-        if (_type == TYPE_OBJECT) {
-            sb.append('{');
-            if (_currentName != null) {
-                sb.append('"');
-                // !!! TODO: Name chars should be escaped?
-                sb.append(_currentName);
-                sb.append('"');
-            } else {
-                sb.append('?');
-            }
-            sb.append('}');
-        } else if (_type == TYPE_ARRAY) {
-            sb.append('[');
-            sb.append(getCurrentIndex());
-            sb.append(']');
-        } else {
-            // nah, ROOT:
-            sb.append("/");
-        }
-    }
-
-    // // // Overridden standard methods
-
-    /**
-     * Overridden to provide developer writeable "JsonPath" representation
-     * of the context.
-     */
-    @Override public String toString() {
-        StringBuilder sb = new StringBuilder(64);
-        appendDesc(sb);
-        return sb.toString();
-    }
 }