Rename the method from "associateAndReplace" to "associateWith" and simplify the method.

nakamura-to · nakamura-to · commit eb31c357c094 · 2020-06-06T20:48:11.000+09:00
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/AssociateCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/AssociateCommand.java
@@ -10,7 +10,6 @@
 import org.seasar.doma.internal.util.Pair;
 import org.seasar.doma.jdbc.command.Command;
 import org.seasar.doma.jdbc.command.SelectCommand;
-import org.seasar.doma.jdbc.criteria.context.AssociationPair;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel;
 import org.seasar.doma.jdbc.entity.EntityType;
@@ -68,26 +67,19 @@ public List<ENTITY> execute() {
   private void associate(
       Map<EntityKey, Object> cache,
       Map<EntityMetamodel<?>, Pair<EntityKey, Object>> associationCandidate) {
-    for (Map.Entry<
-            Pair<EntityMetamodel<?>, EntityMetamodel<?>>,
-            BiFunction<Object, Object, AssociationPair<?, ?>>>
+    for (Map.Entry<Pair<EntityMetamodel<?>, EntityMetamodel<?>>, BiFunction<Object, Object, Object>>
         e : context.associations.entrySet()) {
       Pair<EntityMetamodel<?>, EntityMetamodel<?>> metamodelPair = e.getKey();
-      BiFunction<Object, Object, AssociationPair<?, ?>> associator = e.getValue();
+      BiFunction<Object, Object, Object> associator = e.getValue();
       Pair<EntityKey, Object> keyAndEntity1 = associationCandidate.get(metamodelPair.fst);
       Pair<EntityKey, Object> keyAndEntity2 = associationCandidate.get(metamodelPair.snd);
       if (keyAndEntity1 == null || keyAndEntity2 == null) {
         continue;
       }
-      AssociationPair<?, ?> associationPair =
-          associator.apply(keyAndEntity1.snd, keyAndEntity2.snd);
-      if (associationPair != null) {
-        cache.replace(keyAndEntity1.fst, associationPair.getFirst());
-        cache.replace(keyAndEntity2.fst, associationPair.getSecond());
-        associationCandidate.replace(
-            metamodelPair.fst, new Pair<>(keyAndEntity1.fst, associationPair.getFirst()));
-        associationCandidate.replace(
-            metamodelPair.snd, new Pair<>(keyAndEntity2.fst, associationPair.getSecond()));
+      Object newEntity = associator.apply(keyAndEntity1.snd, keyAndEntity2.snd);
+      if (newEntity != null) {
+        cache.replace(keyAndEntity1.fst, newEntity);
+        associationCandidate.replace(metamodelPair.fst, new Pair<>(keyAndEntity1.fst, newEntity));
       }
     }
   }
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/AssociationPair.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/AssociationPair.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectContext.java
@@ -28,9 +28,7 @@ public class SelectContext implements Context {
   public Integer limit;
   public Integer offset;
   public ForUpdate forUpdate = new ForUpdate(ForUpdateOption.none());
-  public final Map<
-          Pair<EntityMetamodel<?>, EntityMetamodel<?>>,
-          BiFunction<Object, Object, AssociationPair<?, ?>>>
+  public final Map<Pair<EntityMetamodel<?>, EntityMetamodel<?>>, BiFunction<Object, Object, Object>>
       associations = new LinkedHashMap<>();
   public final SelectSettings settings = new SelectSettings();
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SelectFromDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SelectFromDeclaration.java
@@ -11,7 +11,6 @@
 import java.util.function.Consumer;
 import org.seasar.doma.DomaException;
 import org.seasar.doma.internal.util.Pair;
-import org.seasar.doma.jdbc.criteria.context.AssociationPair;
 import org.seasar.doma.jdbc.criteria.context.ForUpdate;
 import org.seasar.doma.jdbc.criteria.context.Join;
 import org.seasar.doma.jdbc.criteria.context.JoinKind;
@@ -144,6 +143,7 @@ public void selectTo(
         new Projection.EntityMetamodels(entityMetamodel, new ArrayList<>(projectionTargets));
   }
 
+  @SuppressWarnings("unchecked")
   public <ENTITY1, ENTITY2> void associate(
       EntityMetamodel<ENTITY1> first,
       EntityMetamodel<ENTITY2> second,
@@ -153,35 +153,45 @@ public <ENTITY1, ENTITY2> void associate(
     Objects.requireNonNull(second);
     Objects.requireNonNull(associator);
     Objects.requireNonNull(option);
-    associateAndReplace(
-        first,
-        second,
+    if (!context.getEntityMetamodels().contains(first)) {
+      if (option == AssociationOption.Kind.MANDATORY) {
+        throw new DomaException(Message.DOMA6001, "first");
+      }
+      return;
+    }
+    if (!context.getEntityMetamodels().contains(second)) {
+      if (option == AssociationOption.Kind.MANDATORY) {
+        throw new DomaException(Message.DOMA6001, "second");
+      }
+      return;
+    }
+    context.associations.put(
+        new Pair<>(first, second),
         (entity1, entity2) -> {
-          associator.accept(entity1, entity2);
+          associator.accept((ENTITY1) entity1, (ENTITY2) entity2);
           return null;
-        },
-        option);
+        });
   }
 
   @SuppressWarnings("unchecked")
-  public <ENTITY1, ENTITY2> void associateAndReplace(
+  public <ENTITY1, ENTITY2> void associateWith(
       EntityMetamodel<ENTITY1> first,
       EntityMetamodel<ENTITY2> second,
-      BiFunction<ENTITY1, ENTITY2, AssociationPair<ENTITY1, ENTITY2>> associator,
+      BiFunction<ENTITY1, ENTITY2, ENTITY1> associator,
       AssociationOption option) {
     Objects.requireNonNull(first);
     Objects.requireNonNull(second);
     Objects.requireNonNull(associator);
     Objects.requireNonNull(option);
     if (!context.getEntityMetamodels().contains(first)) {
       if (option == AssociationOption.Kind.MANDATORY) {
-        throw new DomaException(Message.DOMA6001, "first");
+        throw new DomaException(Message.DOMA6010, "first");
       }
       return;
     }
     if (!context.getEntityMetamodels().contains(second)) {
       if (option == AssociationOption.Kind.MANDATORY) {
-        throw new DomaException(Message.DOMA6001, "second");
+        throw new DomaException(Message.DOMA6010, "second");
       }
       return;
     }
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectStarting.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectStarting.java
@@ -8,7 +8,6 @@
 import java.util.function.Consumer;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.command.Command;
-import org.seasar.doma.jdbc.criteria.context.AssociationPair;
 import org.seasar.doma.jdbc.criteria.declaration.JoinDeclaration;
 import org.seasar.doma.jdbc.criteria.declaration.OrderByNameDeclaration;
 import org.seasar.doma.jdbc.criteria.declaration.SelectFromDeclaration;
@@ -84,27 +83,27 @@ public <ENTITY1, ENTITY2> EntityqlSelectStarting<ENTITY> associate(
     return this;
   }
 
-  public <ENTITY1, ENTITY2> EntityqlSelectStarting<ENTITY> associateAndReplace(
+  public <ENTITY1, ENTITY2> EntityqlSelectStarting<ENTITY> associateWith(
       EntityMetamodel<ENTITY1> first,
       EntityMetamodel<ENTITY2> second,
-      BiFunction<ENTITY1, ENTITY2, AssociationPair<ENTITY1, ENTITY2>> associator) {
+      BiFunction<ENTITY1, ENTITY2, ENTITY1> associator) {
     Objects.requireNonNull(first);
     Objects.requireNonNull(second);
     Objects.requireNonNull(associator);
-    declaration.associateAndReplace(first, second, associator, AssociationOption.mandatory());
+    declaration.associateWith(first, second, associator, AssociationOption.mandatory());
     return this;
   }
 
-  public <ENTITY1, ENTITY2> EntityqlSelectStarting<ENTITY> associateAndReplace(
+  public <ENTITY1, ENTITY2> EntityqlSelectStarting<ENTITY> associateWith(
       EntityMetamodel<ENTITY1> first,
       EntityMetamodel<ENTITY2> second,
-      BiFunction<ENTITY1, ENTITY2, AssociationPair<ENTITY1, ENTITY2>> associator,
+      BiFunction<ENTITY1, ENTITY2, ENTITY1> associator,
       AssociationOption option) {
     Objects.requireNonNull(first);
     Objects.requireNonNull(second);
     Objects.requireNonNull(associator);
     Objects.requireNonNull(option);
-    declaration.associateAndReplace(first, second, associator, option);
+    declaration.associateWith(first, second, associator, option);
     return this;
   }
 
diff --git a/doma-core/src/main/java/org/seasar/doma/message/Message.java b/doma-core/src/main/java/org/seasar/doma/message/Message.java
@@ -949,6 +949,10 @@ public enum Message implements MessageResource {
   DOMA6009(
       "The parameter \"{0}\" is unknown. "
           + "Ensure that you have passed it to the from, the innerJoin, or the leftJoin method before invoking the select method."),
+  DOMA6010(
+      "The parameter \"{0}\" is unknown. "
+          + "Ensure that you have passed it to the from, the innerJoin, or the leftJoin method before invoking the associateWith method. "
+          + "If the innerJoin or leftJoin method call is optional, pass the AssociationKind.OPTIONAL value to the associateWith method."),
   ;
 
   private final String messagePattern;
diff --git a/test-criteria/src/main/java/example/Emp.java b/test-criteria/src/main/java/example/Emp.java
@@ -73,6 +73,36 @@ public Emp(
     this.manager = manager;
   }
 
+  public Emp withDept(Dept dept) {
+    return new Emp(
+        this.getEmployeeId(),
+        this.getEmployeeNo(),
+        this.getEmployeeName(),
+        this.getManagerId(),
+        this.getHiredate(),
+        this.getSalary(),
+        this.getDepartmentId(),
+        this.getAddressId(),
+        this.getVersion(),
+        dept,
+        this.getManager());
+  }
+
+  public Emp withManager(Emp manager) {
+    return new Emp(
+        this.getEmployeeId(),
+        this.getEmployeeNo(),
+        this.getEmployeeName(),
+        this.getManagerId(),
+        this.getHiredate(),
+        this.getSalary(),
+        this.getDepartmentId(),
+        this.getAddressId(),
+        this.getVersion(),
+        this.getDepartment(),
+        manager);
+  }
+
   public Integer getEmployeeId() {
     return employeeId;
   }
diff --git a/test-criteria/src/test/java/example/ImmutableTest.java b/test-criteria/src/test/java/example/ImmutableTest.java
@@ -9,7 +9,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.criteria.Entityql;
-import org.seasar.doma.jdbc.criteria.context.AssociationPair;
 
 @ExtendWith(Env.class)
 public class ImmutableTest {
@@ -29,7 +28,7 @@ void fetch() {
   }
 
   @Test
-  void associateAndReplace() {
+  void associateWith() {
     Emp_ e = new Emp_();
     Emp_ m = new Emp_();
     Dept_ d = new Dept_();
@@ -40,44 +39,8 @@ void associateAndReplace() {
             .innerJoin(d, on -> on.eq(e.departmentId, d.departmentId))
             .leftJoin(m, on -> on.eq(e.managerId, m.employeeId))
             .where(c -> c.eq(d.departmentName, "SALES"))
-            .associateAndReplace(
-                e,
-                d,
-                (emp, dept) -> {
-                  Emp newEmp =
-                      new Emp(
-                          emp.getEmployeeId(),
-                          emp.getEmployeeNo(),
-                          emp.getEmployeeName(),
-                          emp.getManagerId(),
-                          emp.getHiredate(),
-                          emp.getSalary(),
-                          emp.getDepartmentId(),
-                          emp.getAddressId(),
-                          emp.getVersion(),
-                          dept,
-                          emp.getManager());
-                  return new AssociationPair<>(newEmp, dept);
-                })
-            .associateAndReplace(
-                e,
-                m,
-                (emp, manager) -> {
-                  Emp newEmp =
-                      new Emp(
-                          emp.getEmployeeId(),
-                          emp.getEmployeeNo(),
-                          emp.getEmployeeName(),
-                          emp.getManagerId(),
-                          emp.getHiredate(),
-                          emp.getSalary(),
-                          emp.getDepartmentId(),
-                          emp.getAddressId(),
-                          emp.getVersion(),
-                          emp.getDepartment(),
-                          manager);
-                  return new AssociationPair<>(newEmp, manager);
-                })
+            .associateWith(e, d, Emp::withDept)
+            .associateWith(e, m, Emp::withManager)
             .fetch();
 
     assertEquals(6, list.size());
