From aac989d3c14d3e7a0448ea492a53172bbf777566 Mon Sep 17 00:00:00 2001 From: "jonghyon.s" Date: Wed, 31 Jan 2024 10:39:14 +0900 Subject: [PATCH] style: reorder functions --- docs/en/jpql-with-kotlin-jdsl/expressions.md | 6 ++-- docs/ko/jpql-with-kotlin-jdsl/expressions.md | 6 ++-- .../com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt | 32 +++++++++---------- .../querymodel/jpql/expression/Expressions.kt | 16 +++++----- .../jpql/expression/ExpressionsTest.kt | 14 ++++---- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/en/jpql-with-kotlin-jdsl/expressions.md b/docs/en/jpql-with-kotlin-jdsl/expressions.md index cfe6bfa58..ee124dee0 100644 --- a/docs/en/jpql-with-kotlin-jdsl/expressions.md +++ b/docs/en/jpql-with-kotlin-jdsl/expressions.md @@ -225,17 +225,17 @@ Use the following functions to build arithmetic functions: * ABS (abs) * CEILING (ceiling) -* SQRT (sqrt) * ROUND (round) +* SQRT (sqrt) ```kotlin abs(path(Book::price)) ceiling(path(Book::price)) -sqrt(path(Book::price)) - round(path(Book::price), 2) + +sqrt(path(Book::price)) ``` | Function | DSL function | diff --git a/docs/ko/jpql-with-kotlin-jdsl/expressions.md b/docs/ko/jpql-with-kotlin-jdsl/expressions.md index e5dbfa6f4..e0acf2968 100644 --- a/docs/ko/jpql-with-kotlin-jdsl/expressions.md +++ b/docs/ko/jpql-with-kotlin-jdsl/expressions.md @@ -221,17 +221,17 @@ locate("Book", path(Book::title)) * ABS (abs) * CEILING (ceiling) -* SQRT (sqrt) * ROUND (round) +* SQRT (sqrt) ```kotlin abs(path(Book::price)) ceiling(path(Book::price)) -sqrt(path(Book::price)) - round(path(Book::price), 2) + +sqrt(path(Book::price)) ``` | Function | DSL function | diff --git a/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt b/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt index e4dcf3e2d..4d67fcf5c 100644 --- a/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt +++ b/dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt @@ -568,22 +568,6 @@ open class Jpql : JpqlDsl { return Expressions.ceiling(value.toExpression()) } - /** - * Creates an expression that represents the square root of value. - */ - @SinceJdsl("3.4.0") - fun sqrt(expr: KProperty1): Expression { - return Expressions.sqrt(Paths.path(expr)) - } - - /** - * Creates an expression that represents the square root of value. - */ - @SinceJdsl("3.4.0") - fun sqrt(value: Expressionable): Expression { - return Expressions.sqrt(value.toExpression()) - } - /** * Creates an expression that represents the rounding of the value to a specified scale. */ @@ -616,6 +600,22 @@ open class Jpql : JpqlDsl { return Expressions.round(value.toExpression(), scale.toExpression()) } + /** + * Creates an expression that represents the square root of value. + */ + @SinceJdsl("3.4.0") + fun sqrt(expr: KProperty1): Expression { + return Expressions.sqrt(Paths.path(expr)) + } + + /** + * Creates an expression that represents the square root of value. + */ + @SinceJdsl("3.4.0") + fun sqrt(value: Expressionable): Expression { + return Expressions.sqrt(value.toExpression()) + } + /** * Creates an expression that represents the count of non-null values. * diff --git a/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt b/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt index 4b3df31bb..39be02418 100644 --- a/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt +++ b/query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/Expressions.kt @@ -226,6 +226,14 @@ object Expressions { return JpqlCeiling(value) } + /** + * Creates an expression that represents the rounding of the specified value to a specified scale. + */ + @SinceJdsl("3.4.0") + fun round(value: Expression, scale: Expression): Expression { + return JpqlRound(value, scale) + } + /** * Creates an expression that represents the square root of the value. */ @@ -274,14 +282,6 @@ object Expressions { return JpqlAvg(distinct, expr) } - /** - * Creates an expression that represents the rounding of the specified value to a specified scale. - */ - @SinceJdsl("3.4.0") - fun round(value: Expression, scale: Expression): Expression { - return JpqlRound(value, scale) - } - /** * Creates an expression that represents the sum of values. * diff --git a/query-model/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/ExpressionsTest.kt b/query-model/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/ExpressionsTest.kt index 5d26774bb..b06ae991f 100644 --- a/query-model/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/ExpressionsTest.kt +++ b/query-model/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/ExpressionsTest.kt @@ -363,12 +363,13 @@ class ExpressionsTest : WithAssertions { } @Test - fun sqrt() { + fun round() { // when - val actual = Expressions.sqrt(intExpression1) + val actual = Expressions.round(bigDecimalExpression1, intExpression1) // then - val expected = JpqlSqrt( + val expected = JpqlRound( + bigDecimalExpression1, intExpression1, ) @@ -376,13 +377,12 @@ class ExpressionsTest : WithAssertions { } @Test - fun round() { + fun sqrt() { // when - val actual = Expressions.round(bigDecimalExpression1, intExpression1) + val actual = Expressions.sqrt(intExpression1) // then - val expected = JpqlRound( - bigDecimalExpression1, + val expected = JpqlSqrt( intExpression1, )