edit

Author: usfalami

src/main/java/org/usf/jquery/core/TypedComparator.java

@@ -4,6 +4,7 @@
 import static org.usf.jquery.core.ParameterSet.ofParameters;
 
 import lombok.Getter;
+import lombok.experimental.Delegate;
 
 /**
  * 
@@ -13,19 +14,15 @@
 @Getter
 public final class TypedComparator implements Comparator {
 
-	private final Comparator comparator; // do not delegate
+	@Delegate
+	private final Comparator comparator;
 	private final ParameterSet parameterSet;
 
 	public TypedComparator(Comparator comparator, Parameter... parameters) {
 		this.comparator = comparator;
 		this.parameterSet = ofParameters(parameters);
 	}
 
-	@Override
-	public String id() {
-		return comparator.id();
-	}
-	
 	@Override
 	public String sql(QueryVariables builder, Object[] args) {
 		try {
@@ -35,9 +32,9 @@ public String sql(QueryVariables builder, Object[] args) {
 		}
 	}
 
-	@Override
-	public boolean is(Class<? extends Comparator> type) {
-		return comparator.is(type);
+	@Override // do not delegate this
+	public ColumnSingleFilter filter(Object... args) {
+		return Comparator.super.filter(args);
 	}
 
 	@Override

src/main/java/org/usf/jquery/core/TypedOperator.java

@@ -4,6 +4,7 @@
 import static org.usf.jquery.core.ParameterSet.ofParameters;
 
 import lombok.Getter;
+import lombok.experimental.Delegate;
 
 /**
  * 
@@ -13,7 +14,8 @@
 @Getter
 public class TypedOperator implements Operator {
 
-	private final Operator operator; // do not delegate
+	@Delegate
+	private final Operator operator;
 	private final ArgTypeRef typeFn;
 	private final ParameterSet parameterSet;
 
@@ -27,11 +29,6 @@ public TypedOperator(ArgTypeRef typeFn, Operator function, Parameter... paramete
 		this.parameterSet = ofParameters(parameter);
 	}
 
-	@Override
-	public String id() {
-		return operator.id();
-	}
-	
 	@Override
 	public String sql(QueryVariables builder, Object[] args) {
 		try {
@@ -41,16 +38,16 @@ public String sql(QueryVariables builder, Object[] args) {
 			throw badArgumentsException("operator", operator.id(), args, e);
 		}
 	}
-	
-	@Override
-	public boolean is(Class<? extends Operator> type) {
-		return operator.is(type);
-	}
 
 	public OperationColumn operation(Object... args) {
-		return Operator.super.operation(typeFn.apply(args), args);
+		return this.operation(typeFn.apply(args), args);
 	}
 
+	@Override // do not delegate this
+	public OperationColumn operation(JDBCType type, Object... args) {
+		return Operator.super.operation(type, args);
+	}
+	
 	public boolean isWindowFunction() {
 		return operator.is(WindowFunction.class);
 	}