fixed Value API

msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java

@@ -625,9 +625,10 @@ public Variable unpackValue(Variable var) throws IOException {
                 int size = unpackArrayHeader();
                 List<Value> list = new ArrayList<Value>(size);
                 for (int i=0; i < size; i++) {
-                    Variable e = new Variable();
-                    unpackValue(e);
-                    list.add(e);
+                    //Variable e = new Variable();
+                    //unpackValue(e);
+                    //list.add(e);
+                    list.add(unpackValue());
                 }
                 var.setArrayValue(list);
                 return var;
@@ -636,10 +637,12 @@ public Variable unpackValue(Variable var) throws IOException {
                 int size = unpackMapHeader();
                 Map<Value,Value> map = new HashMap<Value,Value>();
                 for (int i=0; i < size; i++) {
-                    Variable k = new Variable();
-                    unpackValue(k);
-                    Variable v = new Variable();
-                    unpackValue(v);
+                    //Variable k = new Variable();
+                    //unpackValue(k);
+                    //Variable v = new Variable();
+                    //unpackValue(v);
+                    Value k = unpackValue();
+                    Value v = unpackValue();
                     map.put(k, v);
                 }
                 var.setMapValue(map);

msgpack-core/src/main/java/org/msgpack/value/Variable.java

@@ -37,8 +37,7 @@
 import java.nio.charset.CharacterCodingException;
 
 
-public class Variable implements Value
-{
+public class Variable implements Value {
     private abstract class AbstractValueAccessor implements Value {
         @Override
         public boolean isNilValue() {
@@ -189,15 +188,15 @@ public ValueType getValueType() {
         }
     }
 
-    final NilValueAccessor nilAccessor = new NilValueAccessor();
-    final BooleanValueAccessor booleanAccessor = new BooleanValueAccessor();
-    final IntegerValueAccessor integerAccessor = new IntegerValueAccessor();
-    final FloatValueAccessor floatAccessor = new FloatValueAccessor();
-    final BinaryValueAccessor binaryAccessor = new BinaryValueAccessor();
-    final StringValueAccessor stringAccessor = new StringValueAccessor();
-    final ArrayValueAccessor arrayAccessor = new ArrayValueAccessor();
-    final MapValueAccessor mapAccessor = new MapValueAccessor();
-    final ExtendedValueAccessor extendedAccessor = new ExtendedValueAccessor();
+    private final NilValueAccessor nilAccessor = new NilValueAccessor();
+    private final BooleanValueAccessor booleanAccessor = new BooleanValueAccessor();
+    private final IntegerValueAccessor integerAccessor = new IntegerValueAccessor();
+    private final FloatValueAccessor floatAccessor = new FloatValueAccessor();
+    private final BinaryValueAccessor binaryAccessor = new BinaryValueAccessor();
+    private final StringValueAccessor stringAccessor = new StringValueAccessor();
+    private final ArrayValueAccessor arrayAccessor = new ArrayValueAccessor();
+    private final MapValueAccessor mapAccessor = new MapValueAccessor();
+    private final ExtendedValueAccessor extendedAccessor = new ExtendedValueAccessor();
 
     private Type type;
 

msgpack-core/src/main/java/org/msgpack/value/impl/AbstractImmutableRawValue.java

@@ -73,6 +73,9 @@ public String getString() {
 
     @Override
     public String stringValue() {
+        if (decodedStringCache == null) {
+            decodeString();
+        }
         return decodedStringCache;
     }
 

msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java

@@ -178,7 +178,6 @@ public JsonToken nextToken() throws IOException, JsonParseException {
                     nextToken = JsonToken.FIELD_NAME;
                 }
                 else {
-                    nextToken = JsonToken.VALUE_STRING;
                     nextToken = JsonToken.VALUE_EMBEDDED_OBJECT;
                 }
                 break;