diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java index a1f622568..8c4ddfe38 100644 --- a/src/main/java/io/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -229,6 +229,8 @@ public class ServerConfig { private int persistBatchSize = 20; + private boolean disableLazyLoading; + /** * The default batch size for lazy loading */ @@ -927,6 +929,14 @@ public class ServerConfig { this.queryBatchSize = queryBatchSize; } + public boolean isDisableLazyLoading() { + return disableLazyLoading; + } + + public void setDisableLazyLoading(boolean disableLazyLoading) { + this.disableLazyLoading = disableLazyLoading; + } + /** * Return the default batch size for lazy loading of beans and collections. */ @@ -2896,6 +2906,7 @@ public class ServerConfig { localTimeWithNanos = p.getBoolean("localTimeWithNanos", localTimeWithNanos); jodaLocalTimeMode = p.get("jodaLocalTimeMode", jodaLocalTimeMode); + disableLazyLoading = p.getBoolean("disableLazyLoading", disableLazyLoading); lazyLoadBatchSize = p.getInt("lazyLoadBatchSize", lazyLoadBatchSize); queryBatchSize = p.getInt("queryBatchSize", queryBatchSize); diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 33710a1d9..88469e3d8 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -284,6 +284,7 @@ public class DefaultOrmQuery implements SpiQuery { this.orderById = server.getServerConfig().isDefaultOrderById(); this.expressionFactory = expressionFactory; this.detail = new OrmQueryDetail(); + this.disableLazyLoading = server.getServerConfig().isDisableLazyLoading(); } public void setNativeSql(String nativeSql) { diff --git a/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java b/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java new file mode 100644 index 000000000..4c294607f --- /dev/null +++ b/src/test/java/org/tests/basic/TestLazyLoadGlobalConfig.java @@ -0,0 +1,26 @@ +package org.tests.basic; + +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.junit.Assert; +import org.junit.Test; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; + +import java.util.List; + +public class TestLazyLoadGlobalConfig extends BaseTestCase { + + @Test + public void test() { + ResetBasicData.reset(); + + Customer customer = Ebean.find(Customer.class, 1); + + if (customer != null) { + List contacts = customer.getContacts(); + Assert.assertEquals(0, contacts.size()); + } + } +} diff --git a/src/test/resources/test-ebean.properties b/src/test/resources/test-ebean.properties index b64de6610..39ee02486 100644 --- a/src/test/resources/test-ebean.properties +++ b/src/test/resources/test-ebean.properties @@ -4,4 +4,6 @@ datasource.h2.username=sa ebean.jodaLocalTimeMode=normal #ebean.jodaLocalTimeMode=utc -#ebean.skipCacheAfterWrite=false \ No newline at end of file +#ebean.skipCacheAfterWrite=false + +ebean.disableLazyLoading=true