fix: apply reviews

Author: cj848

docs/en/jpql-with-kotlin-jdsl/expressions.md

@@ -220,8 +220,11 @@ length(path(Book::title))
 
 locate("Book", path(Book::title))
 
-cast(path(Book::price), String::class)
-cast<String>(path(Book::price))
+cast(path(Book::price)).asString()
+cast(path(Book::authorId)).asInt()
+cast(path(Book::authorId)).asLong()
+cast(path(Book::authorId)).asDouble()
+cast(path(Book::authorId)).asFloat()
 
 left(path(Book::title), 3)
 left(path(Book::title), literal(3))
@@ -230,6 +233,10 @@ right(path(Book::title), 3)
 right(path(Book::title), literal(3))
 
 replace(path(Book::title), "old", "new")
+replace(path(Book::title), stringLiteral("old"), "new")
+replace(path(Book::title), path(Book::name), "new")
+replace(path(Book::title), "old", stringLiteral("new"))
+replace(path(Book::title), "old", path(Book::name))
 replace(path(Book::title), literal("old"), literal("new"))
 ```
 

docs/ko/jpql-with-kotlin-jdsl/expressions.md

@@ -218,8 +218,11 @@ length(path(Book::title))
 
 locate("Book", path(Book::title))
 
-cast(path(Book::price), String::class)
-cast<String>(path(Book::price))
+cast(path(Book::price)).asString()
+cast(path(Book::authorId)).asInt()
+cast(path(Book::authorId)).asLong()
+cast(path(Book::authorId)).asDouble()
+cast(path(Book::authorId)).asFloat()
 
 left(path(Book::title), 3)
 left(path(Book::title), literal(3))
@@ -228,6 +231,10 @@ right(path(Book::title), 3)
 right(path(Book::title), literal(3))
 
 replace(path(Book::title), "old", "new")
+replace(path(Book::title), stringLiteral("old"), "new")
+replace(path(Book::title), path(Book::name), "new")
+replace(path(Book::title), "old", stringLiteral("new"))
+replace(path(Book::title), "old", path(Book::name))
 replace(path(Book::title), literal("old"), literal("new"))
 ```
 

dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/Jpql.kt

@@ -5,9 +5,13 @@ import com.linecorp.kotlinjdsl.dsl.jpql.delete.DeleteQueryWhereStep
 import com.linecorp.kotlinjdsl.dsl.jpql.delete.impl.DeleteQueryDsl
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.CaseThenFirstStep
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.CaseValueWhenFirstStep
+import com.linecorp.kotlinjdsl.dsl.jpql.expression.CastStep
+import com.linecorp.kotlinjdsl.dsl.jpql.expression.StringCastStep
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.TrimFromStep
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.impl.CaseThenFirstStepDsl
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.impl.CaseValueWhenFirstStepDsl
+import com.linecorp.kotlinjdsl.dsl.jpql.expression.impl.JpqlCastStep
+import com.linecorp.kotlinjdsl.dsl.jpql.expression.impl.JpqlStringCastStep
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.impl.TrimBothFromStepDsl
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.impl.TrimFromStepDsl
 import com.linecorp.kotlinjdsl.dsl.jpql.expression.impl.TrimLeadingFromStepDsl
@@ -1706,19 +1710,19 @@ open class Jpql : JpqlDsl {
     }
 
     /**
-     * Creates an expression that represents the casting of a value to a different type.
+     * Creates a step to cast a string expression to another type.
      */
     @SinceJdsl("3.6.0")
