Merge remote-tracking branch 'origin/master'

Author: JanHolger

src/main/java/org/javawebstack/orm/QueryBuilder.java

@@ -9,6 +9,7 @@
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -289,8 +290,12 @@ public void create(T entry){
     private QueryPart makeWhere(){
         StringBuilder sb = new StringBuilder();
         List<Object> params = new ArrayList<>();
-        if(info.isSoftDelete() && !withDeleted)
-            isNull(info.getSoftDeleteField());
+        if(info.isSoftDelete() && !withDeleted) {
+            if (info.getSoftDelete().expiryMode())
+                where(info.getSoftDeleteField(), ">", new Date().getTime());
+            else
+                isNull(info.getSoftDeleteField());
+        }
         if(conditions.size() > 0){
             sb.append(" WHERE");
             for(int i=0; i < conditions.size(); i++){

src/main/java/org/javawebstack/orm/TableInfo.java

@@ -114,6 +114,10 @@ public boolean isSoftDelete(){
         return softDelete != null;
     }
 
+    public SoftDelete getSoftDelete() {
+        return softDelete;
+    }
+
     public boolean hasDates(){
         return dates != null;
     }

src/main/java/org/javawebstack/orm/annotation/SoftDelete.java

@@ -9,4 +9,5 @@
 @Target(ElementType.TYPE)
 public @interface SoftDelete {
     String value() default "deletedAt";
+    boolean expiryMode() default false;
 }