diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java b/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java index a137661c9..ff02b98f3 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java @@ -177,18 +177,13 @@ public interface SpiQuery extends Query { /** * This becomes a lazy loading query for a many relationship. */ - void setLazyLoadForParents(List parentIds, BeanPropertyAssocMany many); + void setLazyLoadForParents(BeanPropertyAssocMany many); /** * Return the lazy loading 'many' property. */ BeanPropertyAssocMany getLazyLoadForParentsProperty(); - /** - * Return the list of parent Id's for lazy loading. - */ - List getLazyLoadForParentIds(); - /** * Set the load mode (+lazy or +query) and the load description. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java index 48c0a0629..701f4e242 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java @@ -121,7 +121,7 @@ public class DefaultBeanLoader { query.where().raw(ew); } - query.setLazyLoadForParents(idList, many); + query.setLazyLoadForParents(many); many.addWhereParentIdIn(query, idList); query.setPersistenceContext(pc); diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 5b5e332c5..50c8e80d3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -200,8 +200,6 @@ public class DefaultOrmQuery implements SpiQuery { private BeanPropertyAssocMany lazyLoadForParentsProperty; - private List lazyLoadForParentsIds; - /** * Hash of final query after AutoFetch tuning. */ @@ -525,16 +523,10 @@ public class DefaultOrmQuery implements SpiQuery { } @Override - public void setLazyLoadForParents(List parentIds, BeanPropertyAssocMany many) { - this.lazyLoadForParentsIds = parentIds; + public void setLazyLoadForParents(BeanPropertyAssocMany many) { this.lazyLoadForParentsProperty = many; } - @Override - public List getLazyLoadForParentIds() { - return lazyLoadForParentsIds; - } - @Override public BeanPropertyAssocMany getLazyLoadForParentsProperty() { return lazyLoadForParentsProperty; diff --git a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java b/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java index c4eb9ff2d..2ecce1ae3 100644 --- a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java +++ b/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java @@ -50,7 +50,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { SpiQuery query0 = (SpiQuery)Ebean.find(OrderDetail.class); - query0.setLazyLoadForParents(parentIds, beanProperty); + query0.setLazyLoadForParents(beanProperty); beanProperty.addWhereParentIdIn(query0, parentIds);