-    fun <T : Any> cast(value: Expressionable<*>, type: KClass<T>): Expression<T> {
-        return Expressions.cast(value.toExpression(), type)
+    fun cast(value: Expressionable<String>): CastStep {
+        return JpqlCastStep(value.toExpression())
     }
 
     /**
-     * Creates an expression that represents the casting of a value to a different type.
+     * Creates a step to cast a scalar expression to a string.
      */
     @SinceJdsl("3.6.0")
-    inline fun <reified T : Any> cast(value: Expressionable<*>): Expression<T> {
-        return Expressions.cast(value.toExpression(), T::class)
+    fun <T : Any> cast(value: Expressionable<T>): StringCastStep {
+        return JpqlStringCastStep(value.toExpression())
     }
 
     /**

dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/expression/CastStep.kt

@@ -0,0 +1,35 @@
+package com.linecorp.kotlinjdsl.dsl.jpql.expression
+
+import com.linecorp.kotlinjdsl.SinceJdsl
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressionable
+
+/**
+ * A step to specify the target type for a cast from a string expression.
+ * This corresponds to the BNF: CAST(string_expression AS {type})
+ */
+@SinceJdsl("3.6.0")
+interface CastStep {
+    /**
+     * Casts the expression to an INTEGER.
+     */
+    @SinceJdsl("3.6.0")
+    fun asInteger(): Expressionable<Int>
+
+    /**
+     * Casts the expression to a LONG.
+     */
+    @SinceJdsl("3.6.0")
+    fun asLong(): Expressionable<Long>
+
+    /**
+     * Casts the expression to a FLOAT.
+     */
+    @SinceJdsl("3.6.0")
+    fun asFloat(): Expressionable<Float>
+
+    /**
+     * Casts the expression to a DOUBLE.
+     */
+    @SinceJdsl("3.6.0")
+    fun asDouble(): Expressionable<Double>
+}

dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/expression/StringCastStep.kt

@@ -0,0 +1,17 @@
+package com.linecorp.kotlinjdsl.dsl.jpql.expression
+
+import com.linecorp.kotlinjdsl.SinceJdsl
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressionable
+
+/**
+ * A step to cast a scalar expression to a STRING.
+ * This corresponds to the BNF: CAST(scalar_expression AS STRING)
+ */
+@SinceJdsl("3.6.0")
+interface StringCastStep {
+    /**
+     * Casts the expression to a STRING.
+     */
+    @SinceJdsl("3.6.0")
+    fun asString(): Expressionable<String>
+}

dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/expression/impl/JpqlCastStep.kt

@@ -0,0 +1,27 @@
+package com.linecorp.kotlinjdsl.dsl.jpql.expression.impl
+
+import com.linecorp.kotlinjdsl.dsl.jpql.expression.CastStep
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressionable
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlCast
+
+@PublishedApi
+internal data class JpqlCastStep(
+    private val expression: Expression<String>,
+) : CastStep {
+    override fun asInteger(): Expressionable<Int> {
+        return JpqlCast(expression, Int::class)
+    }
+
+    override fun asLong(): Expressionable<Long> {
+        return JpqlCast(expression, Long::class)
+    }
+
+    override fun asFloat(): Expressionable<Float> {
+        return JpqlCast(expression, Float::class)
+    }
+
+    override fun asDouble(): Expressionable<Double> {
+        return JpqlCast(expression, Double::class)
+    }
+}

dsl/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/expression/impl/JpqlStringCastStep.kt

@@ -0,0 +1,15 @@
+package com.linecorp.kotlinjdsl.dsl.jpql.expression.impl
+
+import com.linecorp.kotlinjdsl.dsl.jpql.expression.StringCastStep
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expressionable
+import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlCast
+
+@PublishedApi
+internal data class JpqlStringCastStep<T : Any>(
+    private val expression: Expression<T>,
+) : StringCastStep {
+    override fun asString(): Expressionable<String> {
+        return JpqlCast(expression, String::class)
+    }
+}

dsl/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/dsl/jpql/expression/ExpressionDslTest.kt

@@ -46,10 +46,10 @@ class ExpressionDslTest : WithAssertions {
     }
 
     @Test
-    fun `cast() with a expression and a class`() {
+    fun `cast() with a string expression as Integer`() {
         // when
         val expression = queryPart {
-            cast(expression(String::class, alias1), Int::class)
+            cast(expression(String::class, alias1)).asInteger()
         }.toExpression()
 
         val actual: Expression<Int> = expression // for type check
@@ -64,18 +64,72 @@ class ExpressionDslTest : WithAssertions {
     }
 
     @Test
-    fun `inline cast() with a expression and a class`() {
+    fun `cast() with a string expression as Long`() {
         // when
         val expression = queryPart {
-            cast<Int>(expression(String::class, alias1))
+            cast(expression(String::class, alias1)).asLong()
         }.toExpression()
 
-        val actual: Expression<Int> = expression // for type check
+        val actual: Expression<Long> = expression // for type check
 
         // then
         val expected = Expressions.cast(
             Expressions.expression(String::class, alias1),
-            Int::class,
+            Long::class,
+        )
+
+        assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `cast() with a string expression as Float`() {
+        // when
+        val expression = queryPart {
+            cast(expression(String::class, alias1)).asFloat()
+        }.toExpression()
+
+        val actual: Expression<Float> = expression // for type check
+
+        // then
+        val expected = Expressions.cast(
+            Expressions.expression(String::class, alias1),
+            Float::class,
+        )
+
+        assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `cast() with a string expression as Double`() {
+        // when
+        val expression = queryPart {
+            cast(expression(String::class, alias1)).asDouble()
+        }.toExpression()
+
+        val actual: Expression<Double> = expression // for type check
+
+        // then
+        val expected = Expressions.cast(
+            Expressions.expression(String::class, alias1),
+            Double::class,
+        )
+
+        assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `cast() with scalar expression as String`() {
+        // when
+        val expression = queryPart {
+            cast(expression(Int::class, alias1)).asString()
+        }.toExpression()
+
+        val actual: Expression<String> = expression // for type check
+
+        // then
+        val expected = Expressions.cast(
+            Expressions.expression(Int::class, alias1),
+            String::class,
         )
 
         assertThat(actual).isEqualTo(expected)

query-model/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/querymodel/jpql/expression/impl/JpqlCast.kt

@@ -5,7 +5,7 @@ import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
 import kotlin.reflect.KClass
 
 @Internal
-data class JpqlCast<T : Any> internal constructor(
+data class JpqlCast<T : Any>(
     val value: Expression<*>,
     val type: KClass<T>,
 ) : Expression<T>