Merge pull request #2767 from ebean-orm/feature/2766-json-ref-bean

#2766 Explicitly specify disableLazyLoad on beans created from JSON by default
This commit is contained in:
Rob Bygrave authored and GitHub committed 2022-08-03 20:36:19 +12:00
commit 797e1f4bd2
2 files changed
+21 -1

No files matched your search

@@ -33,6 +33,7 @@ public final class ReadJson implements SpiJsonReader {
private final PersistenceContext persistenceContext;
private final LoadContext loadContext;
private final boolean intercept;
private final boolean enableLazyLoading;
/**
* Construct with parser and readOptions.
@@ -43,6 +44,7 @@ public final class ReadJson implements SpiJsonReader {
this.objectMapper = objectMapper;
this.persistenceContext = initPersistenceContext(readOptions);
this.loadContext = initLoadContext(desc, readOptions);
this.enableLazyLoading = readOptions != null && readOptions.isEnableLazyLoading();
// only create visitorMap, pathStack if needed ...
this.visitorMap = (readOptions == null) ? null : readOptions.getVisitorMap();
this.pathStack = (visitorMap == null && loadContext == null) ? null : new PathStack();
@@ -61,6 +63,7 @@ public final class ReadJson implements SpiJsonReader {
this.persistenceContext = source.persistenceContext;
this.loadContext = source.loadContext;
this.intercept = source.intercept;
this.enableLazyLoading = source.enableLazyLoading;
}
private LoadContext initLoadContext(BeanDescriptor<?> desc, JsonReadOptions readOptions) {
@@ -109,6 +112,9 @@ public final class ReadJson implements SpiJsonReader {
*/
@Override
public Object persistenceContextPutIfAbsent(Object id, EntityBean bean, BeanDescriptor<?> beanDesc) {
if (!enableLazyLoading) {
bean._ebean_getIntercept().setDisableLazyLoad(true);
}
if (persistenceContext == null) {
// no persistenceContext means no lazy loading either
return null;