Merge pull request #3581 from apflieger/#3573-initfields-prevent-secondary-query

OneToMany initialisation via List.of() - was Tests only - new test on multiple many joins

Author: rbygrave

ebean-test/pom.xml

@@ -309,7 +309,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.9.0</tile>
+            <tile>io.ebean.tile:enhancement:14.10.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-test/src/test/java/org/tests/model/join/initfields/Order.java

@@ -0,0 +1,41 @@
+package org.tests.model.join.initfields;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "join_initfields_order")
+public class Order {
+  @Id
+  int id;
+
+  @OneToMany
+  List<OrderItem> orderItems = new ArrayList<>();
+
+  @OneToMany
+  List<OrderDetail> orderDetails = new ArrayList<>();
+
+  @OneToMany
+  public List<OrderInvoice> orderInvoices = List.of(); // Change this to new ArrayList<>() to make the test pass.
+
+  public int id() {
+    return id;
+  }
+
+  public List<OrderItem> orderItems() {
+    return orderItems;
+  }
+
+  public List<OrderDetail> orderDetails() {
+    return orderDetails;
+  }
+
+  public List<OrderInvoice> orderInvoices() {
+    return orderInvoices;
+  }
+}

ebean-test/src/test/java/org/tests/model/join/initfields/OrderDetail.java

@@ -0,0 +1,21 @@
+package org.tests.model.join.initfields;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name="join_initfields_order_detail")
+public class OrderDetail {
+  @Id
+  int id;
+
+  @ManyToOne
+  Order order;
+
+  public OrderDetail(Order order) {
+    this.order = order;
+  }
+
+}

ebean-test/src/test/java/org/tests/model/join/initfields/OrderInvoice.java

@@ -0,0 +1,20 @@
+package org.tests.model.join.initfields;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name="join_initfields_order_invoice")
+public class OrderInvoice {
+  @Id
+  int id;
+
+  @ManyToOne
+  Order order;
+
+  public OrderInvoice(Order order) {
+    this.order = order;
+  }
+}

ebean-test/src/test/java/org/tests/model/join/initfields/OrderItem.java

@@ -0,0 +1,20 @@
+package org.tests.model.join.initfields;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name="join_initfields_order_item")
+public class OrderItem {
+  @Id
+  int id;
+
+  @ManyToOne
+  Order order;
+
+  public OrderItem(Order order) {
+    this.order = order;
+  }
+}

ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java

@@ -1,7 +1,5 @@
 package org.tests.model.lazywithid;
 
-import io.ebean.common.BeanList;
-
 import jakarta.persistence.*;
 import java.util.List;
 
@@ -15,7 +13,7 @@ public class Tune {
   String name;
 
   @OneToMany(cascade = CascadeType.ALL)
-  private List<Looney> loonies = new BeanList<>();
+  private List<Looney> loonies;
 
   public String getName() {
     return name;

ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java

@@ -1,10 +1,15 @@
 package org.tests.query;
 
+import io.ebean.test.LoggedSql;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;
 import org.tests.model.join.*;
+import org.tests.model.join.initfields.Order;
+import org.tests.model.join.initfields.OrderDetail;
+import org.tests.model.join.initfields.OrderInvoice;
+import org.tests.model.join.initfields.OrderItem;
 
 import java.util.List;
 
@@ -65,4 +70,54 @@ void test() {
     }
   }
 
+  @Test
+  public void test_manyNonRoot_RootHasNoMany() {
+    Order o = new Order();
+    DB.save(o);
+
+    OrderItem p1 = new OrderItem(o);
+    OrderItem p2 = new OrderItem(o);
+    OrderDetail d1 = new OrderDetail(o);
+    OrderDetail d2 = new OrderDetail(o);
+    OrderInvoice i1 = new OrderInvoice(o);
+    OrderInvoice i2 = new OrderInvoice(o);
+
+    DB.saveAll(p1, p2, d1, d2, i1, i2);
+
+    // This first query behaves as expected: a main query and its secondary query.
+    LoggedSql.start();
+    List<Order> list1 = DB.find(Order.class)
+      .fetch("orderItems")
+      .fetch("orderDetails")
+      .where().gt("id", 0)
+      .findList();
+
+    List<String> sql1 = LoggedSql.collect();
+    assertThat(sql1).hasSize(2);
+
+    assertThat(list1.get(0).orderItems()).hasSize(2);
+    assertThat(list1.get(0).orderDetails()).hasSize(2);
+
+    sql1 = LoggedSql.collect();
+    assertThat(sql1).describedAs("no further lazy loading occurs").isEmpty();
+
+    // This query does not eager fetch invoices. We get an NPE on orderInvoices. Only the main query is executed.
+    LoggedSql.collect();
+    List<Order> list2 = DB.find(Order.class)
+      .fetch("orderItems")
+      .fetch("orderInvoices")
+      .where().gt("id", 0)
+      .findList();
+
+    List<String> sql2 = LoggedSql.collect();
+    assertThat(sql2).hasSize(2);
+    assertThat(sql2.get(0)).contains("from join_initfields_order t0 left join join_initfields_order_item t1 on t1.order_id = t0.id where");
+    assertThat(sql2.get(1)).contains("from join_initfields_order_invoice t0 where ");
+
+    assertThat(list2.get(0).orderItems()).hasSize(2);
+    assertThat(list2.get(0).orderInvoices()).hasSize(2);
+
+    sql2 = LoggedSql.stop();
+    assertThat(sql2).describedAs("no further lazy loading occurs").isEmpty();
+  }
 }