fix: apply reviews

Author: cj848

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

@@ -1725,32 +1725,32 @@ open class Jpql : JpqlDsl {
      * Creates an expression that returns the leftmost count characters from a string.
      */
     @SinceJdsl("3.6.0")
-    fun left(value: Expressionable<String>, count: Expressionable<Int>): Expression<String> {
-        return Expressions.left(value.toExpression(), count.toExpression())
+    fun left(value: Expressionable<String>, len: Expressionable<Int>): Expression<String> {
+        return Expressions.left(value.toExpression(), len.toExpression())
     }
 
     /**
      * Creates an expression that returns the leftmost count characters from a string.
      */
     @SinceJdsl("3.6.0")
-    fun left(value: Expressionable<String>, count: Int): Expression<String> {
-        return Expressions.left(value.toExpression(), intLiteral(count))
+    fun left(value: Expressionable<String>, len: Int): Expression<String> {
+        return left(value.toExpression(), intLiteral(len))
     }
 
     /**
      * Creates an expression that returns the rightmost count characters from a string.
      */
     @SinceJdsl("3.6.0")
-    fun right(value: Expressionable<String>, count: Expressionable<Int>): Expression<String> {
-        return Expressions.right(value.toExpression(), count.toExpression())
+    fun right(value: Expressionable<String>, len: Expressionable<Int>): Expression<String> {
+        return Expressions.right(value.toExpression(), len.toExpression())
     }
 
     /**
      * Creates an expression that returns the rightmost count characters from a string.
      */
     @SinceJdsl("3.6.0")
-    fun right(value: Expressionable<String>, count: Int): Expression<String> {
-        return Expressions.right(value.toExpression(), intLiteral(count))
+    fun right(value: Expressionable<String>, len: Int): Expression<String> {
+        return right(value.toExpression(), intLiteral(len))
     }
 
     /**
@@ -1759,10 +1759,22 @@ open class Jpql : JpqlDsl {
     @SinceJdsl("3.6.0")
     fun replace(
         value: Expressionable<String>,
-        search: Expressionable<String>,
+        substring: Expressionable<String>,
         replacement: Expressionable<String>,
     ): Expression<String> {
-        return Expressions.replace(value.toExpression(), search.toExpression(), replacement.toExpression())
+        return Expressions.replace(value.toExpression(), substring.toExpression(), replacement.toExpression())
+    }
+
+    /**
+     * Creates an expression that replaces all occurrences of a search string with a replacement string.
+     */
+    @SinceJdsl("3.6.0")
+    fun replace(
+        value: Expressionable<String>,
+        substring: String,
+        replacement: String,
+    ): Expression<String> {
+        return replace(value.toExpression(), stringLiteral(substring), stringLiteral(replacement))
     }
 
     /**
@@ -1771,10 +1783,22 @@ open class Jpql : JpqlDsl {
     @SinceJdsl("3.6.0")
     fun replace(
         value: Expressionable<String>,
-        search: String,
+        substring: Expressionable<String>,
         replacement: String,
     ): Expression<String> {
-        return Expressions.replace(value.toExpression(), stringLiteral(search), stringLiteral(replacement))
+        return replace(value.toExpression(), substring, stringLiteral(replacement))
+    }
+
+    /**
+     * Creates an expression that replaces all occurrences of a search string with a replacement string.
+     */
+    @SinceJdsl("3.6.0")
+    fun replace(
+        value: Expressionable<String>,
+        substring: String,
+        replacement: Expressionable<String>,
+    ): Expression<String> {
+        return replace(value.toExpression(), substring, replacement)
     }
 
     /**

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

@@ -739,16 +739,24 @@ object Expressions {
      * Creates an expression that returns the leftmost count characters from a string.
      */
     @SinceJdsl("3.6.0")
-    fun left(value: Expression<String>, count: Expression<Int>): Expression<String> {
-        return JpqlLeft(value, count)
+    fun left(value: Expression<String>, len: Expression<Int>): Expression<String> {
+        return JpqlLeft(value, len)
+    }
+
+    /**
+     * Creates an expression that returns the leftmost count characters from a string.
+     */
+    @SinceJdsl("3.6.0")
+    fun left(value: Expression<String>, len: Int): Expression<String> {
+        return left(value, intLiteral(len))
     }
 
     /**
      * Creates an expression that returns the rightmost count characters from a string.
      */
     @SinceJdsl("3.6.0")
-    fun right(value: Expression<String>, count: Expression<Int>): Expression<String> {
-        return JpqlRight(value, count)
+    fun right(value: Expression<String>, len: Expression<Int>): Expression<String> {
+        return JpqlRight(value, len)
     }
 
     /**
@@ -757,10 +765,10 @@ object Expressions {
     @SinceJdsl("3.6.0")
     fun replace(
         value: Expression<String>,
-        search: Expression<String>,
+        substring: Expression<String>,
         replacement: Expression<String>,
     ): Expression<String> {
-        return JpqlReplace(value, search, replacement)
+        return JpqlReplace(value, substring, replacement)
     }
 
     /**

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

@@ -1,10 +1,10 @@
 package com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl
 
-import com.linecorp.kotlinjdsl.SinceJdsl
+import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
 import kotlin.reflect.KClass
 
-@SinceJdsl("3.6.0")
+@Internal
 data class JpqlCast<T : Any> internal constructor(
     val value: Expression<*>,
     val type: KClass<T>,

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

@@ -1,9 +1,9 @@
 package com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl
 
-import com.linecorp.kotlinjdsl.SinceJdsl
+import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
 
-@SinceJdsl("3.6.0")
+@Internal
 data class JpqlLeft internal constructor(
     val value: Expression<String>,
     val length: Expression<Int>,

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

@@ -1,11 +1,11 @@
 package com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl
 
-import com.linecorp.kotlinjdsl.SinceJdsl
+import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
 
-@SinceJdsl("3.6.0")
+@Internal
 data class JpqlReplace internal constructor(
     val value: Expression<String>,
-    val pattern: Expression<String>,
+    val substring: Expression<String>,
     val replacement: Expression<String>,
 ) : Expression<String>

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

@@ -1,9 +1,9 @@
 package com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl
 
-import com.linecorp.kotlinjdsl.SinceJdsl
+import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.Expression
 
-@SinceJdsl("3.6.0")
+@Internal
 data class JpqlRight internal constructor(
     val value: Expression<String>,
     val length: Expression<Int>,

render/jpql/src/main/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlReplaceSerializer.kt

@@ -1,14 +1,14 @@
 package com.linecorp.kotlinjdsl.render.jpql.serializer.impl
 
-import com.linecorp.kotlinjdsl.SinceJdsl
+import com.linecorp.kotlinjdsl.Internal
 import com.linecorp.kotlinjdsl.querymodel.jpql.expression.impl.JpqlReplace
 import com.linecorp.kotlinjdsl.render.RenderContext
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlRenderSerializer
 import com.linecorp.kotlinjdsl.render.jpql.serializer.JpqlSerializer
 import com.linecorp.kotlinjdsl.render.jpql.writer.JpqlWriter
 import kotlin.reflect.KClass
 
-@SinceJdsl("3.6.0")
+@Internal
 class JpqlReplaceSerializer : JpqlSerializer<JpqlReplace> {
     override fun handledType(): KClass<JpqlReplace> {
         return JpqlReplace::class
@@ -21,7 +21,7 @@ class JpqlReplaceSerializer : JpqlSerializer<JpqlReplace> {
         writer.writeParentheses {
             delegate.serialize(part.value, writer, context)
             writer.write(", ")
-            delegate.serialize(part.pattern, writer, context)
+            delegate.serialize(part.substring, writer, context)
             writer.write(", ")
             delegate.serialize(part.replacement, writer, context)
         }

render/jpql/src/test/kotlin/com/linecorp/kotlinjdsl/render/jpql/serializer/impl/JpqlReplaceSerializerTest.kt

@@ -54,7 +54,7 @@ internal class JpqlReplaceSerializerTest {
             writer.writeParentheses(any())
             serializer.serialize(expression.value, writer, context)
             writer.write(", ")
-            serializer.serialize(expression.pattern, writer, context)
+            serializer.serialize(expression.substring, writer, context)
             writer.write(", ")
             serializer.serialize(expression.replacement, writer, context)
         }