github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

JSON Refactor - move EJson into text.json package

Browse Source
This commit is contained in:
Rob Bygrave
2014-11-12 22:56:42 +13:00
parent e649a70509
commit 00f85a42f8
8 changed files with 211 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java
+2 -2
View File
@@ -8,7 +8,7 @@ import java.util.Map;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.config.ScalarTypeConverter;
import com.avaje.ebean.json.EJson;
import com.avaje.ebean.text.json.EJson;
import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyCompound;
import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
@@ -198,7 +198,7 @@ public class BeanPropertyCompound extends BeanProperty {
return;
}
Object value = EJson.parsePartial(ctx);
Object value = EJson.parse(ctx);
if (value == null) {
setValue(bean, null);
} else {
src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.avaje.ebeaninternal.server.text.json;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.json.EJson;
import com.avaje.ebean.text.json.EJson;
import com.avaje.ebean.text.PathProperties;
import com.avaje.ebean.text.json.JsonContext;
import com.avaje.ebean.text.json.JsonWriteOptions;
src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+1 -1
View File
@@ -7,7 +7,7 @@ import java.sql.SQLException;
import java.util.Map;
import com.avaje.ebean.config.dbplatform.PostgresPlatform;
import com.avaje.ebean.json.EJson;
import com.avaje.ebean.text.json.EJson;
import com.avaje.ebean.text.TextException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;