This commit is contained in:
Timo Westkämper 2009-05-26 14:24:59 +00:00
parent 90113607b2
commit 079b22f296
20 changed files with 47 additions and 49 deletions

View File

@ -23,8 +23,8 @@ import com.mysema.query.types.expr.EArrayConstructor;
import com.mysema.query.types.expr.EConstant;
import com.mysema.query.types.expr.EConstructor;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Op;
import com.mysema.query.types.operation.Operation;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.path.Path;
import com.mysema.query.types.path.PathMetadata.PathType;
import com.mysema.query.types.quant.Quant;

View File

@ -8,8 +8,8 @@ package com.mysema.query.serialization;
import java.util.HashMap;
import java.util.Map;
import com.mysema.query.types.operation.Op;
import com.mysema.query.types.operation.Ops;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Ops.OpNumberAgg;
import com.mysema.query.types.path.PathMetadata;
import com.mysema.query.types.path.PathMetadata.PathType;

View File

@ -5,7 +5,7 @@ import com.mysema.query.types.expr.EComparable;
import com.mysema.query.types.expr.ENumber;
import com.mysema.query.types.expr.EString;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Op;
/**
* @author tiwe

View File

@ -11,7 +11,7 @@ import com.mysema.query.types.operation.OComparable;
import com.mysema.query.types.operation.ONumber;
import com.mysema.query.types.operation.OString;
import com.mysema.query.types.operation.OStringArray;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Op;
public class SimpleOperationFactory implements OperationFactory {

View File

@ -12,8 +12,8 @@ import com.mysema.query.types.alias.AToPath;
import com.mysema.query.types.custom.Custom;
import com.mysema.query.types.expr.EConstant;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Op;
import com.mysema.query.types.operation.Operation;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.path.Path;
import com.mysema.query.types.quant.Quant;

View File

@ -11,7 +11,6 @@ import java.util.List;
import com.mysema.query.types.expr.EBoolean;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
/**
* @author tiwe

View File

@ -11,7 +11,6 @@ import java.util.List;
import com.mysema.query.types.expr.EComparable;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
/**
* @author tiwe

View File

@ -11,7 +11,6 @@ import java.util.List;
import com.mysema.query.types.expr.ENumber;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
/**
* @author tiwe

View File

@ -11,7 +11,6 @@ import java.util.List;
import com.mysema.query.types.expr.ESimple;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
/**
* @author tiwe

View File

@ -11,7 +11,6 @@ import java.util.List;
import com.mysema.query.types.expr.EString;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
/**
* @author tiwe

View File

@ -10,7 +10,6 @@ import java.util.Collections;
import java.util.List;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
/**
* @author tiwe

View File

@ -0,0 +1,30 @@
package com.mysema.query.types.operation;
import static java.util.Collections.unmodifiableList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* The Class Op represents an Operator symbol.
*/
public class Op<RT> {
private final List<Class<?>> types;
public Op(Class<?> type) {
this(Collections.<Class<?>> singletonList(type));
}
public Op(Class<?>... types) {
this(Arrays.<Class<?>> asList(types));
}
public Op(List<Class<?>> types) {
this.types = unmodifiableList(types);
}
public List<Class<?>> getTypes() {
return types;
}
}

View File

@ -8,7 +8,6 @@ package com.mysema.query.types.operation;
import java.util.List;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
/**
* Operation represents an operation with operator and arguments

View File

@ -31,29 +31,6 @@ public interface Ops {
static List<Class<?>> String_x_2 = unmodifiableList(Arrays.<Class<?>> asList(String.class, String.class));
/**
* The Class Op.
*/
public static class Op<RT> {
private final List<Class<?>> types;
public Op(Class<?> type) {
this(Collections.<Class<?>> singletonList(type));
}
public Op(Class<?>... types) {
this(Arrays.<Class<?>> asList(types));
}
public Op(List<Class<?>> types) {
this.types = unmodifiableList(types);
}
public List<Class<?>> getTypes() {
return types;
}
}
// general
Op<Boolean> EQ_PRIMITIVE = new Op<Boolean>(Object_x_2);
Op<Boolean> EQ_OBJECT = new Op<Boolean>(Object_x_2);
@ -68,6 +45,8 @@ public interface Ops {
// collection
Op<Boolean> COL_ISEMPTY = new Op<Boolean>(Object.class);
Op<Boolean> COL_ISNOTEMPTY = new Op<Boolean>(Object.class);
// map
Op<Boolean> MAP_ISEMPTY = new Op<Boolean>(Object.class);
Op<Boolean> MAP_ISNOTEMPTY = new Op<Boolean>(Object.class);
@ -130,15 +109,11 @@ public interface Ops {
// subquery operations
Op<Boolean> EXISTS = new Op<Boolean>(Object.class);
public static final List<Op<?>> equalsOps = Collections
.unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE));
public static final List<Op<?>> equalsOps = Collections.unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE));
public static final List<Op<?>> notEqualsOps = Collections
.unmodifiableList(Arrays.<Op<?>> asList(NE_OBJECT, NE_PRIMITIVE));
public static final List<Op<?>> notEqualsOps = Collections.unmodifiableList(Arrays.<Op<?>> asList(NE_OBJECT, NE_PRIMITIVE));
public static final List<Op<?>> compareOps = Collections
.unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE,
LT, GT, GOE, LOE));
public static final List<Op<?>> compareOps = Collections.unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE,LT, GT, GOE, LOE));
/**
* Aggreate operators

View File

@ -11,7 +11,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import com.mysema.query.types.ExprFactory;
import com.mysema.query.types.SimpleExprFactory;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops;
import com.mysema.query.types.operation.Op;
/**
* PathMetadata provides metadata for Path expressions.
@ -151,7 +151,7 @@ public final class PathMetadata<T> {
/**
* The Class PathType.
*/
public static class PathType extends Ops.Op<Path<?>> {
public static class PathType extends Op<Path<?>> {
private final String symbol;
public PathType(String symbol) {

View File

@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
import com.mysema.query.types.CollectionType;
import com.mysema.query.types.expr.EBoolean;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Op;
/**
* The Class Boolean.

View File

@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
import com.mysema.query.types.CollectionType;
import com.mysema.query.types.expr.EComparable;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Op;
/**
* The Class Comparable.

View File

@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
import com.mysema.query.types.CollectionType;
import com.mysema.query.types.expr.ENumber;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Op;
/**
* @author tiwe

View File

@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
import com.mysema.query.types.CollectionType;
import com.mysema.query.types.expr.ESimple;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Op;
/**
* The Class Simple.

View File

@ -6,7 +6,7 @@
package com.mysema.query.types.quant;
import com.mysema.query.types.expr.Expr;
import com.mysema.query.types.operation.Ops.Op;
import com.mysema.query.types.operation.Op;
/**
* Quant provides expressions for quantification.