fix #133 NPE when no extra

Author: taowen

.gitignore

@@ -3,6 +3,6 @@
 /release.properties
 /demo/target
 /.idea
-/build
-/.gradle
-/local.properties
+/android-demo/build
+/android-demo/.gradle
+/android-demo/local.properties

settings.gradle android-demo/settings.gradlesettings.gradle renamed to android-demo/settings.gradle

@@ -347,6 +347,9 @@ private void setToBinding(Object obj, Binding binding, Object value) throws Exce
     }
 
     private void setExtra(Object obj, Map<String, Object> extra) throws Exception {
+        if (extra == null) {
+            return;
+        }
         if (desc.asExtraForUnknownProperties) {
             if (desc.onExtraProperties == null) {
                 for (String fieldName : extra.keySet()) {

src/main/java/com/jsoniter/ReflectionObjectDecoder.java

@@ -87,46 +87,6 @@ public void skip_missing_ctor_arg() throws IOException {
         }
     }
 
-    @JsonObject(asExtraForUnknownProperties = true)
-    public static class TestObject9 {
-        @JsonExtraProperties
-        public Map<String, Any> extraProperties;
-    }
-
-    public void test_extra_properties() throws IOException {
-        JsonIterator iter = JsonIterator.parse("{\"field1\": 100}");
-        TestObject9 obj = iter.read(TestObject9.class);
-        assertEquals(100, obj.extraProperties.get("field1").toInt());
-    }
-
-    @JsonObject(asExtraForUnknownProperties = true)
-    public static class TestObject13 {
-    }
-
-    public void test_unknown_properties() throws IOException {
-        JsonIterator iter = JsonIterator.parse("{\"field-1\": 100, \"field-1\": 101}");
-        try {
-            iter.read(TestObject13.class);
-            fail();
-        } catch (JsonException e) {
-            System.out.println(e);
-        }
-    }
-
-    @JsonObject(unknownPropertiesBlacklist = {"field1"})
-    public static class TestObject15 {
-    }
-
-    public void test_unknown_properties_blacklist() throws IOException {
-        JsonIterator iter = JsonIterator.parse("{\"field1\": 100}");
-        try {
-            iter.read(TestObject15.class);
-            fail();
-        } catch (JsonException e) {
-            System.out.println(e);
-        }
-    }
-
     public static class TestObject17 {
         public int field1;
 

src/test/java/com/jsoniter/TestAnnotation.java

@@ -0,0 +1,64 @@
+package com.jsoniter;
+
+import com.jsoniter.annotation.JsonExtraProperties;
+import com.jsoniter.annotation.JsonObject;
+import com.jsoniter.any.Any;
+import com.jsoniter.spi.JsonException;
+import junit.framework.TestCase;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class TestAnnotationJsonObject extends TestCase {
+
+    @JsonObject(asExtraForUnknownProperties = true)
+    public static class TestObject9 {
+        @JsonExtraProperties
+        public Map<String, Any> extraProperties;
+    }
+
+    public void test_extra_properties() throws IOException {
+        JsonIterator iter = JsonIterator.parse("{\"field1\": 100}");
+        TestObject9 obj = iter.read(TestObject9.class);
+        assertEquals(100, obj.extraProperties.get("field1").toInt());
+    }
+
+    @JsonObject(asExtraForUnknownProperties = true)
+    public static class TestObject13 {
+    }
+
+    public void test_unknown_properties() throws IOException {
+        JsonIterator iter = JsonIterator.parse("{\"field-1\": 100, \"field-1\": 101}");
+        try {
+            iter.read(TestObject13.class);
+            fail();
+        } catch (JsonException e) {
+            System.out.println(e);
+        }
+    }
+
+    @JsonObject(unknownPropertiesBlacklist = {"field1"})
+    public static class TestObject15 {
+    }
+
+    public void test_unknown_properties_blacklist() throws IOException {
+        JsonIterator iter = JsonIterator.parse("{\"field1\": 100}");
+        try {
+            iter.read(TestObject15.class);
+            fail();
+        } catch (JsonException e) {
+            System.out.println(e);
+        }
+    }
+
+    @JsonObject(asExtraForUnknownProperties = true)
+    public static class TestObject14 {
+        public int id;
+    }
+
+    public void test_no_unknown_properties() throws IOException {
+        String json = "{ \"id\": 100 }";
+        TestObject14 obj = JsonIterator.deserialize(json, TestObject14.class);
+        assertEquals(100, obj.id);
+    }
+}

src/test/java/com/jsoniter/TestAnnotationJsonObject.java

@@ -50,6 +50,7 @@
         com.jsoniter.output.TestGson.class,
         TestStreamBuffer.class,
         TestCollection.class,
-        TestList.class})
+        TestList.class,
+        TestAnnotationJsonObject.class})
 public abstract class AllTestCases {
 }