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

Fix: toJson must use setIntercept if target bean is passed

Browse Source
This commit is contained in:
Roland Praml
2022-07-28 15:07:05 +02:00
parent 3c2b5f253f
commit dbcc779731
7 changed files with 138 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java
+2
View File
@@ -33,4 +33,6 @@ public interface SpiJsonReader {
void beanVisitor(Object bean, Map<String, Object> unmappedProperties);
Object readValueUsingObjectMapper(Class<?> propertyType) throws IOException;
boolean isIntercept();
}
ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+10 -2
View File
@@ -1414,7 +1414,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
JsonToken event = ctx.nextToken();
if (JsonToken.VALUE_NULL == event) {
if (jsonDeserialize) {
setValue(bean, null);
if (ctx.isIntercept()) {
setValueIntercept(bean, null);
} else {
setValue(bean, null);
}
}
} else {
// expect to read non-null json value
@@ -1433,7 +1437,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
}
}
if (jsonDeserialize) {
setValue(bean, objValue);
if (ctx.isIntercept()) {
setValueIntercept(bean, objValue);
} else {
setValue(bean, objValue);
}
}
}
}
ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
+5 -1
View File
@@ -50,7 +50,11 @@ class BeanPropertyAssocManyJsonHelp {
if (JsonToken.START_ARRAY != event && JsonToken.START_OBJECT != event) {
throw new JsonParseException(parser, "Unexpected token " + event + " - expecting start array or object");
}
many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean));
if (readJson.isIntercept()) {
many.setValueIntercept(parentBean, many.jsonReadCollection(readJson, parentBean));
} else {
many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean));
}
}
/**
ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+5 -1
View File
@@ -785,7 +785,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
if (jsonDeserialize && targetDescriptor != null) {
T target = (T) value(bean);
T assocBean = targetDescriptor.jsonRead(readJson, name, target);
setValue(bean, assocBean);
if (readJson.isIntercept()) {
setValueIntercept(bean, assocBean);
} else {
setValue(bean, assocBean);
}
}
}
ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
+8 -8
View File
@@ -125,7 +125,7 @@ public final class DJsonContext implements SpiJsonContext {
BeanDescriptor<T> desc = getDescriptor(cls);
try {
return desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options)), null, null);
return desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), false), null, null);
} catch (IOException e) {
throw new JsonIOException(e);
}
@@ -158,10 +158,10 @@ public final class DJsonContext implements SpiJsonContext {
@Override
public <T> void toBean(T target, JsonParser parser, JsonReadOptions options) throws JsonIOException {
BeanDescriptor<T> desc = (BeanDescriptor<T>) getDescriptor(target.getClass());
try {
desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options)), null, target);
desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), target != null), null, target);
} catch (IOException e) {
throw new JsonIOException(e);
}
@@ -171,14 +171,14 @@ public final class DJsonContext implements SpiJsonContext {
public <T> DJsonBeanReader<T> createBeanReader(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException {
BeanDescriptor<T> desc = getDescriptor(cls);
return new DJsonBeanReader<>(desc, new ReadJson(desc, parser, options, determineObjectMapper(options)));
return new DJsonBeanReader<>(desc, new ReadJson(desc, parser, options, determineObjectMapper(options), false));
}
@Override
public <T> DJsonBeanReader<T> createBeanReader(BeanType<T> beanType, JsonParser parser, JsonReadOptions options) throws JsonIOException {
BeanDescriptor<T> desc = (BeanDescriptor<T>) beanType;
SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options));
SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options), false);
return new DJsonBeanReader<>(desc, readJson);
}
@@ -211,7 +211,7 @@ public final class DJsonContext implements SpiJsonContext {
public <T> List<T> toList(Class<T> cls, JsonParser src, JsonReadOptions options) throws JsonIOException {
BeanDescriptor<T> desc = getDescriptor(cls);
SpiJsonReader readJson = new ReadJson(desc, src, options, determineObjectMapper(options));
SpiJsonReader readJson = new ReadJson(desc, src, options, determineObjectMapper(options), false);
try {
JsonToken currentToken = src.getCurrentToken();
@@ -225,7 +225,7 @@ public final class DJsonContext implements SpiJsonContext {
List<T> list = new ArrayList<>();
do {
// CHECKME: Should we update the list
T bean = desc.jsonRead(readJson, null, null);
T bean = desc.jsonRead(readJson, null, null);
if (bean == null) {
break;
} else {
@@ -395,7 +395,7 @@ public final class DJsonContext implements SpiJsonContext {
BeanDescriptor<?> desc = (BeanDescriptor<?>) beanType;
JsonParser parser = createParser(new StringReader(json));
return new ReadJson(desc, parser, null, defaultObjectMapper);
return new ReadJson(desc, parser, null, defaultObjectMapper, false);
}
@Override
ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
+11 -1
View File
@@ -32,11 +32,12 @@ public final class ReadJson implements SpiJsonReader {
private final Object objectMapper;
private final PersistenceContext persistenceContext;
private final LoadContext loadContext;
private final boolean intercept;
/**
* Construct with parser and readOptions.
*/
public ReadJson(BeanDescriptor<?> desc, JsonParser parser, JsonReadOptions readOptions, Object objectMapper) {
public ReadJson(BeanDescriptor<?> desc, JsonParser parser, JsonReadOptions readOptions, Object objectMapper, boolean intercept) {
this.rootDesc = desc;
this.parser = parser;
this.objectMapper = objectMapper;
@@ -45,6 +46,7 @@ public final class ReadJson implements SpiJsonReader {
// only create visitorMap, pathStack if needed ...
this.visitorMap = (readOptions == null) ? null : readOptions.getVisitorMap();
this.pathStack = (visitorMap == null && loadContext == null) ? null : new PathStack();
this.intercept = intercept;
}
/**
@@ -58,6 +60,7 @@ public final class ReadJson implements SpiJsonReader {
this.objectMapper = source.objectMapper;
this.persistenceContext = source.persistenceContext;
this.loadContext = source.loadContext;
this.intercept = source.intercept;
}
private LoadContext initLoadContext(BeanDescriptor<?> desc, JsonReadOptions readOptions) {
@@ -203,4 +206,11 @@ public final class ReadJson implements SpiJsonReader {
return getObjectMapper().readValue(parser, propertyType);
}
/**
* Do we have to set values via intercept or not.
*/
@Override
public boolean isIntercept() {
return intercept;
}
}