Fix MessagePackGenerator#flush not to output data more than once and add some tests

komamitsu · komamitsu · commit d2c17605eb2f · 2015-01-12T17:28:51.000+09:00
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackFactory.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackFactory.java
@@ -18,9 +18,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.IOContext;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.Arrays;
 
 public class MessagePackFactory extends JsonFactory {
@@ -33,6 +31,16 @@ public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc) throws
         return new MessagePackGenerator(messagePackGeneratorFeature, _objectCodec, out);
     }
 
+    @Override
+    public JsonGenerator createGenerator(File f, JsonEncoding enc) throws IOException {
+        return createGenerator(new FileOutputStream(f), enc);
+    }
+
+    @Override
+    public JsonGenerator createGenerator(Writer w) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public JsonParser createParser(byte[] data) throws IOException, JsonParseException {
         IOContext ioContext = _createContext(data, false);
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java
@@ -327,6 +327,7 @@ else if (rootStackItem instanceof StackItemForArray) {
             else {
                 throw new IllegalStateException("Unexpected rootStackItem: " + rootStackItem);
             }
+            rootStackItem = null;
             MessagePacker messagePacker = getMessagePacker();
             messagePacker.flush();
         }
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java
@@ -15,17 +15,23 @@
 //
 package org.msgpack.jackson.dataformat;
 
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonGenerator;
 import org.junit.Test;
+import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessageUnpacker;
 import org.msgpack.core.buffer.ArrayBufferInput;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class MessagePackGeneratorTest extends MessagePackDataformatTestBase {
@@ -189,4 +195,30 @@ else if (key.equals("num")) {
         // #7
         assertEquals(false, messageUnpacker.unpackBoolean());
     }
+
+    @Test
+    public void testMessagePackGeneratorDirectly() throws IOException {
+        MessagePackFactory messagePackFactory = new MessagePackFactory();
+        File tempFile = File.createTempFile("msgpackTest", "msgpack");
+        tempFile.deleteOnExit();
+
+        JsonGenerator generator = messagePackFactory.createGenerator(tempFile, JsonEncoding.UTF8);
+        assertTrue(generator instanceof MessagePackGenerator);
+        generator.writeStartArray();
+        generator.writeNumber(0);
+        generator.writeString("one");
+        generator.writeNumber(2.0f);
+        generator.writeEndArray();
+        generator.flush();
+        generator.flush();      // intentional
+        generator.close();
+
+        FileInputStream fileInputStream = new FileInputStream(tempFile);
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(fileInputStream);
+        assertEquals(3, unpacker.unpackArrayHeader());
+        assertEquals(0, unpacker.unpackInt());
+        assertEquals("one", unpacker.unpackString());
+        assertEquals(2.0f, unpacker.unpackFloat(), 0.001f);
+        assertFalse(unpacker.hasNext());
+    }
 }
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
@@ -1,18 +1,21 @@
 package org.msgpack.jackson.dataformat;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.Test;
+import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessagePacker;
 import org.msgpack.core.buffer.OutputStreamBufferOutput;
 
-import java.io.IOException;
-import java.io.Serializable;
+import java.io.*;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class MessagePackParserTest extends MessagePackDataformatTestBase {
     @Test
@@ -224,4 +227,55 @@ else if (k.equals("child_map_age")) {
         // #10
         assertEquals(true, array.get(i++));
     }
+
+    @Test
+    public void testMessagePackParserDirectly() throws IOException {
+        MessagePackFactory messagePackFactory = new MessagePackFactory();
+        File tempFile = File.createTempFile("msgpackTest", "msgpack");
+        tempFile.deleteOnExit();
+
+        FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
+        MessagePacker packer = MessagePack.newDefaultPacker(fileOutputStream);
+        packer.packMapHeader(2);
+        packer.packString("zero");
+        packer.packInt(0);
+        packer.packString("one");
+        packer.packFloat(1.0f);
+        packer.close();
+
+        JsonParser parser = messagePackFactory.createParser(tempFile);
+        assertTrue(parser instanceof MessagePackParser);
+
+        JsonToken jsonToken = parser.nextToken();
+        assertEquals(JsonToken.START_OBJECT, jsonToken);
+
+        jsonToken = parser.nextToken();
+        assertEquals(JsonToken.FIELD_NAME, jsonToken);
+        assertEquals("zero", parser.getCurrentName());
+
+        jsonToken = parser.nextToken();
+        assertEquals(JsonToken.VALUE_NUMBER_INT, jsonToken);
+        assertEquals(0, parser.getIntValue());
+
+        jsonToken = parser.nextToken();
+        assertEquals(JsonToken.FIELD_NAME, jsonToken);
+        assertEquals("one", parser.getCurrentName());
+
+        jsonToken = parser.nextToken();
+        assertEquals(JsonToken.VALUE_NUMBER_FLOAT, jsonToken);
+        assertEquals(1.0f, parser.getIntValue(), 0.001f);
+
+        jsonToken = parser.nextToken();
+        assertEquals(JsonToken.END_OBJECT, jsonToken);
+
+        try {
+            parser.nextToken();
+            assertTrue(false);
+        }
+        catch (EOFException e) {
+            // Expected
+        }
+        parser.close();
+        parser.close(); // Intentional
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,7 @@ else if (rootStackItem instanceof StackItemForArray) {`
`327`	`327`	`else {`
`328`	`328`	`throw new IllegalStateException("Unexpected rootStackItem: " + rootStackItem);`
`329`	`329`	`}`
	`330`	`+ rootStackItem = null;`
`330`	`331`	`MessagePacker messagePacker = getMessagePacker();`
`331`	`332`	`messagePacker.flush();`
`332`	`333`	`}`