Minor cleanup for skeletal non-blocking/smile parser, to prepare for implementation

Author: cowtowncoder

avro/pom.xml

@@ -25,7 +25,6 @@ abstractions.
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${version.jackson.core}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/async/NonBlockingByteArrayFeeder.java

@@ -0,0 +1,21 @@
+package com.fasterxml.jackson.dataformat.smile.async;
+
+import java.io.IOException;
+
+public interface NonBlockingByteArrayFeeder extends NonBlockingInputFeeder
+{
+     /**
+      * Method that can be called to feed more data, if (and only if)
+      * {@link #needMoreInput} returns true.
+      * 
+      * @param data Byte array that contains data to feed: caller must ensure data remains
+      *    stable until it is fully processed (which is true when {@link #needMoreInput}
+      *    returns true)
+      * @param offset Offset within array where input data to process starts
+      * @param len Length of input data within array to process.
+      * 
+      * @throws IOException if the state is such that this method should not be called
+      *   (has not yet consumed existing input data, or has been marked as closed)
+      */
+     public void feedInput(byte[] data, int offset, int len) throws IOException;
+}

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/async/NonBlockingByteBufferFeeder.java

@@ -0,0 +1,18 @@
+package com.fasterxml.jackson.dataformat.smile.async;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+public interface NonBlockingByteBufferFeeder extends NonBlockingInputFeeder
+{
+     /**
+      * Method that can be called to feed more data, if (and only if)
+      * {@link NonBlockingInputFeeder#needMoreInput} returns true.
+      * 
+      * @param buffer Buffer that contains additional input to read
+      * 
+      * @throws IOException if the state is such that this method should not be called
+      *   (has not yet consumed existing input data, or has been marked as closed)
+      */
+     public void feedInput(ByteBuffer buffer) throws IOException;
+}

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/async/NonBlockingInputFeeder.java

@@ -1,7 +1,5 @@
 package com.fasterxml.jackson.dataformat.smile.async;
 
-import java.io.IOException;
-
 /**
  * Interface used by non-blocking {@link com.fasterxml.jackson.core.JsonParser}
  * to get more input to parse.
@@ -23,24 +21,9 @@ public interface NonBlockingInputFeeder
      */
     public boolean needMoreInput();
 
-    /**
-     * Method that can be called to feed more data, if (and only if)
-     * {@link #needMoreInput} returns true.
-     * 
-     * @param data Byte array that contains data to feed: caller must ensure data remains
-     *    stable until it is fully processed (which is true when {@link #needMoreInput}
-     *    returns true)
-     * @param offset Offset within array where input data to process starts
-     * @param len Length of input data within array to process.
-     * 
-     * @throws IOException if the state is such that this method should not be called
-     *   (has not yet consumed existing input data, or has been marked as closed)
-     */
-    public void feedInput(byte[] data, int offset, int len) throws IOException;
-
     /**
      * Method that should be called after last chunk of data to parse has been fed
-     * (with {@link #feedInput}); can be called regardless of what {@link #needMoreInput}
+     * (with <code>feedInput</code> in sub-class); can be called regardless of what {@link #needMoreInput}
      * returns. After calling this method, no more data can be fed; and parser assumes
      * no more data will be available.
      */

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/async/NonBlockingParser.java

@@ -10,9 +10,13 @@
  * extending it with features needed to process data in non-blocking
  * ("asynchronous")
  */
-public interface NonBlockingParser
-    extends NonBlockingInputFeeder
+public interface NonBlockingParser<F extends NonBlockingInputFeeder>
 {
+    /**
+     * Accessor for getting handle to the input feeder to use for this parser
+     */
+    public F getInputFeeder();
+
     /**
      * Method that can be called when current token is not yet
      * available via {@link com.fasterxml.jackson.core.JsonParser#currentToken},

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/async/NonBlockingParserImpl.java

@@ -16,7 +16,8 @@
 
 public class NonBlockingParserImpl
     extends ParserBase
-    implements NonBlockingParser, NonBlockingInputFeeder
+    implements NonBlockingParser<NonBlockingByteArrayFeeder>,
+        NonBlockingByteArrayFeeder
 {
     private final static byte[] NO_BYTES = new byte[0];
     private final static int[] NO_INTS = new int[0];
@@ -36,7 +37,6 @@ public class NonBlockingParserImpl
      */
     protected final static int STATE_INITIAL = 0;
 
-
     /**
      * State for recognized header marker, either in-feed or initial.
      */
@@ -298,7 +298,7 @@ protected boolean handleSignature(boolean consumeFirstByte, boolean throwExcepti
             }
             return false;
         }
-    	// Good enough; just need version info from 4th byte...
+        // Good enough; just need version info from 4th byte...
         if (++_inputPtr >= _inputEnd) {
             _loadMoreGuaranteed();        	
         }
@@ -461,9 +461,8 @@ protected void _releaseBuffers() throws IOException
             String[] nameBuf = _seenNames;
             if (nameBuf != null && nameBuf.length > 0) {
                 _seenNames = null;
-                /* 28-Jun-2011, tatu: With 1.9, caller needs to clear the buffer;
-                 *   but we only need to clear up to count as it is not a hash area
-                 */
+                // Need to clear the buffer;
+                // but we only need to clear up to count as it is not a hash area
                 if (_seenNameCount > 0) {
                     Arrays.fill(nameBuf, 0, _seenNameCount, null);
                 }
@@ -474,9 +473,8 @@ protected void _releaseBuffers() throws IOException
             String[] valueBuf = _seenStringValues;
             if (valueBuf != null && valueBuf.length > 0) {
                 _seenStringValues = null;
-                /* 28-Jun-2011, tatu: With 1.9, caller needs to clear the buffer;
-                 *   but we only need to clear up to count as it is not a hash area
-                 */
+                // Need to clear the buffer;
+                // but we only need to clear up to count as it is not a hash area
                 if (_seenStringValueCount > 0) {
                     Arrays.fill(valueBuf, 0, _seenStringValueCount, null);
                 }
@@ -703,10 +701,10 @@ public String getCurrentName() throws IOException
     public NumberType getNumberType()
         throws IOException
     {
-    	if (_got32BitFloat) {
-    	    return NumberType.FLOAT;
-    	}
-    	return super.getNumberType();
+        if (_got32BitFloat) {
+            return NumberType.FLOAT;
+        }
+        return super.getNumberType();
     }
 
     /*
@@ -754,6 +752,11 @@ public void endOfInput() {
     /**********************************************************************
      */
 
+    @Override
+    public NonBlockingByteArrayFeeder getInputFeeder() {
+        return this;
+    }
+    
     @Override
     public JsonToken peekNextToken() throws IOException
     {