#307 - Add back support for JsonValueAdapter and JsonReadOptions into 4.x

This commit is contained in:
rbygrave committed 2015-06-21 01:46:23 +12:00
1 parent f0b8270e5e
commit 721a50219d
15 files changed
+407 -47

No files matched your search

@@ -17,10 +17,10 @@ import com.avaje.ebeaninternal.server.properties.BeanPropertyGetter;
import com.avaje.ebeaninternal.server.properties.BeanPropertySetter;
import com.avaje.ebeaninternal.server.query.SqlBeanLoad;
import com.avaje.ebeaninternal.server.query.SqlJoinType;
import com.avaje.ebeaninternal.server.text.json.ReadJson;
import com.avaje.ebeaninternal.server.text.json.WriteJson;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.type.ScalarType;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import javax.persistence.PersistenceException;
@@ -1076,7 +1076,7 @@ public class BeanProperty implements ElPropertyValue {
}
}
public void jsonRead(JsonParser ctx, EntityBean bean) throws IOException {
public void jsonRead(ReadJson ctx, EntityBean bean) throws IOException {
if (!jsonDeserialize) {
return;
}
@@ -1086,7 +1086,7 @@ public class BeanProperty implements ElPropertyValue {
setValue(bean, null);
} else {
// expect to read non-null json value
Object objValue = scalarType.jsonRead(ctx, event);
Object objValue = scalarType.jsonRead(ctx.getParser(), event);
setValue(bean, objValue);
}
}