mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-14 06:45:21 +00:00
Remove: ReadJson.resetContext as it is not used
This commit is contained in:
1 parent
100832ddd9
commit
5322ab3e7e
6 files changed
+11
-19
No files matched your search
@@ -14,7 +14,7 @@ public interface SpiJsonReader {
|
||||
|
||||
PersistenceContext getPersistenceContext();
|
||||
|
||||
SpiJsonReader forJson(JsonParser moreJson, boolean resetContext);
|
||||
SpiJsonReader forJson(JsonParser moreJson);
|
||||
|
||||
<T> void persistenceContextPut(Object beanId, T currentBean);
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ final class BeanDescriptorJsonHelp<T> {
|
||||
return null;
|
||||
}
|
||||
JsonParser newParser = node.traverse();
|
||||
SpiJsonReader newReader = jsonRead.forJson(newParser, false);
|
||||
SpiJsonReader newReader = jsonRead.forJson(newParser);
|
||||
|
||||
// check for the discriminator value to determine the correct sub type
|
||||
String discColumn = inheritInfo.getRoot().getDiscriminatorColumn();
|
||||
|
||||
@@ -45,7 +45,7 @@ public final class DJsonBeanReader<T> implements JsonBeanReader<T> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public JsonBeanReader<T> forJson(JsonParser moreJson, boolean resetContext) {
|
||||
return new DJsonBeanReader<>(desc, readJson.forJson(moreJson, resetContext));
|
||||
public JsonBeanReader<T> forJson(JsonParser moreJson) {
|
||||
return new DJsonBeanReader<>(desc, readJson.forJson(moreJson));
|
||||
}
|
||||
}
|
||||
@@ -50,22 +50,14 @@ public final class ReadJson implements SpiJsonReader {
|
||||
/**
|
||||
* Construct when transferring load context, persistence context, object mapper etc to a new ReadJson instance.
|
||||
*/
|
||||
private ReadJson(JsonParser moreJson, ReadJson source, boolean resetContext) {
|
||||
private ReadJson(JsonParser moreJson, ReadJson source) {
|
||||
this.parser = moreJson;
|
||||
this.rootDesc = source.rootDesc;
|
||||
this.pathStack = source.pathStack;
|
||||
this.visitorMap = source.visitorMap;
|
||||
this.objectMapper = source.objectMapper;
|
||||
if (resetContext) {
|
||||
this.persistenceContext = new DefaultPersistenceContext();
|
||||
this.loadContext = source.loadContext;
|
||||
if (loadContext != null) {
|
||||
loadContext.resetPersistenceContext(persistenceContext);
|
||||
}
|
||||
} else {
|
||||
this.persistenceContext = source.persistenceContext;
|
||||
this.loadContext = source.loadContext;
|
||||
}
|
||||
this.persistenceContext = source.persistenceContext;
|
||||
this.loadContext = source.loadContext;
|
||||
}
|
||||
|
||||
private LoadContext initLoadContext(BeanDescriptor<?> desc, JsonReadOptions readOptions) {
|
||||
@@ -96,8 +88,8 @@ public final class ReadJson implements SpiJsonReader {
|
||||
* Return a new instance of ReadJson using the existing context but with a new JsonParser.
|
||||
*/
|
||||
@Override
|
||||
public SpiJsonReader forJson(JsonParser moreJson, boolean resetContext) {
|
||||
return new ReadJson(moreJson, this, resetContext);
|
||||
public SpiJsonReader forJson(JsonParser moreJson) {
|
||||
return new ReadJson(moreJson, this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user