reverted asExpr() form

This commit is contained in:
Timo Westkämper 2010-07-11 13:04:21 +00:00
parent 7959498591
commit d488f33cb2
8 changed files with 18 additions and 24 deletions

View File

@ -7,8 +7,6 @@ package com.mysema.query.types;
import java.util.List;
import com.mysema.query.types.expr.ESimple;
/**
* Custom provides base types for custom expressions with integrated
* serialization templates
@ -18,6 +16,13 @@ import com.mysema.query.types.expr.ESimple;
*/
public interface Custom<T> {
/**
* Cast to {@link Expr}
*
* @return
*/
Expr<T> asExpr();
/**
* Get the argument with the given index
*
@ -45,11 +50,4 @@ public interface Custom<T> {
*/
Class<? extends T> getType();
/**
* Cast to {@link Expr}
*
* @return
*/
ESimple<T> asExpr();
}

View File

@ -7,8 +7,6 @@ package com.mysema.query.types;
import java.util.List;
import com.mysema.query.types.expr.ESimple;
/**
* Operation represents an operation with operator and arguments
*
@ -22,7 +20,7 @@ public interface Operation<RT> {
*
* @return
*/
ESimple<RT> asExpr();
Expr<RT> asExpr();
/**
* Get the argument with the given index

View File

@ -8,7 +8,6 @@ package com.mysema.query.types;
import java.lang.reflect.AnnotatedElement;
import com.mysema.query.types.expr.EBoolean;
import com.mysema.query.types.expr.ESimple;
/**
* Path represents a path expression
@ -22,7 +21,7 @@ public interface Path<C> {
*
* @return
*/
ESimple<C> asExpr();
Expr<C> asExpr();
/**
* Get the metadata for this path

View File

@ -7,7 +7,6 @@ package com.mysema.query.types;
import com.mysema.query.QueryMetadata;
import com.mysema.query.types.expr.EBoolean;
import com.mysema.query.types.expr.ESimple;
import com.mysema.query.types.query.Detachable;
/**
@ -48,6 +47,6 @@ public interface SubQuery<T>{
*
* @return
*/
ESimple<T> asExpr();
Expr<T> asExpr();
}

View File

@ -24,7 +24,7 @@ public final class CustomMixin<T> implements Custom<T>, Serializable {
private static final long serialVersionUID = 6951623726800809083L;
private final ESimple<T> self;
private final Expr<T> self;
private final List<Expr<?>> args;
@ -76,7 +76,7 @@ public final class CustomMixin<T> implements Custom<T>, Serializable {
}
@Override
public ESimple<T> asExpr() {
public Expr<T> asExpr() {
return self;
}
}

View File

@ -26,7 +26,7 @@ public final class OperationMixin<RT> implements Operation<RT>, Serializable {
private final Operator<? super RT> operator;
private final ESimple<RT> self;
private final Expr<RT> self;
public OperationMixin(Operation<RT> self, Operator<? super RT> operator, List<Expr<?>> args){
this.self = self.asExpr();
@ -35,7 +35,7 @@ public final class OperationMixin<RT> implements Operation<RT>, Serializable {
}
@Override
public ESimple<RT> asExpr() {
public Expr<RT> asExpr() {
return self;
}

View File

@ -39,7 +39,7 @@ public final class PathMixin<T> implements Path<T>, Serializable {
private final Path<?> root;
private final ESimple<T> self;
private final Expr<T> self;
@Nullable
private AnnotatedElement annotatedElement;
@ -51,7 +51,7 @@ public final class PathMixin<T> implements Path<T>, Serializable {
}
@Override
public ESimple<T> asExpr() {
public Expr<T> asExpr() {
return self;
}

View File

@ -28,7 +28,7 @@ public class SubQueryMixin<T> implements SubQuery<T>{
private final QueryMetadata metadata;
private final ESimple<T> self;
private final Expr<T> self;
public SubQueryMixin(SubQuery<T> self, QueryMetadata metadata){
this.self = self.asExpr();
@ -70,7 +70,7 @@ public class SubQueryMixin<T> implements SubQuery<T>{
}
@Override
public ESimple<T> asExpr() {
public Expr<T> asExpr() {
return self;
}