From f21caa07556758fe9e70b6495368fc64af982aa5 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 20:34:04 +1200 Subject: [PATCH] Remove deprecated ExpressionList.setOrderBy() - migrate to orderBy() Migrate to `.orderBy(String orderBy)` ```java /** * Deprecated migrate to {@link #orderBy(String)} */ @Deprecated Query setOrderBy(String orderBy); ``` --- ebean-api/src/main/java/io/ebean/ExpressionList.java | 6 ------ .../server/expression/DefaultExpressionList.java | 5 ----- .../ebeaninternal/server/expression/JunctionExpression.java | 5 ----- 3 files changed, 16 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java index 29040fcbae..ec1e36c316 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionList.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java @@ -95,12 +95,6 @@ public interface ExpressionList { */ OrderBy orderBy(); - /** - * Deprecated migrate to {@link #orderBy(String)} - */ - @Deprecated - Query setOrderBy(String orderBy); - /** * Apply the path properties to the query replacing the select and fetch clauses. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java index 3a015e0faf..fffa19d096 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java @@ -312,11 +312,6 @@ public ExpressionList orderBy(String orderBy) { return this; } - @Override - public Query setOrderBy(String orderBy) { - return query.order(orderBy); - } - @Override public Query orderById(boolean orderById) { return query.orderById(orderById); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java index 87d6ae3310..05268588b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java @@ -980,11 +980,6 @@ public ExpressionList setMaxRows(int maxRows) { return exprList.setMaxRows(maxRows); } - @Override - public Query setOrderBy(String orderBy) { - return exprList.setOrderBy(orderBy); - } - @Override public Query setUseCache(boolean useCache) { return exprList.setUseCache(useCache);