further cleanup for cbor/smile output context handlign

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java

@@ -530,7 +530,7 @@ protected void maybeCopyTag(JsonParser p) throws IOException {
     @Override
     public final void writeStartArray() throws IOException {
         _verifyValueWrite("start an array");
-        _cborContext = _cborContext.createChildArrayContext();
+        _cborContext = _cborContext.createChildArrayContext(null);
         if (_elementCountsPtr > 0) {
             _pushRemainingElements();
         }
@@ -546,7 +546,7 @@ public final void writeStartArray() throws IOException {
     @Override
     public void writeStartArray(int elementsToWrite) throws IOException {
         _verifyValueWrite("start an array");
-        _cborContext = _cborContext.createChildArrayContext();
+        _cborContext = _cborContext.createChildArrayContext(null);
         _pushRemainingElements();
         _currentRemainingElements = elementsToWrite;
         _writeLengthMarker(PREFIX_TYPE_ARRAY, elementsToWrite);

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORWriteContext.java

@@ -60,14 +60,6 @@ public final class CBORWriteContext extends JsonStreamContext
     /**********************************************************
      */
 
-    protected CBORWriteContext(int type, CBORWriteContext parent, DupDetector dups) {
-        super();
-        _type = type;
-        _parent = parent;
-        _dups = dups;
-        _index = -1;
-    }
-
     protected CBORWriteContext(int type, CBORWriteContext parent, DupDetector dups,
             Object currentValue) {
         super();
@@ -78,16 +70,6 @@ protected CBORWriteContext(int type, CBORWriteContext parent, DupDetector dups,
         _currentValue = currentValue;
     }
 
-    private CBORWriteContext reset(int type) {
-        _type = type;
-        _index = -1;
-        // as long as _gotFieldId false, current name/id can be left as-is
-        _gotFieldId = false;
-        _currentValue = null;
-        if (_dups != null) { _dups.reset(); }
-        return this;
-    }
-
     private CBORWriteContext reset(int type, Object currentValue) {
         _type = type;
         _index = -1;
@@ -120,16 +102,17 @@ public void setCurrentValue(Object v) {
      */
 
     public static CBORWriteContext createRootContext(DupDetector dd) {
-        return new CBORWriteContext(TYPE_ROOT, null, dd);
+        return new CBORWriteContext(TYPE_ROOT, null, dd, null);
     }
 
-    public CBORWriteContext createChildArrayContext() {
+    public CBORWriteContext createChildArrayContext(Object currentValue) {
         CBORWriteContext ctxt = _childToRecycle;
         if (ctxt == null) {
-            _childToRecycle = ctxt = new CBORWriteContext(TYPE_ARRAY, this, (_dups == null) ? null : _dups.child());
+            _childToRecycle = ctxt = new CBORWriteContext(TYPE_ARRAY, this,
+                    (_dups == null) ? null : _dups.child(), currentValue);
             return ctxt;
         }
-        return ctxt.reset(TYPE_ARRAY);
+        return ctxt.reset(TYPE_ARRAY, currentValue);
     }
 
     public CBORWriteContext createChildObjectContext(Object currentValue) {

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java

@@ -604,15 +604,15 @@ public void writeBytes(byte[] data, int offset, int len) throws IOException
     public final void writeStartArray() throws IOException
     {
         _verifyValueWrite("start an array");
-        _smileContext = _smileContext.createChildArrayContext();
+        _smileContext = _smileContext.createChildArrayContext(null);
         _writeByte(TOKEN_LITERAL_START_ARRAY);
     }
 
-    @Override // defined since 2.6.3
+    @Override
     public final void writeStartArray(int size) throws IOException
     {
         _verifyValueWrite("start an array");
-        _smileContext = _smileContext.createChildArrayContext();
+        _smileContext = _smileContext.createChildArrayContext(null);
         _writeByte(TOKEN_LITERAL_START_ARRAY);
     }
 

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileWriteContext.java

@@ -56,14 +56,6 @@ public final class SmileWriteContext extends JsonStreamContext
     /**********************************************************
      */
 
-    protected SmileWriteContext(int type, SmileWriteContext parent, DupDetector dups) {
-        super();
-        _type = type;
-        _parent = parent;
-        _dups = dups;
-        _index = -1;
-    }
-
     protected SmileWriteContext(int type, SmileWriteContext parent, DupDetector dups,
             Object currentValue) {
         super();
@@ -74,16 +66,6 @@ protected SmileWriteContext(int type, SmileWriteContext parent, DupDetector dups
         _currentValue = currentValue;
     }
 
-    private SmileWriteContext reset(int type) {
-        _type = type;
-        _index = -1;
-        // as long as _gotFieldId false, current name/id can be left as-is
-        _gotFieldId = false;
-        _currentValue = null;
-        if (_dups != null) { _dups.reset(); }
-        return this;
-    }
-
     private SmileWriteContext reset(int type, Object currentValue) {
         _type = type;
         _index = -1;
@@ -116,16 +98,17 @@ public void setCurrentValue(Object v) {
      */
 
     public static SmileWriteContext createRootContext(DupDetector dd) {
-        return new SmileWriteContext(TYPE_ROOT, null, dd);
+        return new SmileWriteContext(TYPE_ROOT, null, dd, null);
     }
 
-    public SmileWriteContext createChildArrayContext() {
+    public SmileWriteContext createChildArrayContext(Object currentValue) {
         SmileWriteContext ctxt = _childToRecycle;
         if (ctxt == null) {
-            _childToRecycle = ctxt = new SmileWriteContext(TYPE_ARRAY, this, (_dups == null) ? null : _dups.child());
+            _childToRecycle = ctxt = new SmileWriteContext(TYPE_ARRAY, this,
+                    (_dups == null) ? null : _dups.child(), currentValue);
             return ctxt;
         }
-        return ctxt.reset(TYPE_ARRAY);
+        return ctxt.reset(TYPE_ARRAY, currentValue);
     }
 
     public SmileWriteContext createChildObjectContext(Object currentValue) {