#2626 - For readOnly disableLazyLoad using Collections.EMPTY_LIST etc for reference collections

This commit is contained in:
Rob Bygrave committed 2022-05-03 12:12:47 +12:00
1 parent a70461d779
commit 84042397b6
8 files changed
+58 -8

No files matched your search

@@ -47,6 +47,11 @@ public interface BeanCollectionHelp<T> extends CQueryCollectionAdd<T> {
*/
BeanCollection<T> createEmpty(EntityBean bean);
/**
* Create and return an empty 'vanilla' collection that does not support lazy loading.
*/
Object createEmptyReference();
/**
* Add a bean to the List Set or Map.
*/
@@ -11,6 +11,7 @@ import io.ebeaninternal.api.json.SpiJsonWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@@ -41,6 +42,11 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
}
}
@Override
public Object createEmptyReference() {
return Collections.EMPTY_LIST;
}
@Override
public BeanCollection<T> createEmptyNoParent() {
return new BeanList<>();
@@ -10,6 +10,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.api.json.SpiJsonWriter;
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -75,6 +76,11 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
}
}
@Override
public Object createEmptyReference() {
return Collections.EMPTY_MAP;
}
@Override
public BeanCollection<T> createEmptyNoParent() {
return new BeanMap<>();
@@ -601,6 +601,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
return mapKey;
}
@Override
public void createEmptyReference(EntityBean localBean) {
setValue(localBean, help.createEmptyReference());
}
@Override
public BeanCollection<?> createReference(EntityBean localBean, boolean forceNewReference) {
return forceNewReference ? createReference(localBean) : createReferenceIfNull(localBean);
@@ -10,6 +10,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.api.json.SpiJsonWriter;
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -45,6 +46,11 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
}
}
@Override
public Object createEmptyReference() {
return Collections.EMPTY_SET;
}
@Override
public BeanCollection<T> createEmptyNoParent() {
return new BeanSet<>();
@@ -33,6 +33,11 @@ public interface STreePropertyAssocMany extends STreePropertyAssoc {
*/
BeanCollection<?> createReference(EntityBean localBean, boolean forceNewReference);
/**
* Populate the collection for read-only disabled lazy loading (aka Java Collections non mutable empty collection).
*/
void createEmptyReference(EntityBean localBean);
/**
* Return true if the property has a join table.
*/
@@ -284,14 +284,18 @@ class SqlTreeLoadBean implements SqlTreeLoad {
boolean forceNewReference = queryMode == Mode.REFRESH_BEAN;
for (STreePropertyAssocMany many : localDesc.propsMany()) {
if (many != fetchedMany) {
// create a proxy for the many (deferred fetching)
BeanCollection<?> ref = many.createReference(localBean, forceNewReference);
if (ref != null) {
if (disableLazyLoad) {
ref.setDisableLazyLoad(true);
}
if (!ref.isRegisteredWithLoadContext()) {
ctx.register(many.asMany(), ref);
if (readOnlyNoIntercept) {
many.createEmptyReference(localBean);
} else {
// create a proxy for the many (deferred fetching)
BeanCollection<?> ref = many.createReference(localBean, forceNewReference);
if (ref != null) {
if (disableLazyLoad) {
ref.setDisableLazyLoad(true);
}
if (!ref.isRegisteredWithLoadContext()) {
ctx.register(many.asMany(), ref);
}
}
}
}