Merge branch 'tobias--soft_deletes_not_included'

src/main/java/io/ebeaninternal/api/LoadBeanContext.java

@@ -1,9 +1,15 @@
 package io.ebeaninternal.api;
 
 
+import io.ebean.bean.BeanCollection;
+
 /**
  * Controls the loading of ManyToOne and OneToOne relationships.
  */
 public interface LoadBeanContext extends LoadSecondaryQuery {
 
+  /**
+   * Register a BeanCollection into the load context.
+   */
+  void register(String manyProperty, BeanCollection<?> collection);
 }

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -39,6 +39,7 @@ import io.ebean.util.SplitName;
 import io.ebeaninternal.api.BeanCacheResult;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.ConcurrencyMode;
+import io.ebeaninternal.api.LoadBeanContext;
 import io.ebeaninternal.api.LoadContext;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
@@ -2276,14 +2277,18 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * define a Reference for the collection and not invoke a query.
    */
   public boolean lazyLoadMany(EntityBeanIntercept ebi) {
+    return lazyLoadMany(ebi, null);
+  }
+
+  public boolean lazyLoadMany(EntityBeanIntercept ebi, LoadBeanContext parent) {
     int lazyLoadProperty = ebi.getLazyLoadPropertyIndex();
     if (lazyLoadProperty == -1) {
       return false;
     }
     if (inheritInfo != null) {
-      return descOf(ebi.getOwner().getClass()).lazyLoadMany(ebi, lazyLoadProperty);
+      return descOf(ebi.getOwner().getClass()).lazyLoadMany(ebi, lazyLoadProperty, parent);
     }
-    return lazyLoadMany(ebi, lazyLoadProperty);
+    return lazyLoadMany(ebi, lazyLoadProperty, parent);
   }
 
   /**
@@ -2296,12 +2301,15 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Check for lazy loading of many property.
    */
-  private boolean lazyLoadMany(EntityBeanIntercept ebi, int lazyLoadProperty) {
+  private boolean lazyLoadMany(EntityBeanIntercept ebi, int lazyLoadProperty, LoadBeanContext loadBeanContext) {
     BeanProperty lazyLoadBeanProp = propertiesIndex[lazyLoadProperty];
     if (lazyLoadBeanProp instanceof BeanPropertyAssocMany<?>) {
       BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>) lazyLoadBeanProp;
-      manyProp.createReference(ebi.getOwner());
+      final BeanCollection<?> collection = manyProp.createReference(ebi.getOwner());
       ebi.setLoadedLazy();
+      if (loadBeanContext != null) {
+        loadBeanContext.register(manyProp.getName(), collection);
+      }
       return true;
     }
     return false;

src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java

@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.loadcontext;
 
 import io.ebean.CacheMode;
+import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
@@ -32,7 +33,13 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
     // bufferList only required when using query joins (queryFetch)
     this.bufferList = (!queryFetch) ? null : new ArrayList<>();
     this.currentBuffer = createBuffer(firstBatchSize);
-    this.cache = (queryProps == null) ? false : queryProps.isCache();
+    this.cache = (queryProps != null) && queryProps.isCache();
+  }
+
+  @Override
+  public void register(String manyProperty, BeanCollection<?> collection) {
+    String path = fullPath + "." + manyProperty;
+    parent.register(path, collection);
   }
 
   /**
@@ -175,7 +182,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
       // A synchronized (this) is effectively held by EntityBeanIntercept.loadBean()
-      if (context.desc.lazyLoadMany(ebi)) {
+      if (context.desc.lazyLoadMany(ebi, context)) {
         // lazy load property was a Many
         return;
       }

src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java

@@ -136,6 +136,27 @@ public class TestSoftDeleteBasic extends BaseTestCase {
     query.delete();
   }
 
+  @Test
+  public void testFindSoftDeletedList() {
+    EBasicSoftDelete bean = new EBasicSoftDelete();
+    bean.setName("softDelFetch");
+    DB.save(bean);
+
+    EBasicSDChild bean2 = new EBasicSDChild(bean, "softDelFetchus", 1L);
+    DB.save(bean2);
+    DB.delete(bean2);
+
+    EBasicSDChild child = DB
+      .find(EBasicSDChild.class)
+      .setIncludeSoftDeletes()
+      .where()
+      .idEq(bean2.getId())
+      .findOne();
+    assertThat(child).isNotNull();
+    assertThat(child.getOwner().getChildren().size()).isEqualTo(1);
+  }
+
+
   @Test
   public void testNotFindSoftDeleted() {
     EBasicSoftDelete bean = new EBasicSoftDelete();