github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-24 15:55:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

JSON refactor - tidy up

Browse Source
This commit is contained in:
Rob Bygrave
2014-11-12 22:10:28 +13:00
parent 221272328c
commit eaee3a9c02
31 changed files with 935 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebean/Ebean.java
+1
View File
@@ -1391,6 +1391,7 @@ public final class Ebean {
/**
* Return the JsonContext for reading/writing JSON.
* @deprecated Please use #json instead.
*/
public static JsonContext createJsonContext() {
return json();
src/main/java/com/avaje/ebean/EbeanServer.java
+1
View File
@@ -1120,6 +1120,7 @@ public interface EbeanServer {
/**
* Return the JsonContext for reading/writing JSON.
* @deprecated Please use #json instead.
*/
public JsonContext createJsonContext();
src/main/java/com/avaje/ebean/text/TextException.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.avaje.ebean.text;
/**
* An exception occured typically in processing CSV, JSON or XML.
* An exception occurred typically in processing CSV, JSON or XML.
*
* @author rbygrave
*/
src/main/java/com/avaje/ebean/text/json/JsonContext.java
+8 -10
View File
@@ -11,8 +11,6 @@ import com.fasterxml.jackson.core.JsonParser;
/**
* Converts objects to and from JSON format.
*
* @author rbygrave
*/
public interface JsonContext {
@@ -53,39 +51,39 @@ public interface JsonContext {
* Write the bean or collection in JSON format to the writer with default
* options.
*
* @param o
* @param value
* the bean or collection of beans to write
* @param writer
* used to write the json output to
*/
public void toJsonWriter(Object o, Writer writer) throws IOException;
public void toJson(Object value, Writer writer) throws IOException;
/**
* With additional options to specify JsonValueAdapter and
* JsonWriteBeanVisitor's.
*
* @param o
* @param value
* the bean or collection of beans to write
* @param writer
* used to write the json output to
* @param options
* additional options to control the JSON output
*/
public void toJsonWriter(Object o, Writer writer, JsonWriteOptions options) throws IOException;
public void toJson(Object value, Writer writer, JsonWriteOptions options) throws IOException;
/**
* Convert a bean or collection to json string using default options.
*/
public String toJsonString(Object o) throws IOException;
public String toJson(Object value) throws IOException;
/**
* Convert a bean or collection to json string.
*/
public String toJsonString(Object o, JsonWriteOptions options) throws IOException;
public String toJson(Object value, JsonWriteOptions options) throws IOException;
/**
* Return true if the type is known as an Entity or Xml type or a List Set or
* Map of known bean types.
* Return true if the type is known as an Entity bean or a List Set or
* Map of entity beans.
*/
public boolean isSupportedType(Type genericType);
src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java
+2 -139
View File
@@ -1,72 +1,23 @@
package com.avaje.ebean.text.json;
import java.util.LinkedHashSet;
import java.util.Set;
import com.avaje.ebean.text.PathProperties;
/**
* Provides options for customising the JSON write process.
* <p>
* You can optionally provide a custom JsonValueAdapter to handle specific
* formatting for Date and DateTime types.
* </p>
* <p>
* You can optionally register JsonWriteBeanVisitors to customise the processing
* of the beans as they are processed and <strong>add raw JSON
* elements</strong>.
* </p>
* <p>
* You can explicitly state which properties to include in the JSON output for
* the root level and each path.
* </p>
*
* <pre class="code">
* // find some customers ...
*
* List&lt;Customer&gt; list = Ebean.find(Customer.class).select(&quot;id, name, status, shippingAddress&quot;)
* .fetch(&quot;billingAddress&quot;,
* &quot;line1, city&quot;).fetch(&quot;billingAddress.country&quot;, &quot;*&quot;).fetch(&quot;contacts&quot;, &quot;firstName,email&quot;)
* .order().desc(&quot;id&quot;)
* .findList();
*
* JsonContext json = Ebean.createJsonContext();
*
* JsonWriteOptions writeOptions = new JsonWriteOptions();
* writeOptions.setRootPathVisitor(new JsonWriteBeanVisitor&lt;Customer&gt;() {
*
* public void visit(Customer bean, JsonWriter ctx) {
* System.out.println(&quot;write visit customer: &quot; + bean);
* ctx.appendKeyValue(&quot;dummyCust&quot;, &quot;34&quot;);
* ctx.appendKeyValue(&quot;smallCustObject&quot;, &quot;{\&quot;a\&quot;:34,\&quot;b\&quot;:\&quot;asdasdasd\&quot;}&quot;);
* }
* });
*
* writeOptions.setPathProperties(&quot;contacts&quot;, &quot;firstName,id&quot;);
* writeOptions.setPathVisitor(&quot;contacts&quot;, new JsonWriteBeanVisitor&lt;Contact&gt;() {
*
* public void visit(Contact bean, JsonWriter ctx) {
* System.out.println(&quot;write additional custom json on customer: &quot; + bean);
* ctx.appendKeyValue(&quot;dummy&quot;, &quot; 3400&quot; + bean.getId() + &quot;&quot;);
* ctx.appendKeyValue(&quot;smallObject&quot;, &quot;{\&quot;contactA\&quot;:34,\&quot;contactB\&quot;:\&quot;banana\&quot;}&quot;);
* }
*
* });
*
* // output as a JSON string with pretty formatting
* String s = json.toJsonString(list, true, writeOptions);
* String s = json.toJson(list, true, writeOptions);
*
* </pre>
*
* @see JsonContext#toList(Class, String, JsonReadOptions)
*
* @author rbygrave
*
*/
public class JsonWriteOptions {
protected String callback;
protected PathProperties pathProperties;
/**
@@ -82,94 +33,6 @@ public class JsonWriteOptions {
return o;
}
/**
* This creates and returns a copy of these options.
* <p>
* Note that it assumes that the JsonWriteBeanVisitor (if defined) are
* immutable and any JsonWriteBeanVisitor instances are shared between the
* original and the copy.
* </p>
*/
public JsonWriteOptions copy() {
JsonWriteOptions copy = new JsonWriteOptions();
copy.callback = callback;
copy.pathProperties = pathProperties;
return copy;
}
/**
* Return a JSONP callback function.
*/
public String getCallback() {
return callback;
}
/**
* Set a JSONP callback function.
*/
public JsonWriteOptions setCallback(String callback) {
this.callback = callback;
return this;
}
/**
* Set the properties to include in the JSON output for the given path.
*
* @param propertiesToInclude
* The set of properties to output
*/
public JsonWriteOptions setPathProperties(String path, Set<String> propertiesToInclude) {
if (pathProperties == null) {
pathProperties = new PathProperties();
}
pathProperties.put(path, propertiesToInclude);
return this;
}
/**
* Set the properties to include in the JSON output for the given path.
*
* @param propertiesToInclude
* Comma delimited list of properties to output
*/
public JsonWriteOptions setPathProperties(String path, String propertiesToInclude) {
return setPathProperties(path, parseProps(propertiesToInclude));
}
/**
* Set the properties to include in the JSON output for the root level.
*
* @param propertiesToInclude
* Comma delimited list of properties to output
*/
public JsonWriteOptions setRootPathProperties(String propertiesToInclude) {
return setPathProperties(null, parseProps(propertiesToInclude));
}
/**
* Set the properties to include in the JSON output for the root level.
*
* @param propertiesToInclude
* The set of properties to output
*/
public JsonWriteOptions setRootPathProperties(Set<String> propertiesToInclude) {
return setPathProperties(null, propertiesToInclude);
}
private Set<String> parseProps(String propertiesToInclude) {
LinkedHashSet<String> props = new LinkedHashSet<String>();
String[] split = propertiesToInclude.split(",");
for (int i = 0; i < split.length; i++) {
String s = split[i].trim();
if (s.length() > 0) {
props.add(s);
}
}
return props;
}
/**
* Set the Map of properties to include by path.
*/
src/main/java/com/avaje/ebean/text/json/package-info.java
+4 -25
View File
@@ -19,31 +19,10 @@
* .order().desc(&quot;id&quot;)
* .findList();
*
* JsonContext json = Ebean.createJsonContext();
*
* JsonWriteOptions writeOptions = new JsonWriteOptions();
* writeOptions.setRootPathVisitor(new JsonWriteBeanVisitor&lt;Customer&gt;() {
*
* public void visit(Customer bean, JsonWriter ctx) {
* System.out.println(&quot;write visit customer: &quot; + bean);
* ctx.appendKeyValue(&quot;dummyCust&quot;, &quot;34&quot;);
* ctx.appendKeyValue(&quot;smallCustObject&quot;, &quot;{\&quot;a\&quot;:34,\&quot;b\&quot;:\&quot;asdasdasd\&quot;}&quot;);
* }
* });
*
* writeOptions.setPathProperties(&quot;contacts&quot;, &quot;firstName,id&quot;);
* writeOptions.setPathVisitor(&quot;contacts&quot;, new JsonWriteBeanVisitor&lt;Contact&gt;() {
*
* public void visit(Contact bean, JsonWriter ctx) {
* System.out.println(&quot;write additional custom json on customer: &quot; + bean);
* ctx.appendKeyValue(&quot;dummy&quot;, &quot; 3400&quot; + bean.getId() + &quot;&quot;);
* ctx.appendKeyValue(&quot;smallObject&quot;, &quot;{\&quot;contactA\&quot;:34,\&quot;contactB\&quot;:\&quot;banana\&quot;}&quot;);
* }
*
* });
*
* // output as a JSON string with pretty formatting
* String s = json.toJsonString(list, true, writeOptions);
* JsonContext json = Ebean.json();
*
* // output as a JSON string
* String jsonOutput = json.toJson(list);
*
* </pre>
*/
src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+6 -6
View File
@@ -1,14 +1,14 @@
package com.avaje.ebeaninternal.server.deploy;
import java.io.IOException;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.text.TextException;
import com.avaje.ebeaninternal.server.text.json.WriteJson;
import com.avaje.ebeaninternal.server.text.json.WriteJson.WriteBean;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import java.io.IOException;
public class BeanDescriptorJsonHelp<T> {
private final BeanDescriptor<T> desc;
@@ -56,7 +56,7 @@ public class BeanDescriptorJsonHelp<T> {
return null;
}
if (JsonToken.START_OBJECT != token) {
throw new IOException("Unexpected token "+token+" - expecting start_object at: "+parser.getCurrentLocation());
throw new JsonParseException("Unexpected token "+token+" - expecting start_object", parser.getCurrentLocation());
}
if (desc.inheritInfo == null) {
@@ -69,7 +69,7 @@ public class BeanDescriptorJsonHelp<T> {
token = parser.nextToken();
if (token != JsonToken.FIELD_NAME) {
String msg = "Error reading inheritance discriminator - expected [" + discColumn + "] but no json key?";
throw new TextException(msg);
throw new JsonParseException(msg, parser.getCurrentLocation());
}
String propName = parser.getCurrentName();
@@ -82,7 +82,7 @@ public class BeanDescriptorJsonHelp<T> {
return jsonReadProperties(parser, bean);
}
String msg = "Error reading inheritance discriminator, expected property ["+discColumn+"] but got [" + propName + "] ?";
throw new TextException(msg);
throw new JsonParseException(msg, parser.getCurrentLocation());
}
String discValue = parser.nextTextValue();
src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+657 -690
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java
+42 -61
View File
@@ -1,23 +1,8 @@
package com.avaje.ebeaninternal.server.text.json;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.json.EJson;
import com.avaje.ebean.text.PathProperties;
import com.avaje.ebean.text.TextException;
import com.avaje.ebean.text.json.JsonContext;
import com.avaje.ebean.text.json.JsonWriteOptions;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
@@ -25,16 +10,15 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
import com.avaje.ebeaninternal.util.ParamTypeHelper;
import com.avaje.ebeaninternal.util.ParamTypeHelper.ManyType;
import com.avaje.ebeaninternal.util.ParamTypeHelper.TypeInfo;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.*;
import java.io.*;
import java.lang.reflect.Type;
import java.util.*;
import java.util.Map.Entry;
/**
* Default implementation of JsonContext.
*
* @author rbygrave
*/
public class DJsonContext implements JsonContext {
@@ -69,7 +53,7 @@ public class DJsonContext implements JsonContext {
private <T> T toBean(Class<T> cls, JsonParser parser) throws IOException {
BeanDescriptor<T> d = getDecriptor(cls);
BeanDescriptor<T> d = getDescriptor(cls);
return d.jsonRead(parser, null);
}
@@ -84,30 +68,25 @@ public class DJsonContext implements JsonContext {
private <T> List<T> toList(Class<T> cls, JsonParser src) throws IOException {
try {
BeanDescriptor<T> d = getDecriptor(cls);
BeanDescriptor<T> d = getDescriptor(cls);
List<T> list = new ArrayList<T>();
List<T> list = new ArrayList<T>();
JsonToken event = src.nextToken();
if (event != JsonToken.START_ARRAY) {
throw new JsonParseException("Expecting start_array event but got " + event ,src.getCurrentLocation());
}
do {
T bean = d.jsonRead(src, null);
if (bean == null) {
break;
} else {
list.add(bean);
}
} while (true);
return list;
} catch (RuntimeException e) {
throw new TextException("Error parsing " + src, e);
JsonToken event = src.nextToken();
if (event != JsonToken.START_ARRAY) {
throw new JsonParseException("Expecting start_array event but got " + event ,src.getCurrentLocation());
}
do {
T bean = d.jsonRead(src, null);
if (bean == null) {
break;
} else {
list.add(bean);
}
} while (true);
return list;
}
public Object toObject(Type genericType, String json) throws IOException {
@@ -122,7 +101,7 @@ public class DJsonContext implements JsonContext {
return toList(info.getBeanType(), json);
default:
throw new TextException("Type " + manyType + " not supported");
throw new IOException("Type " + manyType + " not supported");
}
}
@@ -138,26 +117,30 @@ public class DJsonContext implements JsonContext {
return toList(info.getBeanType(), json);
default:
throw new TextException("Type " + manyType + " not supported");
throw new IOException("Type " + manyType + " not supported");
}
}
public void toJsonWriter(Object o, Writer writer) throws IOException {
toJsonWriter(o, writer, null);
public void toJson(Object o, Writer writer) throws IOException {
toJson(o, writer, null);
}
public void toJsonWriter(Object o, Writer writer, JsonWriteOptions options) throws IOException {
public void toJson(Object o, Writer writer, JsonWriteOptions options) throws IOException {
JsonGenerator generator = createGenerator(writer);
toJsonInternal(o, generator, options);
generator.close();
}
public String toJsonString(Object o) throws IOException {
public String toJson(Object o) throws IOException {
return toJsonString(o, null);
}
public String toJsonString(Object o, JsonWriteOptions options) throws IOException {
public String toJson(Object o, JsonWriteOptions options) throws IOException {
return toJsonString(o, options);
}
private String toJsonString(Object o, JsonWriteOptions options) throws IOException {
StringWriter writer = new StringWriter(500);
JsonGenerator gen = createGenerator(writer);
toJsonInternal(o, gen, options);
@@ -173,7 +156,7 @@ public class DJsonContext implements JsonContext {
} else if (o instanceof Number) {
gen.writeNumber(((Number) o).doubleValue());
} else if (o instanceof Boolean) {
gen.writeBoolean(((Boolean) o).booleanValue());
gen.writeBoolean((Boolean) o);
} else if (o instanceof String) {
gen.writeString((String) o);
@@ -186,7 +169,7 @@ public class DJsonContext implements JsonContext {
toJsonFromCollection((Collection<?>) o, null, gen, options);
} else if (o instanceof EntityBean) {
BeanDescriptor<?> d = getDecriptor(o.getClass());
BeanDescriptor<?> d = getDescriptor(o.getClass());
WriteJson writeJson = createWriteJson(gen, options);
d.jsonWrite(writeJson, (EntityBean)o, null);
}
@@ -197,7 +180,7 @@ public class DJsonContext implements JsonContext {
return new WriteJson(server, gen, pathProps);
}
private <T> void toJsonFromCollection(Collection<T> c, String key, JsonGenerator gen, JsonWriteOptions options) throws IOException {
private <T> void toJsonFromCollection(Collection<T> collection, String key, JsonGenerator gen, JsonWriteOptions options) throws IOException {
if (key != null) {
gen.writeFieldName(key);
@@ -206,11 +189,9 @@ public class DJsonContext implements JsonContext {
WriteJson writeJson = createWriteJson(gen, options);
Iterator<T> it = c.iterator();
while (it.hasNext()) {
T t = it.next();
BeanDescriptor<?> d = getDecriptor(t.getClass());
d.jsonWrite(writeJson, (EntityBean)t, null);
for (T bean : collection) {
BeanDescriptor<?> d = getDescriptor(bean.getClass());
d.jsonWrite(writeJson, (EntityBean) bean, null);
}
gen.writeEndArray();
}
@@ -234,7 +215,7 @@ public class DJsonContext implements JsonContext {
toJsonFromCollection((Collection<?>) value, key, gen, options);
} else if (value instanceof EntityBean) {
BeanDescriptor<?> d = getDecriptor(value.getClass());
BeanDescriptor<?> d = getDescriptor(value.getClass());
d.jsonWrite(writeJson,(EntityBean) value, key);
} else {
@@ -245,7 +226,7 @@ public class DJsonContext implements JsonContext {
gen.writeEndObject();
}
private <T> BeanDescriptor<T> getDecriptor(Class<T> cls) {
private <T> BeanDescriptor<T> getDescriptor(Class<T> cls) {
BeanDescriptor<T> d = server.getBeanDescriptor(cls);
if (d == null) {
throw new RuntimeException("No BeanDescriptor found for " + cls);
src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java
+10 -28
View File
@@ -1,10 +1,5 @@
package com.avaje.ebeaninternal.server.text.json;
import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.text.PathProperties;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
@@ -13,6 +8,10 @@ import com.avaje.ebeaninternal.server.deploy.BeanProperty;
import com.avaje.ebeaninternal.server.util.ArrayStack;
import com.fasterxml.jackson.core.JsonGenerator;
import java.io.IOException;
import java.util.Collection;
import java.util.Set;
public class WriteJson {
private final SpiEbeanServer server;
@@ -36,11 +35,7 @@ public class WriteJson {
}
public boolean isParentBean(Object bean) {
if (parentBeans.isEmpty()) {
return false;
} else {
return parentBeans.contains(bean);
}
return !parentBeans.isEmpty() && parentBeans.contains(bean);
}
public void pushParentBeanMany(Object parentBean) {
@@ -61,15 +56,6 @@ public class WriteJson {
pathStack.pop();
}
public Set<String> getIncludeProperties() {
if (pathProperties == null) {
return null;
} else {
return pathProperties.get(pathStack.peekWithNull());
}
}
public WriteBean createWriteBean(BeanDescriptor<?> desc, EntityBean bean) {
if (pathProperties == null) {
@@ -135,7 +121,6 @@ public class WriteJson {
// render all the properties and invoke lazy loading if required
BeanProperty[] props = desc.propertiesNonTransient();
for (int j = 0; j < props.length; j++) {
System.out.println("bean "+ currentBean+" prop:"+props[j]);
if (isIncludeProperty(props[j])) {
props[j].jsonWrite(writeJson, currentBean);
}
@@ -163,20 +148,17 @@ public class WriteJson {
beginAssocMany(name);
Iterator<?> it = c.iterator();
while (it.hasNext()) {
EntityBean o = (EntityBean) it.next();
BeanDescriptor<?> d = getDecriptor(o.getClass());
d.jsonWrite(this, o, null);
for (Object bean : c) {
BeanDescriptor<?> d = getDescriptor(bean.getClass());
d.jsonWrite(this, (EntityBean)bean, null);
}
endAssocMany();
}
private <T> BeanDescriptor<T> getDecriptor(Class<T> cls) {
private <T> BeanDescriptor<T> getDescriptor(Class<T> cls) {
BeanDescriptor<T> d = server.getBeanDescriptor(cls);
if (d == null) {
String msg = "No BeanDescriptor found for " + cls;
throw new RuntimeException(msg);
throw new RuntimeException("No BeanDescriptor found for " + cls);
}
return d;
}
src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java
+4 -4
View File
@@ -42,13 +42,13 @@ public class ScalarTypeByte extends ScalarTypeBase<Byte> {
}
@Override
public void jsonWrite(JsonGenerator ctx, String name, Object value) {
throw new TextException("Not supported");
public void jsonWrite(JsonGenerator ctx, String name, Object value) throws IOException {
throw new IOException("Not supported");
}
@Override
public Object jsonRead(JsonParser ctx, JsonToken event) {
throw new TextException("Not supported");
public Object jsonRead(JsonParser ctx, JsonToken event) throws IOException {
throw new IOException("Not supported");
}
public String formatValue(Byte t) {
src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java
+38 -1
View File
@@ -6,6 +6,8 @@ import org.junit.Test;
import com.avaje.ebean.text.PathProperties;
import com.avaje.ebean.text.json.JsonWriteOptions;
import java.util.Set;
public class JsonWriteOptionsTests {
@Test
@@ -19,6 +21,41 @@ public class JsonWriteOptionsTests {
Assert.assertTrue(pathProps.get(null).contains("name"));
Assert.assertTrue(pathProps.get(null).contains("status"));
Assert.assertFalse(pathProps.get(null).contains("foo"));
}
@Test
public void test_with_depth() {
JsonWriteOptions options = JsonWriteOptions.parsePath("id,status,name,customer(id,name,address(street,city)),orders(qty,product(sku,prodName))");
PathProperties pathProps = options.getPathProperties();
Assert.assertEquals(5, pathProps.getPaths().size());
Assert.assertTrue(pathProps.get(null).contains("id"));
Assert.assertTrue(pathProps.get(null).contains("name"));
Assert.assertTrue(pathProps.get(null).contains("status"));
Assert.assertTrue(pathProps.get(null).contains("customer"));
Assert.assertTrue(pathProps.get(null).contains("orders"));
Assert.assertFalse(pathProps.get(null).contains("foo"));
Set<String> customer = pathProps.get("customer");
Assert.assertTrue(customer.contains("id"));
Assert.assertTrue(customer.contains("name"));
Assert.assertTrue(customer.contains("address"));
Set<String> address = pathProps.get("customer.address");
Assert.assertTrue(address.contains("street"));
Assert.assertTrue(address.contains("city"));
Set<String> orders = pathProps.get("orders");
Assert.assertTrue(orders.contains("qty"));
Assert.assertTrue(orders.contains("product"));
Set<String> product = pathProps.get("orders.product");
Assert.assertTrue(product.contains("sku"));
Assert.assertTrue(product.contains("prodName"));
}
}
src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java
+57
View File
@@ -0,0 +1,57 @@
package com.avaje.ebeaninternal.server.text.json;
import com.avaje.ebean.text.PathProperties;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import org.junit.Test;
import java.io.IOException;
import java.io.StringWriter;
import static org.junit.Assert.*;
public class WriteJsonTest {
@Test
public void test_push() throws IOException {
JsonFactory jsonFactory = new JsonFactory();
JsonGenerator generator = jsonFactory.createGenerator(new StringWriter());
PathProperties pathProperties = PathProperties.parse("id,status,name,customer(id,name,address(street,city)),orders(qty,product(sku,prodName))");
WriteJson writeJson = new WriteJson(null, generator, pathProperties);
WriteJson.WriteBean rootLevel = writeJson.createWriteBean(null, null);
assertTrue(rootLevel.currentIncludeProps.contains("id"));
assertTrue(rootLevel.currentIncludeProps.contains("status"));
assertTrue(rootLevel.currentIncludeProps.contains("name"));
assertTrue(rootLevel.currentIncludeProps.contains("customer"));
writeJson.beginAssocOne("customer", null);
WriteJson.WriteBean customerLevel = writeJson.createWriteBean(null, null);
assertTrue(customerLevel.currentIncludeProps.contains("id"));
assertTrue(customerLevel.currentIncludeProps.contains("name"));
assertTrue(customerLevel.currentIncludeProps.contains("address"));
writeJson.beginAssocOne("address", null);
WriteJson.WriteBean addressLevel = writeJson.createWriteBean(null, null);
assertTrue(addressLevel.currentIncludeProps.contains("street"));
assertTrue(addressLevel.currentIncludeProps.contains("city"));
writeJson.endAssocOne();
writeJson.endAssocOne();
writeJson.beginAssocMany("orders");
WriteJson.WriteBean orderLevel = writeJson.createWriteBean(null, null);
assertTrue(orderLevel.currentIncludeProps.contains("qty"));
assertTrue(orderLevel.currentIncludeProps.contains("product"));
writeJson.beginAssocOne("product", null);
WriteJson.WriteBean productLevel = writeJson.createWriteBean(null, null);
assertTrue(productLevel.currentIncludeProps.contains("sku"));
assertTrue(productLevel.currentIncludeProps.contains("prodName"));
writeJson.endAssocOne();
writeJson.endAssocMany();
}
}
src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java
+2 -2
View File
@@ -40,8 +40,8 @@ public class TestDPersonEl extends TestCase {
// ElPropertyValue elCmoneyAmt = descriptor.getElGetValue("cmoney.amount");
// ElPropertyValue elCmoneyCur = descriptor.getElGetValue("cmoney.currency");
JsonContext jsonContext = server.createJsonContext();
String json = jsonContext.toJsonString(p);
JsonContext jsonContext = server.json();
String json = jsonContext.toJson(p);
DPerson bean = jsonContext.toBean(DPerson.class, json);
Assert.assertEquals("first", bean.getFirstName());
src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class TestTextJsonSelfRef extends BaseTestCase {
}
// JsonWriteOptions options = JsonWriteOptions.parsePath("(id,name,referredBy(id))");
// String customerContent = Ebean.createJsonContext().toJsonString(customers);//, false, options);
// String customerContent = Ebean.createJsonContext().toJson(customers);//, false, options);
// System.out.println("Customers: " + customerContent);
//
// Assert
src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java
+2 -2
View File
@@ -31,8 +31,8 @@ public class TestJsonBeanWithTimeZone extends BaseTestCase {
bean.setName("foo");
bean.setTimezone(TimeZone.getDefault());
JsonContext jsonContext = Ebean.createJsonContext();
String jsonContent = jsonContext.toJsonString(bean);
JsonContext jsonContext = Ebean.json();
String jsonContent = jsonContext.toJson(bean);
BeanWithTimeZone bean2 = jsonContext.toBean(BeanWithTimeZone.class, jsonContent);
src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java
+6 -6
View File
@@ -24,8 +24,8 @@ public class TestJsonInheritanceDiscriminator extends BaseTestCase {
Ebean.save(cat);
JsonContext json = Ebean.createJsonContext();
String jsonContent = json.toJsonString(cat);
JsonContext json = Ebean.json();
String jsonContent = json.toJson(cat);
Cat cat2 = json.toBean(Cat.class, jsonContent);
@@ -37,9 +37,9 @@ public class TestJsonInheritanceDiscriminator extends BaseTestCase {
Cat cat3 = json.toBean(Cat.class, noDiscriminator);
Assert.assertEquals(cat.getId(), cat3.getId());
Assert.assertEquals(cat.getName(), cat3.getName());
Assert.assertEquals(cat.getVersion(), cat3.getVersion());
Assert.assertEquals(1L, cat3.getId().longValue());
Assert.assertEquals("Gemma", cat3.getName());
Assert.assertEquals(1L, cat3.getVersion().longValue());
Dog dog = new Dog();
dog.setRegistrationNumber("ABC123");
@@ -49,7 +49,7 @@ public class TestJsonInheritanceDiscriminator extends BaseTestCase {
List<Animal> animals = Ebean.find(Animal.class).findList();
String listJson = json.toJsonString(animals);
String listJson = json.toJson(animals);
List<Animal> animals2 = json.toList(Animal.class, listJson);
Assert.assertEquals(animals.size(), animals2.size());
src/test/java/com/avaje/tests/text/json/TestJsonMap.java
+51 -9
View File
@@ -1,8 +1,11 @@
package com.avaje.tests.text.json;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import com.avaje.ebean.Query;
import com.avaje.ebean.text.PathProperties;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
@@ -12,8 +15,29 @@ import com.avaje.ebean.text.json.JsonWriteOptions;
import com.avaje.tests.model.basic.Customer;
import com.avaje.tests.model.basic.ResetBasicData;
import static org.junit.Assert.assertTrue;
public class TestJsonMap extends BaseTestCase {
@Test
public void test_basic() throws IOException {
ResetBasicData.reset();
List<Customer> customers = Ebean.find(Customer.class).findList();
JsonContext jsonContext = Ebean.json();
JsonWriteOptions jsonWriteOptions = JsonWriteOptions.parsePath("(id,status,name)");
String jsonString = jsonContext.toJson(customers, jsonWriteOptions);
assertTrue(jsonString.contains("{\"id\":1,\"status\":\"NEW\",\"name\":\"Rob\"}"));
jsonWriteOptions = JsonWriteOptions.parsePath("status,name");
jsonString = jsonContext.toJson(customers, jsonWriteOptions);
assertTrue(jsonString.contains("{\"status\":\"NEW\",\"name\":\"Rob\"}"));
}
@Test
public void test() throws IOException {
@@ -21,19 +45,15 @@ public class TestJsonMap extends BaseTestCase {
Map<String, Customer> map = Ebean.find(Customer.class).findMap("id", String.class);
JsonContext jsonContext = Ebean.createJsonContext();
JsonWriteOptions jsonWriteOptions = JsonWriteOptions.parsePath("(id,status,name)");
JsonContext jsonContext = Ebean.json();
JsonWriteOptions options = JsonWriteOptions.parsePath("(id,status,name)");
String jsonString = jsonContext.toJsonString(map, jsonWriteOptions);
String jsonString = jsonContext.toJson(map, options);
System.out.println(jsonString);
jsonContext = Ebean.createJsonContext();
jsonWriteOptions = JsonWriteOptions
.parsePath("(id,status,name,shippingAddress(id,line1,city),billingAddress(*),contacts(*))");
// jsonWriteOptions =
// JsonWriteOptions.parsePath("(id,status,billingAddress(*))");
options = JsonWriteOptions.parsePath("(id,status,name,shippingAddress(id,line1,city),billingAddress(*),contacts(*))");
jsonString = jsonContext.toJsonString(map, jsonWriteOptions);
jsonString = jsonContext.toJson(map, options);
System.out.println(jsonString);
// Assert.assertTrue(jsonString.indexOf("{\"1\":") > -1);
@@ -41,4 +61,26 @@ public class TestJsonMap extends BaseTestCase {
// > -1);
}
@Test
public void test_applyPathToQuery() throws IOException {
ResetBasicData.reset();
PathProperties pathProperties = PathProperties.parse("(id,status,name,shippingAddress(id,line1,city),billingAddress(*),contacts(*))");
Query<Customer> customerQuery = Ebean.find(Customer.class);
pathProperties.apply(customerQuery);
List<Customer> customers = customerQuery.findList();
JsonWriteOptions options = JsonWriteOptions.parsePath("(id,status,name)");
String jsonString = Ebean.json().toJson(customers, options);
System.out.println(jsonString);
// Assert.assertTrue(jsonString.indexOf("{\"1\":") > -1);
// Assert.assertTrue(jsonString.indexOf("{\"id\":1,\"status\":\"NEW\",\"name\":\"Rob\"},")
// > -1);
}
}
src/test/java/com/avaje/tests/text/json/TestJsonSimple.java
+2 -2
View File
@@ -49,8 +49,8 @@ public class TestJsonSimple extends BaseTestCase {
m.put("hello", "rob");
m.put("test", "me");
JsonContext jsonContext = Ebean.createJsonContext();
String jsonString = jsonContext.toJsonString(m);
JsonContext jsonContext = Ebean.json();
String jsonString = jsonContext.toJson(m);
System.out.println(jsonString);
String s = "{\"parishId\":\"18\",\"contentId\":null,\"contentStatus\":null,\"contentType\":\"pg-hello\",\"content\":\"asd\"}";
src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java
+2 -2
View File
@@ -21,8 +21,8 @@ public class TestJsonSomeEnumWithToString extends BaseTestCase {
bean.setName("Some name");
bean.setSomeEnum(SomeEnum.ALPHA);
JsonContext json = Ebean.createJsonContext();
String jsonContent = json.toJsonString(bean);
JsonContext json = Ebean.json();
String jsonContent = json.toJson(bean);
SomeEnumBean bean2 = json.toBean(SomeEnumBean.class, jsonContent);
src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java
+2 -2
View File
@@ -27,10 +27,10 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase {
.fetch("contacts", "firstName,email")
.order().desc("id").findList();
JsonContext json = Ebean.createJsonContext();
JsonContext json = Ebean.json();
String s = json.toJsonString(list);
String s = json.toJson(list);
System.out.println(s);
List<Customer> mList = json.toList(Customer.class, s);
src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java
+2 -2
View File
@@ -31,7 +31,7 @@ public class TestTextJsonCompoundType extends BaseTestCase {
//
// JsonContext jsonContext = Ebean.createJsonContext();
//
// String jsonString = jsonContext.toJsonString(p, true);
// String jsonString = jsonContext.toJson(p, true);
// System.out.println(jsonString);
//
// CMoney cm = new CMoney(new Money("12"), NZD);
@@ -43,7 +43,7 @@ public class TestTextJsonCompoundType extends BaseTestCase {
// ep.setOid(new Oid<DExhEntity>(112));
// ep.setExhange(exh);
//
// String jsonString0 = jsonContext.toJsonString(ep, true);
// String jsonString0 = jsonContext.toJson(ep, true);
// System.out.println(jsonString0);
//
// DExhEntity bean0 = jsonContext.toBean(DExhEntity.class, jsonString0);
src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java
+2 -2
View File
@@ -26,8 +26,8 @@ public class TestTextJsonInheritance extends BaseTestCase {
Assert.assertEquals(2, list.size());
JsonContext jsonContext = Ebean.createJsonContext();
String jsonString = jsonContext.toJsonString(list);
JsonContext jsonContext = Ebean.json();
String jsonString = jsonContext.toJson(list);
System.out.println(jsonString);
List<Vehicle> rebuiltList = jsonContext.toList(Vehicle.class, jsonString);
src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java
+2 -2
View File
@@ -20,14 +20,14 @@ public class TestTextJsonInsertUpdate extends BaseTestCase {
String json0 = "{\"name\":\"InsJson\",\"status\":\"NEW\"}";
JsonContext jsonContext = Ebean.createJsonContext();
JsonContext jsonContext = Ebean.json();
// insert
Customer c0 = jsonContext.toBean(Customer.class, json0);
Ebean.save(c0);
// update with optimistic concurrency checking
String j0 = jsonContext.toJsonString(c0);
String j0 = jsonContext.toJson(c0);
String j1 = StringHelper.replaceString(j0, "InsJson", "Mod1");
Customer c1 = jsonContext.toBean(Customer.class, j1);
Ebean.update(c1);
src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java
+3 -4
View File
@@ -21,11 +21,10 @@ public class TestTextJsonInvokeLazy extends BaseTestCase {
List<Customer> list = Ebean.find(Customer.class).select("name").findList();
JsonWriteOptions opt = new JsonWriteOptions();
opt.setRootPathProperties("name, status");
JsonWriteOptions opt = JsonWriteOptions.parsePath("name, status");
JsonContext jsonContext = Ebean.createJsonContext();
String jsonString = jsonContext.toJsonString(list, opt);
JsonContext jsonContext = Ebean.json();
String jsonString = jsonContext.toJson(list, opt);
System.out.println(jsonString);
src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java
+6 -6
View File
@@ -24,7 +24,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase {
List<Customer> list = Ebean.find(Customer.class).select("id, status, shippingAddress").order()
.desc("id").findList();
JsonContext json = Ebean.createJsonContext();
JsonContext json = Ebean.json();
// test that lazy loading on
PathProperties pp = PathProperties.parse("(id,name,contacts(firstName))");
@@ -32,7 +32,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase {
o.setPathProperties(pp);
System.out.println("Expect lazy loading of Customer beans and customer contacts");
String s = json.toJsonString(list, o);
String s = json.toJson(list, o);
System.out.println(s);
Assert.assertTrue(s.contains("\"contacts\""));
Assert.assertTrue(s.contains("\"name\""));
@@ -47,7 +47,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase {
List<Customer> list = Ebean.find(Customer.class).select("id, status, shippingAddress")
.fetch("contacts").order().desc("id").findList();
JsonContext json = Ebean.createJsonContext();
JsonContext json = Ebean.json();
// test that lazy loading on
PathProperties pp = PathProperties.parse("(id,name,contacts(firstName))");
@@ -55,7 +55,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase {
o.setPathProperties(pp);
System.out.println("expecting lazy load of Customer beans to fetch customer name");
String s = json.toJsonString(list, o);
String s = json.toJson(list, o);
System.out.println(s);
Assert.assertTrue(s.contains("\"contacts\""));
Assert.assertTrue(s.contains("\"name\""));
@@ -71,7 +71,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase {
// .fetch("contacts")
.order().desc("id").findList();
JsonContext json = Ebean.createJsonContext();
JsonContext json = Ebean.json();
// test that lazy loading on
PathProperties pp = PathProperties.parse("(id,name,contacts(firstName))");
@@ -79,7 +79,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase {
o.setPathProperties(pp);
System.out.println("expecting lazy load of Customer contacts ");
String s = json.toJsonString(list, o);
String s = json.toJson(list, o);
System.out.println(s);
Assert.assertTrue(s.contains("\"contacts\""));
Assert.assertTrue(s.contains("\"name\""));
src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java
+4 -5
View File
@@ -28,7 +28,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null);
JsonContext jsonContext = Ebean.createJsonContext();
JsonContext jsonContext = Ebean.json();
Product product = Ebean.getReference(Product.class, 1);
@@ -38,7 +38,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
} else {
String jsonString = jsonContext.toJsonString(product);
String jsonString = jsonContext.toJson(product);
System.out.println(jsonString);
Product refProd = jsonContext.toBean(Product.class, jsonString);
@@ -68,10 +68,9 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
Order order = orders.get(0);
JsonWriteOptions options = new JsonWriteOptions();
options.setPathProperties("details.product", "id");
JsonWriteOptions options = JsonWriteOptions.parsePath("*,details(id,orderQty,product(id))");
String jsonOrder = jsonContext.toJsonString(order, options);
String jsonOrder = jsonContext.toJson(order, options);
System.out.println(jsonOrder);
Order o2 = jsonContext.toBean(Order.class, jsonOrder);
src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java
+10 -14
View File
@@ -1,17 +1,16 @@
package com.avaje.tests.text.json;
import java.io.IOException;
import java.util.List;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.text.json.JsonContext;
import com.avaje.ebean.text.json.JsonWriteOptions;
import com.avaje.tests.model.basic.Customer;
import com.avaje.tests.model.basic.ResetBasicData;
import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
import java.util.List;
public class TestTextJsonSimple extends BaseTestCase {
@@ -27,16 +26,13 @@ public class TestTextJsonSimple extends BaseTestCase {
EbeanServer server = Ebean.getServer(null);
JsonContext json = server.createJsonContext();
JsonContext json = server.json();
JsonWriteOptions options = new JsonWriteOptions();
options.setRootPathProperties("name, id");
String s = json.toJsonString(list);
System.out.println(s);
String jsonOutput = json.toJson(list);
System.out.println(jsonOutput);
List<Customer> mList = json.toList(Customer.class, s);
System.out.println(mList);
List<Customer> mList = json.toList(Customer.class, jsonOutput);
Assert.assertEquals(list.size(), mList.size());
}
}
src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java
+2 -2
View File
@@ -25,12 +25,12 @@ public class TestTextJsonSuperSimple extends BaseTestCase {
EbeanServer server = Ebean.getServer(null);
JsonContext json = server.createJsonContext();
JsonContext json = server.json();
if (list.size() > 1) {
Customer customer = list.get(0);
String s = json.toJsonString(customer);
String s = json.toJson(customer);
System.out.println(s);
int statusPos = s.indexOf("status");
Assert.assertEquals(-1, statusPos);
src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java
+3 -3
View File
@@ -57,8 +57,8 @@ public class TestTextJsonUpdateCascade extends BaseTestCase {
EbeanServer server = Ebean.getServer(null);
JsonContext jsonContext = server.createJsonContext();
String jsonString = jsonContext.toJsonString(order);
JsonContext jsonContext = server.json();
String jsonString = jsonContext.toJson(order);
System.out.println(jsonString);
Order updOrder = jsonContext.toBean(Order.class, jsonString);
@@ -85,7 +85,7 @@ public class TestTextJsonUpdateCascade extends BaseTestCase {
Ebean.save(u0);
String jsonUser = jsonContext.toJsonString(u0);
String jsonUser = jsonContext.toJson(u0);
System.out.println(jsonUser);
src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java
+2 -2
View File
@@ -30,10 +30,10 @@ public class TestJsonStatelessUpdate extends BaseTestCase {
UUTwo twoX = Ebean.find(UUTwo.class, two.getId());
JsonContext jsonContext = Ebean.createJsonContext();
JsonContext jsonContext = Ebean.json();
JsonWriteOptions writeOptions = JsonWriteOptions.parsePath("(id,name,master(*))");
String jsonString = jsonContext.toJsonString(twoX, writeOptions);
String jsonString = jsonContext.toJson(twoX, writeOptions);
System.out.println(jsonString);
jsonString = jsonString.replace("twoName", "twoNameModified");