Implemented #36 (don't render empty groups)

Author: JanHolger

src/main/java/org/javawebstack/orm/query/Query.java

@@ -144,18 +144,6 @@ public Query<T> orLike(String left, Object right) {
         return orWhere(left, "LIKE", right);
     }
 
-    public QueryGroup<T> whereMorph(String name, Class<? extends Model> type) {
-        return where.whereMorph(name, type);
-    }
-
-    public QueryGroup<T> whereMorph(String name, Class<? extends Model> type, Object id) {
-        return where.whereMorph(name, type, id);
-    }
-
-    public QueryGroup<T> whereMorph(String name, Model entity) {
-        return where.whereMorph(name, entity);
-    }
-
     public Query<T> orWhere(Class<? extends Model> leftTable, String left, String operator, Class<? extends Model> rightTable, String right) {
         if (rightTable != null)
             right = Repo.get(rightTable).getInfo().getTableName() + "." + Repo.get(rightTable).getInfo().getColumnName(right);
@@ -212,33 +200,25 @@ public Query<T> orWhereId(String operator, Class<? extends Model> other, String
         return orWhereId(operator, new QueryColumn(Repo.get(other).getInfo().getTableName() + "." + Repo.get(other).getInfo().getColumnName(field)));
     }
 
+    @Deprecated
     public Query<T> isNull(Object left) {
         where.isNull(left);
         return this;
     }
 
+    @Deprecated
     public Query<T> notNull(Object left) {
         where.notNull(left);
         return this;
     }
 
     public Query<T> whereNull(Object left) {
-        where.isNull(left);
+        where.whereNull(left);
         return this;
     }
 
     public Query<T> whereNotNull(Object left) {
-        where.notNull(left);
-        return this;
-    }
-
-    public Query<T> lessThan(Object left, Object right) {
-        where.lessThan(left, right);
-        return this;
-    }
-
-    public Query<T> greaterThan(Object left, Object right) {
-        where.greaterThan(left, right);
+        where.whereNotNull(left);
         return this;
     }
 
@@ -252,23 +232,25 @@ public Query<T> orWhere(Object left, Object right) {
         return this;
     }
 
+    @Deprecated
     public Query<T> orIsNull(Object left) {
         where.orIsNull(left);
         return this;
     }
 
+    @Deprecated
     public Query<T> orNotNull(Object left) {
         where.orNotNull(left);
         return this;
     }
 
-    public Query<T> orLessThan(Object left, Object right) {
-        where.orLessThan(left, right);
+    public Query<T> orWhereNull(Object left) {
+        where.orWhereNull(left);
         return this;
     }
 
-    public Query<T> orGreaterThan(Object left, Object right) {
-        where.orGreaterThan(left, right);
+    public Query<T> orWhereNotNull(Object left) {
+        where.orWhereNotNull(left);
         return this;
     }
 

src/main/java/org/javawebstack/orm/query/QueryGroup.java

@@ -29,16 +29,30 @@ public List<QueryElement> getQueryElements() {
         return queryElements;
     }
 
+    @Deprecated
     public QueryGroup<T> and(Function<QueryGroup<T>, QueryGroup<T>> group) {
+        return where(group);
+    }
+
+    public QueryGroup<T> where(Function<QueryGroup<T>, QueryGroup<T>> group) {
         QueryGroup<T> innerGroup = group.apply(new QueryGroup<>());
+        if(innerGroup.queryElements.size() == 0)
+            return this;
         if (queryElements.size() > 0)
             queryElements.add(QueryConjunction.AND);
         queryElements.add(innerGroup);
         return this;
     }
 
+    @Deprecated
     public QueryGroup<T> or(Function<QueryGroup<T>, QueryGroup<T>> group) {
+        return orWhere(group);
+    }
+
+    public QueryGroup<T> orWhere(Function<QueryGroup<T>, QueryGroup<T>> group) {
         QueryGroup<T> innerGroup = group.apply(new QueryGroup<>());
+        if(innerGroup.queryElements.size() == 0)
+            return this;
         if (queryElements.size() > 0)
             queryElements.add(QueryConjunction.OR);
         queryElements.add(innerGroup);
@@ -68,28 +82,18 @@ public QueryGroup<T> where(Class<? extends Model> leftTable, String left, String
         return where(left, operator, right);
     }
 
-    public QueryGroup<T> whereMorph(String name, Class<? extends Model> type) {
-        return where(name + "Type", Repo.get(type).getInfo().getMorphType());
-    }
-
-    public QueryGroup<T> whereMorph(String name, Class<? extends Model> type, Object id) {
-        return whereMorph(name, type).where(name + "Id", id);
-    }
-
-    public QueryGroup<T> whereMorph(String name, Model entity) {
-        return whereMorph(name, entity.getClass(), Repo.get(entity.getClass()).getId(entity));
-    }
-
     public QueryGroup<T> where(Object left, Object right) {
         return where(left, "=", right);
     }
 
+    @Deprecated
     public QueryGroup<T> isNull(Object left) {
-        return where(left, "IS NULL", null);
+        return whereNull(left);
     }
 
+    @Deprecated
     public QueryGroup<T> notNull(Object left) {
-        return where(left, "IS NOT NULL", null);
+        return whereNotNull(left);
     }
 
     public QueryGroup<T> whereNull(Object left) {
@@ -100,14 +104,6 @@ public QueryGroup<T> whereNotNull(Object left) {
         return where(left, "IS NOT NULL", null);
     }
 
-    public QueryGroup<T> lessThan(Object left, Object right) {
-        return where(left, "<", right);
-    }
-
-    public QueryGroup<T> greaterThan(Object left, Object right) {
-        return where(left, ">", right);
-    }
-
     public QueryGroup<T> orWhere(Object left, String condition, Object right) {
         if(condition.equalsIgnoreCase("=") && right == null)
             return orIsNull(left);
@@ -147,20 +143,22 @@ public QueryGroup<T> orWhereMorph(String name, Model entity) {
         return orWhereMorph(name, entity.getClass(), Repo.get(entity.getClass()).getId(entity));
     }
 
+    @Deprecated
     public QueryGroup<T> orIsNull(Object left) {
-        return orWhere(left, "IS NULL", null);
+        return orWhereNull(left);
     }
 
+    @Deprecated
     public QueryGroup<T> orNotNull(Object left) {
-        return orWhere(left, "IS NOT NULL", null);
+        return orWhereNotNull(left);
     }
 
-    public QueryGroup<T> orLessThan(Object left, Object right) {
-        return orWhere(left, "<", right);
+    public QueryGroup<T> orWhereNull(Object left) {
+        return orWhere(left, "IS NULL", null);
     }
 
-    public QueryGroup<T> orGreaterThan(Object left, Object right) {
-        return orWhere(left, ">", right);
+    public QueryGroup<T> orWhereNotNull(Object left) {
+        return orWhere(left, "IS NOT NULL", null);
     }
 
     public <M extends Model> QueryGroup<T> whereExists(Class<M> model, Function<Query<M>, Query<M>> consumer) {