Refactoring UserDefinedCriteria

Author: momosetkn

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Criterion.java

@@ -451,11 +451,11 @@ public void accept(Visitor visitor) {
   }
 
   class UserDefined implements Criterion {
-    public final Consumer<UserDefinedCriteriaContext.Builder> contextDeclaration;
+    public final Consumer<UserDefinedCriteriaContext.Builder> builderBlock;
 
-    public UserDefined(Consumer<UserDefinedCriteriaContext.Builder> contextDeclaration) {
-      Objects.requireNonNull(contextDeclaration);
-      this.contextDeclaration = contextDeclaration;
+    public UserDefined(Consumer<UserDefinedCriteriaContext.Builder> builderBlock) {
+      Objects.requireNonNull(builderBlock);
+      this.builderBlock = builderBlock;
     }
 
     @Override

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

@@ -903,16 +903,23 @@ public void or(Runnable block) {
     runBlock(block, Criterion.Or::new);
   }
 
+  /**
+   * Add a declaring a user-defined extension.
+   *
+   * @param <EXTENSION> the type of the user-defined extension
+   * @param construct function that generates user-defined extension.
+   * @param extensionBlock block that can use user-defined extension.
+   * @throws NullPointerException if {@code construct} or {@code extensionBlock} is null
+   */
   public <EXTENSION> void extension(
       Function<UserDefinedCriteriaContext, EXTENSION> construct,
-      Consumer<EXTENSION> extensionDeclaration) {
+      Consumer<EXTENSION> extensionBlock) {
     Objects.requireNonNull(construct);
-    Objects.requireNonNull(extensionDeclaration);
+    Objects.requireNonNull(extensionBlock);
 
     var extension =
-        construct.apply(
-            contextDeclaration -> this.add(new Criterion.UserDefined(contextDeclaration)));
-    extensionDeclaration.accept(extension);
+        construct.apply(builderBlock -> this.add(new Criterion.UserDefined(builderBlock)));
+    extensionBlock.accept(extension);
   }
 
   /**

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

@@ -22,7 +22,14 @@
 /** Represents a user-defined comparison criteria declaration. */
 @FunctionalInterface
 public interface UserDefinedCriteriaContext {
-  void add(Consumer<Builder> builder);
+  /**
+   * Adds a user-defined operation to the criteria declaration by accepting a function that
+   * configures the provided {@code Builder}.
+   *
+   * @param builderBlock a {@link Consumer} used to configure the {@code Builder} for appending SQL
+   *     code, expressions, or other operations
+   */
+  void add(Consumer<Builder> builderBlock);
 
   interface Builder {
     /**

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

@@ -431,7 +431,7 @@ public void visit(Criterion.Not criterion) {
 
     @Override
     public void visit(Criterion.UserDefined criterion) {
-      extension(criterion.contextDeclaration);
+      extension(criterion.builderBlock);
     }
 
     private void comparison(Operand.Prop left, Operand right, String op) {
@@ -701,8 +701,8 @@ private void not(List<Criterion> criterionList) {
       }
     }
 
-    private void extension(Consumer<UserDefinedCriteriaContext.Builder> contextDeclaration) {
-      contextDeclaration.accept(userDefinedCriteriaContextBuilder);
+    private void extension(Consumer<UserDefinedCriteriaContext.Builder> builderBlock) {
+      builderBlock.accept(userDefinedCriteriaContextBuilder);
     }
   }