From eb85931fe2311f72a2031c17e31580c0e41cdfbe Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Wed, 16 Dec 2015 08:11:32 +1300 Subject: [PATCH] #500 - Change raw(String, Object[]) expression to varargs raw(String, Object...) --- src/main/java/com/avaje/ebean/ExpressionList.java | 2 +- .../ebeaninternal/server/expression/JunctionExpression.java | 2 +- .../com/avaje/ebeaninternal/util/DefaultExpressionList.java | 2 +- src/test/java/com/avaje/tests/query/TestWhereRawClause.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java index f5b6e002a..309190b4d 100644 --- a/src/main/java/com/avaje/ebean/ExpressionList.java +++ b/src/main/java/com/avaje/ebean/ExpressionList.java @@ -785,7 +785,7 @@ public interface ExpressionList extends Serializable { * qualified) will still be translated to their physical name. *

*/ - ExpressionList raw(String raw, Object[] values); + ExpressionList raw(String raw, Object... values); /** * Add raw expression with no parameters. diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java index 85168ca5a..08916044c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java @@ -572,7 +572,7 @@ abstract class JunctionExpression implements Junction, SpiExpression, Expr } @Override - public ExpressionList raw(String raw, Object[] values) { + public ExpressionList raw(String raw, Object... values) { return exprList.raw(raw, values); } diff --git a/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java b/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java index f50c146de..7715da72c 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java +++ b/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java @@ -696,7 +696,7 @@ public class DefaultExpressionList implements SpiExpressionList { } @Override - public ExpressionList raw(String raw, Object[] values) { + public ExpressionList raw(String raw, Object... values) { add(expr.raw(raw, values)); return this; } diff --git a/src/test/java/com/avaje/tests/query/TestWhereRawClause.java b/src/test/java/com/avaje/tests/query/TestWhereRawClause.java index d155599ec..5aa648d65 100644 --- a/src/test/java/com/avaje/tests/query/TestWhereRawClause.java +++ b/src/test/java/com/avaje/tests/query/TestWhereRawClause.java @@ -33,7 +33,7 @@ public class TestWhereRawClause extends BaseTestCase { .ne("id", 42) .raw("orderQty < ?", 100) .gt("id", 1) - .raw("unitPrice > ? and product.id > ?", new Object[]{2,3}) + .raw("unitPrice > ? and product.id > ?", 2, 3) .findList(); }