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

#587 - Refactor - Change JsonContext.getScalar() to JsonContext.writeScalar()

Browse Source
This commit is contained in:
Robin Bygrave
2016-03-03 23:38:09 +13:00
parent 290ca6ba90
commit 53dd810b9a
11 changed files with 48 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebean/text/json/JsonContext.java
+3 -2
View File
@@ -4,6 +4,7 @@ import com.avaje.ebean.FetchPath;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.lang.reflect.Type;
@@ -213,13 +214,13 @@ public interface JsonContext {
JsonParser createParser(Reader reader) throws JsonIOException;
/**
* Return a helper that can write scalar types known to Ebean to Jackson.
* Write a scalar types known to Ebean to Jackson.
* <p>
* Ebean has built in support for java8 and Joda types as well as the other
* standard JDK types like URI, URL, UUID etc. This is a fast simple way to
* write any of those types to Jackson.
* </p>
*/
JsonScalar getScalar(JsonGenerator generator);
void writeScalar(JsonGenerator generator, Object scalarValue) throws IOException;
}
src/main/java/com/avaje/ebean/text/json/JsonScalar.java
-15
View File
@@ -1,15 +0,0 @@
package com.avaje.ebean.text.json;
import java.io.IOException;
/**
* Writes any scalar type known to Ebean to the underlying Jackson generator.
*/
public interface JsonScalar {
/**
* Write the scalar type to JSON where the value can be any type known to Ebean
* including Enums, Java8 time types, Joda types, URL, URI etc.
*/
void write(Object value) throws IOException;
}
src/main/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilder.java
+4 -8
View File
@@ -5,7 +5,6 @@ import com.avaje.ebean.event.changelog.BeanChange;
import com.avaje.ebean.event.changelog.ChangeSet;
import com.avaje.ebean.event.changelog.ChangeType;
import com.avaje.ebean.text.json.JsonContext;
import com.avaje.ebean.text.json.JsonScalar;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
@@ -97,10 +96,7 @@ public class ChangeJsonBuilder {
if (bean.getType() != ChangeType.DELETE) {
gen.writeFieldName("values");
gen.writeStartObject();
// use JsonScalar as it knows how to encode all the scalar
// property types that Ebean supports (Java8, Joda etc)
JsonScalar scalarWriter = json.getScalar(gen);
writeValuePairs(bean, scalarWriter, gen);
writeValuePairs(bean, gen);
gen.writeEndObject();
}
}
@@ -111,7 +107,7 @@ public class ChangeJsonBuilder {
* We are intentionally keeping the same new/old structure for both inserts and updates.
* </p>
*/
protected void writeValuePairs(BeanChange bean, JsonScalar scalarWriter, JsonGenerator gen) throws IOException {
protected void writeValuePairs(BeanChange bean, JsonGenerator gen) throws IOException {
for (Map.Entry<String, ValuePair> entry : bean.getValues().entrySet()) {
gen.writeFieldName(entry.getKey());
@@ -120,12 +116,12 @@ public class ChangeJsonBuilder {
Object newValue = value.getNewValue();
if (newValue != null) {
gen.writeFieldName("new");
scalarWriter.write(newValue);
json.writeScalar(gen, newValue);
}
Object oldValue = value.getOldValue();
if (oldValue != null) {
gen.writeFieldName("old");
scalarWriter.write(oldValue);
json.writeScalar(gen, oldValue);
}
gen.writeEndObject();
}
src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java
-1
View File
@@ -1,7 +1,6 @@
package com.avaje.ebeaninternal.server.el;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.text.StringFormatter;
import com.avaje.ebean.text.StringParser;
import com.avaje.ebeaninternal.server.deploy.BeanProperty;
import com.avaje.ebeaninternal.server.lib.util.StringHelper;
src/main/java/com/avaje/ebeaninternal/server/expression/ElasticExpressionContext.java
+19 -13
View File
@@ -3,10 +3,12 @@ package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.OrderBy;
import com.avaje.ebean.plugin.BeanType;
import com.avaje.ebean.plugin.ExpressionPath;
import com.avaje.ebean.text.json.JsonContext;
import com.avaje.ebeaninternal.server.query.SplitName;
import com.fasterxml.jackson.core.JsonGenerator;
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
@@ -30,8 +32,12 @@ public class ElasticExpressionContext {
public static final String EXISTS = "exists";
public static final String FIELD = "field";
private final JsonContext jsonContext;
private final JsonGenerator json;
private final StringWriter writer;
private final BeanType<?> desc;
private String currentNestedPath;
@@ -39,9 +45,11 @@ public class ElasticExpressionContext {
/**
* Construct given the JSON generator and root bean type.
*/
public ElasticExpressionContext(JsonGenerator json, BeanType<?> desc) {
this.json = json;
public ElasticExpressionContext(JsonContext jsonContext, BeanType<?> desc) {
this.jsonContext = jsonContext;
this.desc = desc;
this.writer = new StringWriter(200);
this.json = jsonContext.createGenerator(writer);
}
/**
@@ -54,9 +62,10 @@ public class ElasticExpressionContext {
/**
* Flush the JsonGenerator buffer.
*/
public void flush() throws IOException {
public String flush() throws IOException {
endNested();
json.flush();
return writer.toString();
}
/**
@@ -77,7 +86,7 @@ public class ElasticExpressionContext {
/**
* Start Bool MUST or SHOULD.
*
* <p>
* If conjunction is true then MUST(and) and if false is SHOULD(or).
*/
public void writeBoolStart(boolean conjunction) throws IOException {
@@ -137,7 +146,7 @@ public class ElasticExpressionContext {
json.writeObjectFieldStart(RANGE);
json.writeObjectFieldStart(rawProperty(propertyName));
json.writeFieldName(rangeType);
json.writeObject(value);
jsonContext.writeScalar(json, value);
json.writeEndObject();
json.writeEndObject();
json.writeEndObject();
@@ -148,17 +157,14 @@ public class ElasticExpressionContext {
*/
public void writeRange(String propertyName, Op lowOp, Object valueLow, Op highOp, Object valueHigh) throws IOException {
//Property property = desc.getProperty(propertyName);
//property.
prepareNestedPath(propertyName);
json.writeStartObject();
json.writeObjectFieldStart(RANGE);
json.writeObjectFieldStart(rawProperty(propertyName));
json.writeFieldName(lowOp.docExp());
json.writeObject(valueLow);
jsonContext.writeScalar(json, valueLow);
json.writeFieldName(highOp.docExp());
json.writeObject(valueHigh);
jsonContext.writeScalar(json, valueHigh);
json.writeEndObject();
json.writeEndObject();
json.writeEndObject();
@@ -174,7 +180,7 @@ public class ElasticExpressionContext {
json.writeObjectFieldStart(TERMS);
json.writeArrayFieldStart(rawProperty(propertyName));
for (Object value : values) {
json.writeObject(value);
jsonContext.writeScalar(json, value);
}
json.writeEndArray();
json.writeEndObject();
@@ -191,7 +197,7 @@ public class ElasticExpressionContext {
json.writeObjectFieldStart(IDS);
json.writeArrayFieldStart(VALUES);
for (Object id : idList) {
json.writeObject(id);
jsonContext.writeScalar(json, id);
}
json.writeEndArray();
json.writeEndObject();
@@ -322,7 +328,7 @@ public class ElasticExpressionContext {
json.writeStartObject();
json.writeObjectFieldStart(type);
json.writeFieldName(propertyName);
json.writeObject(value);
jsonContext.writeScalar(json, value);
json.writeEndObject();
json.writeEndObject();
}
src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+2 -6
View File
@@ -292,18 +292,14 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
public String asElasticQuery() {
StringWriter sw = new StringWriter(200);
JsonContext json = server.json();
JsonGenerator generator = json.createGenerator(sw);
BeanType<T> beanType = server.getPluginApi().getBeanType(this.beanType);
ElasticExpressionContext context = new ElasticExpressionContext(generator, beanType);
ElasticExpressionContext context = new ElasticExpressionContext(json, beanDescriptor);
try {
writeElastic(context);
context.flush();
generatedSql = sw.toString();
generatedSql = context.flush();
return generatedSql;
} catch (IOException e) {
src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java
+5 -3
View File
@@ -7,7 +7,6 @@ import com.avaje.ebean.text.json.EJson;
import com.avaje.ebean.text.json.JsonContext;
import com.avaje.ebean.text.json.JsonIOException;
import com.avaje.ebean.text.json.JsonReadOptions;
import com.avaje.ebean.text.json.JsonScalar;
import com.avaje.ebean.text.json.JsonWriteBeanVisitor;
import com.avaje.ebean.text.json.JsonWriteOptions;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
@@ -51,16 +50,19 @@ public class DJsonContext implements JsonContext {
private final JsonConfig.Include defaultInclude;
private final DJsonScalar jsonScalar;
public DJsonContext(SpiEbeanServer server, JsonFactory jsonFactory, TypeManager typeManager) {
this.server = server;
this.typeManager = typeManager;
this.jsonFactory = (jsonFactory != null) ? jsonFactory : new JsonFactory();
this.defaultObjectMapper = this.server.getServerConfig().getObjectMapper();
this.defaultInclude = this.server.getServerConfig().getJsonInclude();
this.jsonScalar = new DJsonScalar(typeManager);
}
public JsonScalar getScalar(JsonGenerator generator) {
return new DefaultJsonScalar(typeManager, new WriteJson(generator, defaultInclude));
public void writeScalar(JsonGenerator generator, Object scalarValue) throws IOException {
jsonScalar.write(generator, scalarValue);
}
public boolean isSupportedType(Type genericType) {
src/main/java/com/avaje/ebeaninternal/server/text/json/DefaultJsonScalar.java → src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonScalar.java
+6 -11
View File
@@ -1,39 +1,34 @@
package com.avaje.ebeaninternal.server.text.json;
import com.avaje.ebean.text.json.JsonScalar;
import com.avaje.ebeaninternal.server.type.ScalarType;
import com.avaje.ebeaninternal.server.type.TypeManager;
import com.fasterxml.jackson.core.JsonGenerator;
import java.io.IOException;
/**
* Default implementation of JsonScalar.
*/
public class DefaultJsonScalar implements JsonScalar {
public class DJsonScalar {
private final TypeManager typeManager;
private final WriteJson writeJson;
public DefaultJsonScalar(TypeManager typeManager, WriteJson writeJson) {
public DJsonScalar(TypeManager typeManager) {
this.typeManager = typeManager;
this.writeJson = writeJson;
}
@Override
@SuppressWarnings("unchecked")
public void write(Object value) throws IOException {
public void write(JsonGenerator gen, Object value) throws IOException {
if (value instanceof String) {
writeJson.writeString((String)value);
gen.writeString((String)value);
} else {
ScalarType scalarType = typeManager.getScalarType(value.getClass());
if (scalarType == null) {
throw new IllegalArgumentException("unhandled type " + value.getClass());
}
scalarType.jsonWrite(writeJson.gen(), value);
scalarType.jsonWrite(gen, value);
}
}
}