Fixed #674

Author: cowtowncoder

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

@@ -327,7 +327,7 @@ protected JsonGenerator() { }
 
     /*
     /**********************************************************************
-    /* Public API, output configuration, state access
+    /* Public API, state, output configuration access
     /**********************************************************************
      */
 
@@ -373,7 +373,16 @@ public Object getOutputTarget() {
      *
      * @return "Current value" associated with the current context (state) of this generator
      *
-     * @since 2.5
+     * @since 2.13 (added as replacement for older {@link #getCurrentValue()}
+     */
+    public abstract Object currentValue();
+
+    // TODO: deprecate in 2.14 or later
+    /**
+     * Alias for {@link #currentValue()}, to be deprecated in later
+     * Jackson 2.x versions (and removed from Jackson 3.0).
+     *
+     * @return Location of the last processed input unit (byte or character)
      */
     public Object getCurrentValue() {
         JsonStreamContext ctxt = getOutputContext();
@@ -387,7 +396,7 @@ public Object getCurrentValue() {
      *</code>
      *
      * @param v Current value to assign for the current context of this generator
-     * 
+     *
      * @since 2.5
      */
     public void setCurrentValue(Object v) {

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

@@ -429,43 +429,6 @@ protected JsonParser() { }
      */
     public Object getInputSource() { return null; }
 
-    /**
-     * Helper method, usually equivalent to:
-     *<code>
-     *   getParsingContext().getCurrentValue();
-     *</code>
-     *<p>
-     * Note that "current value" is NOT populated (or used) by Streaming parser;
-     * it is only used by higher-level data-binding functionality.
-     * The reason it is included here is that it can be stored and accessed hierarchically,
-     * and gets passed through data-binding.
-     *
-     * @return "Current value" associated with the current input context (state) of this parser
-     *
-     * @since 2.5
-     */
-    public Object getCurrentValue() {
-        JsonStreamContext ctxt = getParsingContext();
-        return (ctxt == null) ? null : ctxt.getCurrentValue();
-    }
-
-    /**
-     * Helper method, usually equivalent to:
-     *<code>
-     *   getParsingContext().setCurrentValue(v);
-     *</code>
-     *
-     * @param v Current value to assign for the current input context of this parser
-     * 
-     * @since 2.5
-     */
-    public void setCurrentValue(Object v) {
-        JsonStreamContext ctxt = getParsingContext();
-        if (ctxt != null) {
-            ctxt.setCurrentValue(v);
-        }
-    }
-
     /**
      * Sets the payload to be passed if {@link JsonParseException} is thrown.
      *
@@ -739,6 +702,54 @@ public JsonLocation currentTokenLocation() {
      */
     public abstract JsonLocation getTokenLocation();
 
+    /**
+     * Helper method, usually equivalent to:
+     *<code>
+     *   getParsingContext().getCurrentValue();
+     *</code>
+     *<p>
+     * Note that "current value" is NOT populated (or used) by Streaming parser;
+     * it is only used by higher-level data-binding functionality.
+     * The reason it is included here is that it can be stored and accessed hierarchically,
+     * and gets passed through data-binding.
+     *
+     * @return "Current value" associated with the current input context (state) of this parser
+     *
+     * @since 2.13 (added as replacement for older {@link #getCurrentValue()}
+     */
+    public Object currentValue() {
+        return getCurrentValue();
+    }
+
+    // TODO: deprecate in 2.14 or later
+    /**
+     * Alias for {@link #currentValue()}, to be deprecated in later
+     * Jackson 2.x versions (and removed from Jackson 3.0).
+     *
+     * @return Location of the last processed input unit (byte or character)
+     */
+    public Object getCurrentValue() {
+        JsonStreamContext ctxt = getParsingContext();
+        return (ctxt == null) ? null : ctxt.getCurrentValue();
+    }
+
+    /**
+     * Helper method, usually equivalent to:
+     *<code>
+     *   getParsingContext().setCurrentValue(v);
+     *</code>
+     *
+     * @param v Current value to assign for the current input context of this parser
+     * 
+     * @since 2.5
+     */
+    public void setCurrentValue(Object v) {
+        JsonStreamContext ctxt = getParsingContext();
+        if (ctxt != null) {
+            ctxt.setCurrentValue(v);
+        }
+    }
+
     /*
     /**********************************************************
     /* Buffer handling
@@ -1196,17 +1207,18 @@ public int currentTokenId() {
         return getCurrentTokenId();
     }
 
+    // TODO: deprecate in 2.14 or later
     /**
      * Alias for {@link #currentToken()}, may be deprecated sometime after
-     * Jackson 2.12 (will be removed from 3.0).
+     * Jackson 2.13 (will be removed from 3.0).
      *
      * @return Type of the token this parser currently points to,
      *   if any: null before any tokens have been read, and
      */
     public abstract JsonToken getCurrentToken();
 
     /**
-     * Alias for {@link #currentTokenId()}.
+     * Deprecated alias for {@link #currentTokenId()}.
      *
      * @return {@code int} matching one of constants from {@link JsonTokenId}.
      *
@@ -1385,8 +1397,9 @@ public boolean isNaN() throws IOException {
     /**********************************************************
      */
 
+    // TODO: deprecate in 2.14 or later
     /**
-     * See {@link #currentName()}.
+     * Alias of {@link #currentName()}.
      *
      * @return Name of the current field in the parsing context
      *

src/main/java/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.java

@@ -44,19 +44,9 @@ public JsonGeneratorDelegate(JsonGenerator d, boolean delegateCopyMethods) {
         this.delegateCopyMethods = delegateCopyMethods;
     }
 
-    @Override
-    public Object getCurrentValue() {
-        return delegate.getCurrentValue();
-    }
-
-    @Override
-    public void setCurrentValue(Object v) {
-        delegate.setCurrentValue(v);
-    }
-
     /*
     /**********************************************************************
-    /* Public API, metadata
+    /* Public API, metadata/state access
     /**********************************************************************
      */
 
@@ -73,6 +63,17 @@ public void setCurrentValue(Object v) {
     @Override public Object getOutputTarget() { return delegate.getOutputTarget(); }
     @Override public int getOutputBuffered() { return delegate.getOutputBuffered(); }
 
+    @Override
+    public void setCurrentValue(Object v) {
+        delegate.setCurrentValue(v);
+    }
+
+    @Override
+    public Object currentValue() { return delegate.currentValue(); }
+
+    @Override
+    public Object getCurrentValue() { return delegate.getCurrentValue(); }
+
     /*
     /**********************************************************************
     /* Public API, capability introspection

src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java

@@ -26,16 +26,6 @@ public JsonParserDelegate(JsonParser d) {
         delegate = d;
     }
 
-    @Override
-    public Object getCurrentValue() {
-        return delegate.getCurrentValue();
-    }
-
-    @Override
-    public void setCurrentValue(Object v) {
-        delegate.setCurrentValue(v);
-    }
-
     /*
     /**********************************************************************
     /* Public API, configuration
@@ -106,25 +96,31 @@ public JsonParser overrideFormatFeatures(int values, int mask) {
 
     /*
     /**********************************************************************
-    /* Public API, state override methods
+    /* Public API, state change/override methods
     /**********************************************************************
      */
-    
+
     @Override public void clearCurrentToken() { delegate.clearCurrentToken(); }
     @Override public JsonToken getLastClearedToken() { return delegate.getLastClearedToken(); }
     @Override public void overrideCurrentName(String name) { delegate.overrideCurrentName(name); }
 
+    @Override
+    public void setCurrentValue(Object v) {
+        delegate.setCurrentValue(v);
+    }
+
     /*
     /**********************************************************************
     /* Public API, state/location accessors
     /**********************************************************************
      */
 
     @Override public JsonStreamContext getParsingContext() { return delegate.getParsingContext(); }
-    
+
     @Override public JsonToken currentToken() { return delegate.currentToken(); }
     @Override public int currentTokenId() { return delegate.currentTokenId(); }
     @Override public String currentName() throws IOException { return delegate.currentName(); }
+    @Override public Object currentValue() { return delegate.currentValue(); }
 
     @Override public JsonLocation currentLocation() { return delegate.getCurrentLocation(); }
     @Override public JsonLocation currentTokenLocation() { return delegate.getTokenLocation(); }
@@ -135,6 +131,8 @@ public JsonParser overrideFormatFeatures(int values, int mask) {
     @Override public int getCurrentTokenId() { return delegate.getCurrentTokenId(); }
     // TODO: deprecate in 2.14 or later
     @Override public String getCurrentName() throws IOException { return delegate.getCurrentName(); }
+    // TODO: deprecate in 2.14 or later
+    @Override public Object getCurrentValue() { return delegate.getCurrentValue(); }
 
     // TODO: deprecate in 2.14 or later
     @Override public JsonLocation getCurrentLocation() { return delegate.getCurrentLocation(); }