fix #132 MaybeEmptyArrayDecoder need to decode the value according to field type

Author: taowen

src/main/java/com/jsoniter/fuzzy/MaybeEmptyArrayDecoder.java

@@ -2,12 +2,19 @@
 
 import com.jsoniter.JsonIterator;
 import com.jsoniter.ValueType;
+import com.jsoniter.spi.Binding;
 import com.jsoniter.spi.Decoder;
 
 import java.io.IOException;
 
 public class MaybeEmptyArrayDecoder implements Decoder {
 
+    private Binding binding;
+
+    public MaybeEmptyArrayDecoder(Binding binding) {
+        this.binding = binding;
+    }
+
     @Override
     public Object decode(JsonIterator iter) throws IOException {
         if (iter.whatIsNext() == ValueType.ARRAY) {
@@ -18,7 +25,7 @@ public Object decode(JsonIterator iter) throws IOException {
                 return null;
             }
         } else {
-            return iter.read(iter);
+            return iter.read(binding.valueTypeLiteral);
         }
     }
 }

src/main/java/com/jsoniter/spi/Config.java

@@ -458,18 +458,30 @@ private void updateBindingWithJsonProperty(Binding binding, JsonProperty jsonPro
         if (jsonProperty.to().length > 0) {
             binding.toNames = jsonProperty.to();
         }
-        if (jsonProperty.decoder() != Decoder.class) {
+        Class decoderClass = jsonProperty.decoder();
+        if (decoderClass != Decoder.class) {
             try {
-                binding.decoder = jsonProperty.decoder().newInstance();
+                try {
+                    Constructor decoderCtor = decoderClass.getConstructor(Binding.class);
+                    binding.decoder = (Decoder) decoderCtor.newInstance(binding);
+                } catch (NoSuchMethodException e) {
+                    binding.decoder = (Decoder) decoderClass.newInstance();
+                }
             } catch (RuntimeException e) {
                 throw e;
             } catch (Exception e) {
                 throw new JsonException(e);
             }
         }
-        if (jsonProperty.encoder() != Encoder.class) {
+        Class encoderClass = jsonProperty.encoder();
+        if (encoderClass != Encoder.class) {
             try {
-                binding.encoder = jsonProperty.encoder().newInstance();
+                try {
+                    Constructor encoderCtor = encoderClass.getConstructor(Binding.class);
+                    binding.encoder = (Encoder) encoderCtor.newInstance(binding);
+                } catch (NoSuchMethodException e) {
+                    binding.encoder = (Encoder) encoderClass.newInstance();
+                }
             } catch (JsonException e) {
                 throw e;
             } catch (Exception e) {

src/test/java/com/jsoniter/TestObject.java

@@ -184,14 +184,20 @@ public void test_enum() throws IOException {
         assertEquals(TestObject5.MyEnum.WOW, obj.field1);
     }
 
+    public static class TestObject6_field1 {
+        public int a;
+    }
+
     public static class TestObject6 {
         @JsonProperty(decoder = MaybeEmptyArrayDecoder.class)
-        public Map<String, Object> field1;
+        public TestObject6_field1 field1;
     }
 
     public void test_maybe_empty_array_field() {
         TestObject6 obj = JsonIterator.deserialize("{\"field1\":[]}", TestObject6.class);
         assertNull(obj.field1);
+        obj = JsonIterator.deserialize("{\"field1\":{\"a\":1}}", TestObject6.class);
+        assertEquals(1, obj.field1.a);
     }
 
     public void test_iterator() {