diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Ops.java b/querydsl-core/src/main/java/com/mysema/query/types/Ops.java index bc38a7dec..9ec89f25c 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Ops.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Ops.java @@ -42,30 +42,30 @@ public final class Ops { // general public static final Operator EQ = new OperatorImpl("EQ",OBJECT_X_2); - public static final Operator IS_NOT_NULL = new OperatorImpl("IS_NOT_NULL",Object.class); - public static final Operator IS_NULL = new OperatorImpl("IS_NULL",Object.class); - public static final Operator INSTANCE_OF = new OperatorImpl("INSTANCE_OF"); public static final Operator NE = new OperatorImpl("NE",OBJECT_X_2); - public static final Operator NUMCAST = new OperatorImpl("NUMCAST"); - public static final Operator STRING_CAST = new OperatorImpl("STING_CAST",Object.class); - public static final Operator ALIAS = new OperatorImpl("ALIAS"); - public static final Operator LIST = new OperatorImpl("LIST"); + public static final Operator IS_NULL = new OperatorImpl("IS_NULL",Object.class); + public static final Operator IS_NOT_NULL = new OperatorImpl("IS_NOT_NULL",Object.class); + public static final Operator INSTANCE_OF = new OperatorImpl("INSTANCE_OF"); + public static final Operator NUMCAST = new OperatorImpl("NUMCAST"); + public static final Operator STRING_CAST = new OperatorImpl("STING_CAST",Object.class); + public static final Operator ALIAS = new OperatorImpl("ALIAS"); + public static final Operator LIST = new OperatorImpl("LIST"); public static final Operator ORDINAL = new OperatorImpl("ORDINAL"); - public static final Operator DELEGATE = new OperatorImpl("DELEGATE"); - public static final Operator WRAPPED = new OperatorImpl("WRAPPED"); + public static final Operator DELEGATE = new OperatorImpl("DELEGATE"); + public static final Operator WRAPPED = new OperatorImpl("WRAPPED"); // collection public static final Operator IN = new OperatorImpl("IN",OBJECT_X_2); // cmp. contains public static final Operator COL_IS_EMPTY = new OperatorImpl("COL_IS_EMPTY",Object.class); - public static final Operator COL_SIZE = new OperatorImpl("COL_SIZE",Object.class); + public static final Operator COL_SIZE = new OperatorImpl("COL_SIZE",Object.class); // array - public static final Operator ARRAY_SIZE = new OperatorImpl("ARRAY_SIZE",Object.class); + public static final Operator ARRAY_SIZE = new OperatorImpl("ARRAY_SIZE",Object.class); // map public static final Operator CONTAINS_KEY = new OperatorImpl("CONTAINS_KEY",OBJECT_X_2); public static final Operator CONTAINS_VALUE = new OperatorImpl("CONTAINS_VALUE",OBJECT_X_2); - public static final Operator MAP_SIZE = new OperatorImpl("MAP_SIZE",Object.class); + public static final Operator MAP_SIZE = new OperatorImpl("MAP_SIZE",Object.class); public static final Operator MAP_IS_EMPTY = new OperatorImpl("MAP_IS_EMPTY",Object.class); // Boolean @@ -82,36 +82,30 @@ public final class Ops { public static final Operator LOE = new OperatorImpl("LOE",COMPARABLE_X_2); public static final Operator LT = new OperatorImpl("LT",COMPARABLE_X_2); - // Date / Comparable -// public static final Operator AFTER = new OperatorImpl("AFTER",COMPARABLE_X_2); -// public static final Operator BEFORE = new OperatorImpl("BEFORE",COMPARABLE_X_2); -// public static final Operator AOE = new OperatorImpl("AOE",COMPARABLE_X_2); -// public static final Operator BOE = new OperatorImpl("BOE",COMPARABLE_X_2); - // Number - public static final Operator NEGATE = new OperatorImpl("NEGATE",Number.class); - public static final Operator ADD = new OperatorImpl("ADD",NUMBER_X_2); - public static final Operator DIV = new OperatorImpl("DIV",NUMBER_X_2); - public static final Operator MULT = new OperatorImpl("MULT",NUMBER_X_2); - public static final Operator SUB = new OperatorImpl("SUB",NUMBER_X_2); - public static final Operator MOD = new OperatorImpl("MOD",NUMBER_X_2); + public static final Operator NEGATE = new OperatorImpl("NEGATE",Number.class); + public static final Operator ADD = new OperatorImpl("ADD",NUMBER_X_2); + public static final Operator DIV = new OperatorImpl("DIV",NUMBER_X_2); + public static final Operator MULT = new OperatorImpl("MULT",NUMBER_X_2); + public static final Operator SUB = new OperatorImpl("SUB",NUMBER_X_2); + public static final Operator MOD = new OperatorImpl("MOD",NUMBER_X_2); // String public static final Operator CHAR_AT = new OperatorImpl("CHAR_AT"); - public static final Operator CONCAT = new OperatorImpl("CONCAT",STRING_X_2); - public static final Operator LOWER = new OperatorImpl("LOWER",String.class); - public static final Operator SUBSTR_1ARG = new OperatorImpl("SUBSTR"); - public static final Operator SUBSTR_2ARGS = new OperatorImpl("SUBSTR2"); - public static final Operator TRIM = new OperatorImpl("TRIM",String.class); - public static final Operator UPPER = new OperatorImpl("UPPER",String.class); + public static final Operator CONCAT = new OperatorImpl("CONCAT",STRING_X_2); + public static final Operator LOWER = new OperatorImpl("LOWER",String.class); + public static final Operator SUBSTR_1ARG = new OperatorImpl("SUBSTR"); + public static final Operator SUBSTR_2ARGS = new OperatorImpl("SUBSTR2"); + public static final Operator TRIM = new OperatorImpl("TRIM",String.class); + public static final Operator UPPER = new OperatorImpl("UPPER",String.class); public static final Operator MATCHES = new OperatorImpl("MATCHES",STRING_X_2); public static final Operator MATCHES_IC = new OperatorImpl("MATCHES_IC",STRING_X_2); - public static final Operator STRING_LENGTH = new OperatorImpl("STRING_LENGTH",String.class); + public static final Operator STRING_LENGTH = new OperatorImpl("STRING_LENGTH",String.class); public static final Operator STRING_IS_EMPTY = new OperatorImpl("STRING_IS_EMPTY",String.class); public static final Operator STARTS_WITH = new OperatorImpl("STARTS_WITH",STRING_X_2); public static final Operator STARTS_WITH_IC = new OperatorImpl("STATS_WITH_IC",STRING_X_2); - public static final Operator INDEX_OF_2ARGS = new OperatorImpl("INDEX_OF2"); - public static final Operator INDEX_OF = new OperatorImpl("INDEX_OF"); + public static final Operator INDEX_OF_2ARGS = new OperatorImpl("INDEX_OF2"); + public static final Operator INDEX_OF = new OperatorImpl("INDEX_OF"); public static final Operator EQ_IGNORE_CASE = new OperatorImpl("EQ_IGNORE_CASE",STRING_X_2); public static final Operator ENDS_WITH = new OperatorImpl("ENDS_WITH",STRING_X_2); public static final Operator ENDS_WITH_IC = new OperatorImpl("ENDS_WITH_IC",STRING_X_2); @@ -121,17 +115,17 @@ public final class Ops { public static final Operator LIKE_ESCAPE = new OperatorImpl("LIKE_ESCAPE",STRING_X_3); // case - public static final Operator CASE = new OperatorImpl("CASE",Object.class); - public static final Operator CASE_WHEN = new OperatorImpl("CASE_WHEN"); - public static final Operator CASE_ELSE = new OperatorImpl("CASE_ELSE",Object.class); + public static final Operator CASE = new OperatorImpl("CASE",Object.class); + public static final Operator CASE_WHEN = new OperatorImpl("CASE_WHEN"); + public static final Operator CASE_ELSE = new OperatorImpl("CASE_ELSE",Object.class); // case for eq - public static final Operator CASE_EQ = new OperatorImpl("CASE_EQ",Object.class); - public static final Operator CASE_EQ_WHEN = new OperatorImpl("CASE_EQ_WHEN"); - public static final Operator CASE_EQ_ELSE = new OperatorImpl("CASE_EQ_ELSE",Object.class); + public static final Operator CASE_EQ = new OperatorImpl("CASE_EQ",Object.class); + public static final Operator CASE_EQ_WHEN = new OperatorImpl("CASE_EQ_WHEN"); + public static final Operator CASE_EQ_ELSE = new OperatorImpl("CASE_EQ_ELSE",Object.class); // coalesce - public static final Operator COALESCE = new OperatorImpl("COALESCE",Object.class); + public static final Operator COALESCE = new OperatorImpl("COALESCE",Object.class); // subquery operations public static final Operator EXISTS = new OperatorImpl("EXISTS",Object.class); @@ -143,7 +137,7 @@ public final class Ops { public static final List> compareOps = unmodifiableList(Arrays.> asList(EQ, NE, LT, GT, GOE, LOE)); /** - * Aggreation operators + * Aggregation operators */ @SuppressWarnings("unchecked") public static final class AggOps{ @@ -156,6 +150,20 @@ public final class Ops { public static final Operator COUNT_ALL_AGG = new OperatorImpl("COUNT_ALL_AGG"); private AggOps() {} } + + /** + * Quantification operators + */ + @SuppressWarnings("unchecked") + public static final class QuantOps { + public static final Operator AVG_IN_COL = new OperatorImpl("AVG_IN_COL",Collection.class); + public static final Operator MAX_IN_COL = new OperatorImpl("MAX_IN_COL",Collection.class); + public static final Operator MIN_IN_COL = new OperatorImpl("MIN_IN_COL",Collection.class); + + public static final Operator ANY = new OperatorImpl("ANY",Object.class); + public static final Operator ALL = new OperatorImpl("ALL",Object.class); + private QuantOps() {} + } /** * Date and time operators @@ -224,29 +232,11 @@ public final class Ops { public static final Operator RPAD = new OperatorImpl("RPAD",String.class, Integer.class); public static final Operator LPAD2 = new OperatorImpl("LPAD2",String.class, Integer.class, Character.class); public static final Operator RPAD2 = new OperatorImpl("RPAD2",String.class, Integer.class, Character.class); - public static final Operator SPLIT = new OperatorImpl("SPLIT",STRING_X_2); public static final Operator LOCATE = new OperatorImpl("LOCATE", STRING_X_2); public static final Operator LOCATE2 = new OperatorImpl("LOCATE2", String.class, String.class, Integer.class); private StringOps() {} } - /** - * Quantification operators - */ - @SuppressWarnings("unchecked") - public static final class QuantOps { - public static final Operator AVG_IN_COL = new OperatorImpl("AVG_IN_COL",Collection.class); - public static final Operator MAX_IN_COL = new OperatorImpl("MAX_IN_COL",Collection.class); - public static final Operator MIN_IN_COL = new OperatorImpl("MIN_IN_COL",Collection.class); - - // some / any = true for any - // all = true for all - // exists = true is subselect matches - // not exists = true if subselect doesn't match - public static final Operator ANY = new OperatorImpl("ANY",Object.class); - public static final Operator ALL = new OperatorImpl("ALL",Object.class); - private QuantOps() {} - } private Ops() {} } diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Templates.java b/querydsl-core/src/main/java/com/mysema/query/types/Templates.java index 6206e5651..d82f1631b 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Templates.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Templates.java @@ -71,11 +71,6 @@ public class Templates { add(Ops.LOE, "{0} <= {1}", 22); add(Ops.LT, "{0} < {1}", 23); -// add(Ops.AFTER, "{0} > {1}", 21); -// add(Ops.BEFORE, "{0} < {1}", 23); -// add(Ops.AOE, "{0} >= {1}", 21); -// add(Ops.BOE, "{0} <= {1}", 23); - // numeric add(Ops.NEGATE, "-{0}", 6); add(Ops.ADD, "{0} + {1}", 13); @@ -124,7 +119,6 @@ public class Templates { add(Ops.StringOps.LTRIM, "ltrim({0})"); add(Ops.StringOps.RTRIM, "rtrim({0})"); - add(Ops.StringOps.SPLIT, "split({0},{1})"); add(Ops.StringOps.LOCATE, "locate({0},{1})"); add(Ops.StringOps.LOCATE2, "locate({0},{1},{2s})"); add(Ops.StringOps.LPAD, "lpad({0},{1})"); diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpression.java index a7f9a4f09..77df29ac5 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpression.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpression.java @@ -524,17 +524,6 @@ public abstract class StringExpression extends ComparableExpression { return prepend(ConstantImpl.create(str)); } - /** - * Split the given String with regex as the matcher for the separator - * - * @param regex - * @return this.split(regex) - * @see java.lang.String#split(String) - */ - public SimpleExpression split(String regex) { - return SimpleOperation.create(String[].class, Ops.StringOps.SPLIT, this, ConstantImpl.create(regex)); - } - /** * Return true if this starts with str * diff --git a/querydsl-core/src/test/java/com/mysema/query/StringConstant.java b/querydsl-core/src/test/java/com/mysema/query/StringConstant.java index 7250f5ee9..78e7373b4 100644 --- a/querydsl-core/src/test/java/com/mysema/query/StringConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/StringConstant.java @@ -149,11 +149,6 @@ final class StringConstant extends StringExpression implements Constant{ return new StringConstant(s + constant); } - @Override - public SimpleExpression split(String regex) { - return SimpleConstant.create(constant.split(regex)); - } - @Override public StringExpression substring(int beginIndex) { return new StringConstant(constant.substring(beginIndex));