From f07c7411fac28c7fa005e28249a113d60b0236bd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Aug 2022 12:37:27 +1200
Subject: [PATCH] No effective change - tidy SqlTreeAlias only

---
 .../server/query/SqlTreeAlias.java            | 19 ++++++++-----------
 .../java/org/tests/query/TestSubQuery.java    |  9 +++++----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
index 0311bf64d..3a5e7bdc7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
@@ -113,11 +113,8 @@ final class SqlTreeAlias {
     if (prefix == null) {
       return rootTableAlias;
     } else {
-      String s = aliasMap.get(prefix);
-      if (s == null) {
-        return calcAlias(prefix);
-      }
-      return s;
+      String alias = aliasMap.get(prefix);
+      return alias != null ? alias : calcAlias(prefix);
     }
   }
 
@@ -128,14 +125,14 @@ final class SqlTreeAlias {
     if (prefix == null) {
       return rootTableAlias;
     }
-    String s = manyWhereAliasMap.get(prefix);
-    if (s == null) {
-      s = aliasMap.get(prefix);
+    String alias = manyWhereAliasMap.get(prefix);
+    if (alias == null) {
+      alias = aliasMap.get(prefix);
     }
-    if (s == null) {
-      throw new RuntimeException("Could not determine table alias for " + prefix + " manyMap:" + manyWhereAliasMap + " aliasMap:" + aliasMap);
+    if (alias == null) {
+      throw new RuntimeException("Could not determine table alias for " + prefix);
     }
-    return s;
+    return alias;
   }
 
   /**
diff --git a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
index a63c91115..04e9ccab6 100644
--- a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
@@ -1,8 +1,8 @@
 package org.tests.query;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.*;
 
@@ -14,8 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestSubQuery extends BaseTestCase {
 
   @Test
-  public void testId() {
-
+  void testId() {
     ResetBasicData.reset();
 
     List<Integer> productIds = new ArrayList<>();
@@ -26,7 +25,9 @@ public class TestSubQuery extends BaseTestCase {
     Query<Order> sq = DB.find(Order.class).select("id").where()
       .in("details.product.id", productIds).query();
 
-    DB.find(Order.class).where().in("id", sq).findList();
+    Query<Order> query = DB.find(Order.class).where().in("id", sq).query();
+    query.findList();
+    assertThat(query.getGeneratedSql()).isEqualTo("select t0.id, t0.status, t0.order_date, t0.ship_date, t1.name, t0.cretime, t0.updtime, t0.kcustomer_id from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where  (t0.id) in (select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id in (?,?,?))");
   }
 
   @Test