Refactor parameter names and Add null checks.

Author: momosetkn

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/UserDefinedCriteriaContext.java

@@ -57,11 +57,12 @@ interface Builder {
     /**
      * Appends a parameter.
      *
-     * @param left the property metamodel representing the left operand
-     * @param right the value to be paired with the left operand
+     * @param propertyMetamodel the {@link PropertyMetamodel} to be added as a expression in the
+     *     declaration
+     * @param value the value of the property
      * @param <PROPERTY> the type of the property
      */
-    <PROPERTY> void appendParameter(PropertyMetamodel<PROPERTY> left, PROPERTY right);
+    <PROPERTY> void appendParameter(PropertyMetamodel<PROPERTY> propertyMetamodel, PROPERTY value);
 
     /**
      * Represents the specific database dialect. This is utilized to modify user-defined expressions

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/BuilderSupport.java

@@ -958,8 +958,10 @@ public void appendExpression(PropertyMetamodel<?> propertyMetamodel) {
     }
 
     @Override
-    public <PROPERTY> void appendParameter(PropertyMetamodel<PROPERTY> left, PROPERTY right) {
-      var param = new Operand.Param(left, right);
+    public <PROPERTY> void appendParameter(
+        PropertyMetamodel<PROPERTY> propertyMetamodel, PROPERTY value) {
+      Objects.requireNonNull(propertyMetamodel);
+      var param = new Operand.Param(propertyMetamodel, value);
       var parameter = param.createInParameter(config);
       param(parameter);
     }

doma-core/src/test/java/org/seasar/doma/jdbc/criteria/MyExtension.java

@@ -19,25 +19,25 @@
 import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel;
 
 record MyExtension(UserDefinedCriteriaContext context) {
-  public void likeMultiple(PropertyMetamodel<String> entityMetamodel, String... patterns) {
+  public void likeMultiple(PropertyMetamodel<String> propertyMetamodel, String... patterns) {
     context.add(
         (b) -> {
           for (String pattern : patterns) {
-            b.appendExpression(entityMetamodel);
+            b.appendExpression(propertyMetamodel);
             b.appendSql(" like ");
-            b.appendParameter(entityMetamodel, "%" + pattern + "%");
+            b.appendParameter(propertyMetamodel, "%" + pattern + "%");
             b.appendSql(" or ");
           }
           b.cutBackSql(4);
         });
   }
 
-  public void eq2(PropertyMetamodel<String> entityMetamodel, String pattern) {
+  public void eq2(PropertyMetamodel<String> propertyMetamodel, String pattern) {
     context.add(
         (b) -> {
-          b.appendExpression(entityMetamodel);
+          b.appendExpression(propertyMetamodel);
           b.appendSql(" = ");
-          b.appendParameter(entityMetamodel, pattern);
+          b.appendParameter(propertyMetamodel, pattern);
         });
   }
 }

doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KComparisonDeclaration.kt

@@ -115,8 +115,8 @@ abstract class KComparisonDeclaration<DECLARATION : org.seasar.doma.jdbc.criteri
                     override fun cutBackSql(length: Int) = builder.cutBackSql(length)
                     override fun appendExpression(propertyMetamodel: PropertyMetamodel<*>) =
                         builder.appendExpression(propertyMetamodel)
-                    override fun <PROPERTY> appendParameter(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) =
-                        builder.appendParameter(left, right)
+                    override fun <PROPERTY> appendParameter(propertyMetamodel: PropertyMetamodel<PROPERTY>, value: PROPERTY?) =
+                        builder.appendParameter(propertyMetamodel, value)
                     override val dialect: Dialect
                         get() = builder.dialect
                 })

doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KUserDefinedCriteriaContext.kt

@@ -28,7 +28,7 @@ fun interface KUserDefinedCriteriaContext {
 
         fun appendExpression(propertyMetamodel: PropertyMetamodel<*>)
 
-        fun <PROPERTY> appendParameter(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?)
+        fun <PROPERTY> appendParameter(propertyMetamodel: PropertyMetamodel<PROPERTY>, value: PROPERTY?)
 
         val dialect: Dialect
     }

doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/MyExtension.kt

@@ -32,11 +32,11 @@ data class MyExtension(val context: KUserDefinedCriteriaContext) {
         }
     }
 
-    fun eq2(entityMetamodel: PropertyMetamodel<String?>, pattern: String?) {
+    fun eq2(propertyMetamodel: PropertyMetamodel<String?>, pattern: String?) {
         context.add {
-            appendExpression(entityMetamodel)
+            appendExpression(propertyMetamodel)
             appendSql(" = ")
-            appendParameter(entityMetamodel, pattern)
+            appendParameter(propertyMetamodel, pattern)
         }
     }
 }

integration-test-java/src/test/java/org/seasar/doma/it/criteria/MyExtension.java

@@ -19,38 +19,38 @@
 import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel;
 
 record MyExtension(UserDefinedCriteriaContext context) {
-  public void regexp(PropertyMetamodel<String> entityMetamodel, String regexp) {
+  public void regexp(PropertyMetamodel<String> propertyMetamodel, String regexp) {
     context.add(
         (b) -> {
           var dialectName = b.getDialect().getName();
           if (dialectName.startsWith("mysql")) {
-            b.appendExpression(entityMetamodel);
+            b.appendExpression(propertyMetamodel);
             b.appendSql(" regexp ");
-            b.appendParameter(entityMetamodel, regexp);
+            b.appendParameter(propertyMetamodel, regexp);
           } else if (dialectName.equals("postgres")) {
-            b.appendExpression(entityMetamodel);
+            b.appendExpression(propertyMetamodel);
             b.appendSql(" ~ ");
-            b.appendParameter(entityMetamodel, regexp);
+            b.appendParameter(propertyMetamodel, regexp);
           } else if (dialectName.equals("oracle")) {
             b.appendSql("regexp_like(");
-            b.appendExpression(entityMetamodel);
+            b.appendExpression(propertyMetamodel);
             b.appendSql(",");
-            b.appendParameter(entityMetamodel, regexp);
+            b.appendParameter(propertyMetamodel, regexp);
             b.appendSql(")");
           } else {
-            b.appendExpression(entityMetamodel);
+            b.appendExpression(propertyMetamodel);
             b.appendSql(" like ");
-            b.appendParameter(entityMetamodel, "%" + regexp + "%");
+            b.appendParameter(propertyMetamodel, "%" + regexp + "%");
           }
         });
   }
 
-  public void eq2(PropertyMetamodel<String> entityMetamodel, String pattern) {
+  public void eq2(PropertyMetamodel<String> propertyMetamodel, String pattern) {
     context.add(
         (b) -> {
-          b.appendExpression(entityMetamodel);
+          b.appendExpression(propertyMetamodel);
           b.appendSql(" = ");
-          b.appendParameter(entityMetamodel, pattern);
+          b.appendParameter(propertyMetamodel, pattern);
         });
   }
 }