json-iterator#97 demonstrate JsonProperty when both field and setter

Author: taowen

src/test/java/com/jsoniter/TestAnnotationJsonProperty.java

@@ -3,6 +3,7 @@
 import com.jsoniter.annotation.JsonMissingProperties;
 import com.jsoniter.annotation.JsonProperty;
 import com.jsoniter.fuzzy.StringIntDecoder;
+import com.jsoniter.output.JsonStream;
 import junit.framework.TestCase;
 
 import java.io.IOException;
@@ -121,4 +122,23 @@ public void test_required() throws IOException {
  TestObject8 entity = JsonIterator.deserialize(test, TestObject8.class);
  assertEquals(200, entity.code2);
  }
+
+ public static class TestObject9 {
+ private String field1 = "hello";
+
+ public String getField1() {
+ return field1;
+ }
+
+ @JsonProperty("field-1")
+ public void setField1(String field1) {
+ this.field1 = field1;
+ }
+ }
+
+ public void test_getter_and_setter() throws IOException {
+ String test ="{\"field-1\":\"hi\"}";
+ TestObject9 entity = JsonIterator.deserialize(test, TestObject9.class);
+ assertEquals("hi", entity.getField1());
+ }
 }

src/test/java/com/jsoniter/output/TestAnnotationJsonProperty.java

@@ -40,7 +40,7 @@ public void test_encoder() throws IOException {
  public static class TestObject3 {
  public String field1 = "hello";
 
- @JsonProperty(to = {"field-1"})
+ @JsonProperty("field-1")
  public String getField1() {
  return field1;
  }
@@ -50,4 +50,22 @@ public void test_getter() throws IOException {
  String output = JsonStream.serialize(new TestObject3());
  assertEquals("{\"field-1\":\"hello\"}", output);
  }
+
+ public static class TestObject4 {
+ private String field1 = "hello";
+
+ @JsonProperty("field-1")
+ public String getField1() {
+ return field1;
+ }
+
+ public void setField1(String field1) {
+ this.field1 = field1;
+ }
+ }
+
+ public void test_getter_and_setter() throws IOException {
+ String output = JsonStream.serialize(new TestObject4());
+ assertEquals("{\"field-1\":\"hello\"}", output);
+ }
 }