From 84042397b696704cbe20e03a46389e51d0aaf6f0 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 3 May 2022 12:12:47 +1200 Subject: [PATCH] #2626 - For readOnly disableLazyLoad using Collections.EMPTY_LIST etc for reference collections --- .../server/deploy/BeanCollectionHelp.java | 5 +++++ .../server/deploy/BeanListHelp.java | 6 ++++++ .../server/deploy/BeanMapHelp.java | 6 ++++++ .../server/deploy/BeanPropertyAssocMany.java | 5 +++++ .../server/deploy/BeanSetHelp.java | 6 ++++++ .../server/query/STreePropertyAssocMany.java | 5 +++++ .../server/query/SqlTreeLoadBean.java | 20 +++++++++++-------- .../org/tests/query/TestQueryOrderById.java | 13 ++++++++++++ 8 files changed, 58 insertions(+), 8 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java index 9fda096aa..c8e5c522d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java @@ -47,6 +47,11 @@ public interface BeanCollectionHelp extends CQueryCollectionAdd { */ BeanCollection 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. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java index 5696e9b19..31e13bfd1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java @@ -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 extends BaseCollectionHelp { } } + @Override + public Object createEmptyReference() { + return Collections.EMPTY_LIST; + } + @Override public BeanCollection createEmptyNoParent() { return new BeanList<>(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java index d2cec7d13..4943b3b80 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java @@ -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 extends BaseCollectionHelp { } } + @Override + public Object createEmptyReference() { + return Collections.EMPTY_MAP; + } + @Override public BeanCollection createEmptyNoParent() { return new BeanMap<>(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 4e6f2d577..81a5f4632 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -601,6 +601,11 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc 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); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java index fd27bac16..4d538cb8c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java @@ -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 extends BaseCollectionHelp { } } + @Override + public Object createEmptyReference() { + return Collections.EMPTY_SET; + } + @Override public BeanCollection createEmptyNoParent() { return new BeanSet<>(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java index c827a255e..a7102af8c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocMany.java @@ -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. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java index 121b53103..664c5e24f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java @@ -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); + } } } } diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java index ecaa91480..fb7c002d6 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java @@ -1,5 +1,8 @@ package org.tests.query; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.InterceptReadOnly; import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; @@ -7,8 +10,11 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; +import java.util.Collections; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + public class TestQueryOrderById extends BaseTestCase { @Test @@ -28,6 +34,13 @@ public class TestQueryOrderById extends BaseTestCase { } else if (!isOracle()) { assertSql(query).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id limit 5 offset 1"); } + + assertThat(list).isNotEmpty(); + Customer customer = list.get(0); + EntityBeanIntercept intercept = ((EntityBean) customer)._ebean_getIntercept(); + assertThat(intercept).isInstanceOf(InterceptReadOnly.class); + assertThat(customer.getOrders()).isSameAs(Collections.EMPTY_LIST); + assertThat(customer.getContacts()).isSameAs(Collections.EMPTY_LIST); } @Test