FluentExpression -> FluentExp, made a few other base expressions fluent.

This commit is contained in:
Michael Bayne
2009-06-10 18:35:07 +00:00
parent d1e8ed43e2
commit d4a376e78b
5 changed files with 6 additions and 7 deletions
@@ -30,7 +30,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
/**
* An expression that unambiguously identifies a field of a class, e.g. GameRecord.itemId.
*/
public class ColumnExp extends FluentExpression
public class ColumnExp extends FluentExp
{
/** The name of the column we reference. */
public final String name;
@@ -39,7 +39,7 @@ import com.samskivert.depot.operator.Sub;
* A base class for {@link SQLExpression} implementations that provides a plethora of combinators
* for composing expressions.
*/
public abstract class FluentExpression
public abstract class FluentExp
implements SQLExpression
{
/** Returns an {@link Equals} with this expression and the supplied target. */
@@ -30,7 +30,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
/**
* An expression for a function, e.g. FLOOR(blah).
*/
public class FunctionExp implements SQLExpression
public class FunctionExp extends FluentExp
{
/**
* Create a new FunctionExp with the given function and arguments.
@@ -28,8 +28,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
/**
* A Java value that is bound as a parameter to the query, e.g. 1 or 'abc'.
*/
public class ValueExp
implements SQLExpression
public class ValueExp extends FluentExp
{
public ValueExp (Object value)
{
@@ -28,7 +28,7 @@ import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.samskivert.depot.PersistentRecord;
import com.samskivert.depot.expression.FluentExpression;
import com.samskivert.depot.expression.FluentExp;
import com.samskivert.depot.expression.SQLExpression;
import com.samskivert.depot.expression.ValueExp;
import com.samskivert.depot.impl.ExpressionVisitor;
@@ -151,7 +151,7 @@ public interface SQLOperator extends SQLExpression
protected SQLExpression _rhs;
}
public static abstract class BaseOperator extends FluentExpression
public static abstract class BaseOperator extends FluentExp
implements SQLOperator
{
public static Function<Object, Long> INTEGRAL = new Function<Object, Long>() {