Merge pull request #3788 from mvanhorn/fix/3641-refresh-soft-deleted

Fix refresh on soft-deleted beans

Author: rbygrave

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java

@@ -188,7 +188,10 @@ private void refreshBeanInternal(EntityBean bean, SpiQuery.Mode mode, int embedd
     query.setLazyLoadProperty(ebi.lazyLoadProperty());
     if (draft) {
       query.asDraft();
-    } else if (mode == SpiQuery.Mode.LAZYLOAD_BEAN && desc.isSoftDelete()) {
+    } else if (desc.isSoftDelete()
+        && (mode == SpiQuery.Mode.LAZYLOAD_BEAN || mode == SpiQuery.Mode.REFRESH_BEAN)) {
+      // include soft-deleted rows when lazy loading or refreshing so a
+      // refresh() on a soft-deleted bean can reload it (issue #3641)
       query.setIncludeSoftDeletes();
     }
     if (embeddedOwnerIndex > -1) {

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

@@ -155,6 +155,33 @@ public void test() {
     assertThat(findInclude).isNotNull();
   }
 
+  @Test
+  public void testRefreshSoftDeleted() {
+
+    EBasicSoftDelete bean = new EBasicSoftDelete();
+    bean.setName("refreshSoftDeleted");
+    DB.save(bean);
+
+    DB.delete(bean);
+
+    // obtain a handle to the soft-deleted bean
+    EBasicSoftDelete softDeleted = DB.find(EBasicSoftDelete.class)
+      .setId(bean.getId())
+      .setIncludeSoftDeletes()
+      .findOne();
+
+    assertThat(softDeleted).isNotNull();
+
+    // refresh() must not throw EntityNotFoundException for a soft-deleted bean (issue #3641)
+    DB.refresh(softDeleted);
+
+    assertThat(softDeleted.getName()).isEqualTo("refreshSoftDeleted");
+    assertThat(softDeleted.isDeleted()).isTrue();
+
+    // Cleanup created entity
+    DB.deletePermanent(softDeleted);
+  }
+
   @Test
   public void testFindSoftDeleted() {