optimize: rename leftJoinIf to leftJoin

mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java

@@ -204,15 +204,23 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
     }
 
 
-    public Joiner<QueryWrapper> leftJoinIf(String table, boolean when) {
+    public Joiner<QueryWrapper> leftJoin(String table, boolean when) {
         return joining(Join.TYPE_LEFT, new QueryTable(table), when);
     }
 
+    public Joiner<QueryWrapper> leftJoin(Class<?> entityClass) {
+        return joining(Join.TYPE_LEFT, entityClass, true);
+    }
+
+    public Joiner<QueryWrapper> leftJoin(Class<?> entityClass, boolean when) {
+        return joining(Join.TYPE_LEFT, entityClass, when);
+    }
+
     public Joiner<QueryWrapper> leftJoin(TableDef table) {
         return joining(Join.TYPE_LEFT, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> leftJoinIf(TableDef table, boolean when) {
+    public Joiner<QueryWrapper> leftJoin(TableDef table, boolean when) {
         return joining(Join.TYPE_LEFT, new QueryTable(table), when);
     }
 
@@ -220,7 +228,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_LEFT, table, true);
     }
 
-    public Joiner<QueryWrapper> leftJoinIf(QueryWrapper table, boolean when) {
+    public Joiner<QueryWrapper> leftJoin(QueryWrapper table, boolean when) {
         return joining(Join.TYPE_LEFT, table, when);
     }
 
@@ -229,15 +237,23 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_RIGHT, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> rightJoinIf(String table, boolean when) {
+    public Joiner<QueryWrapper> rightJoin(String table, boolean when) {
         return joining(Join.TYPE_RIGHT, new QueryTable(table), when);
     }
 
-    public Joiner<QueryWrapper> rightJoinIf(TableDef table) {
+    public Joiner<QueryWrapper> rightJoin(Class<?> entityClass) {
+        return joining(Join.TYPE_RIGHT, entityClass, true);
+    }
+
+    public Joiner<QueryWrapper> rightJoin(Class<?> entityClass, boolean when) {
+        return joining(Join.TYPE_RIGHT, entityClass, when);
+    }
+
+    public Joiner<QueryWrapper> rightJoin(TableDef table) {
         return joining(Join.TYPE_RIGHT, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> rightJoinIf(TableDef table, boolean when) {
+    public Joiner<QueryWrapper> rightJoin(TableDef table, boolean when) {
         return joining(Join.TYPE_RIGHT, new QueryTable(table), when);
     }
 
@@ -245,7 +261,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_RIGHT, table, true);
     }
 
-    public Joiner<QueryWrapper> rightJoinIf(QueryWrapper table, boolean when) {
+    public Joiner<QueryWrapper> rightJoin(QueryWrapper table, boolean when) {
         return joining(Join.TYPE_RIGHT, table, when);
     }
 
@@ -254,15 +270,23 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_INNER, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> innerJoinIf(String table, boolean when) {
+    public Joiner<QueryWrapper> innerJoin(String table, boolean when) {
         return joining(Join.TYPE_INNER, new QueryTable(table), when);
     }
 
-    public Joiner<QueryWrapper> innerJoin(TableDef table) {
+    public Joiner<QueryWrapper> innerJoin(Class<?> entityClass) {
-        return innerJoinIf(table, true);
+        return joining(Join.TYPE_INNER, entityClass, true);
     }
 
-    public Joiner<QueryWrapper> innerJoinIf(TableDef table, boolean when) {
+    public Joiner<QueryWrapper> innerJoin(Class<?> entityClass, boolean when) {
+        return joining(Join.TYPE_INNER, entityClass, when);
+    }
+
+    public Joiner<QueryWrapper> innerJoin(TableDef table) {
+        return innerJoin(table, true);
+    }
+
+    public Joiner<QueryWrapper> innerJoin(TableDef table, boolean when) {
         return joining(Join.TYPE_INNER, new QueryTable(table), when);
     }
 
@@ -270,7 +294,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_INNER, table, true);
     }
 
-    public Joiner<QueryWrapper> innerJoinIf(QueryWrapper table, boolean when) {
+    public Joiner<QueryWrapper> innerJoin(QueryWrapper table, boolean when) {
         return joining(Join.TYPE_INNER, table, when);
     }
 
@@ -279,15 +303,23 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_FULL, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> fullJoinIf(String table, boolean when) {
+    public Joiner<QueryWrapper> fullJoin(String table, boolean when) {
         return joining(Join.TYPE_FULL, new QueryTable(table), when);
     }
 
-    public Joiner<QueryWrapper> fullJoinIf(TableDef table) {
+    public Joiner<QueryWrapper> fullJoin(Class<?> entityClass) {
+        return joining(Join.TYPE_FULL, entityClass, true);
+    }
+
+    public Joiner<QueryWrapper> fullJoin(Class<?> entityClass, boolean when) {
+        return joining(Join.TYPE_FULL, entityClass, when);
+    }
+
+    public Joiner<QueryWrapper> fullJoin(TableDef table) {
         return joining(Join.TYPE_FULL, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> fullJoinIf(TableDef table, boolean when) {
+    public Joiner<QueryWrapper> fullJoin(TableDef table, boolean when) {
         return joining(Join.TYPE_FULL, new QueryTable(table), when);
     }
 
@@ -295,7 +327,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_FULL, table, true);
     }
 
-    public Joiner<QueryWrapper> fullJoinIf(QueryWrapper table, boolean when) {
+    public Joiner<QueryWrapper> fullJoin(QueryWrapper table, boolean when) {
         return joining(Join.TYPE_FULL, table, when);
     }
 
@@ -304,15 +336,23 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_CROSS, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> crossJoinIf(String table, boolean when) {
+    public Joiner<QueryWrapper> crossJoin(String table, boolean when) {
         return joining(Join.TYPE_CROSS, new QueryTable(table), when);
     }
 
-    public Joiner<QueryWrapper> crossJoinIf(TableDef table) {
+    public Joiner<QueryWrapper> crossJoin(Class<?> entityClass) {
+        return joining(Join.TYPE_CROSS, entityClass, true);
+    }
+
+    public Joiner<QueryWrapper> crossJoin(Class<?> entityClass, boolean when) {
+        return joining(Join.TYPE_CROSS, entityClass, when);
+    }
+
+    public Joiner<QueryWrapper> crossJoin(TableDef table) {
         return joining(Join.TYPE_CROSS, new QueryTable(table), true);
     }
 
-    public Joiner<QueryWrapper> crossJoinIf(TableDef table, boolean when) {
+    public Joiner<QueryWrapper> crossJoin(TableDef table, boolean when) {
         return joining(Join.TYPE_CROSS, new QueryTable(table), when);
     }
 
@@ -320,7 +360,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_CROSS, table, true);
     }
 
-    public Joiner<QueryWrapper> crossJoinIf(QueryWrapper table, boolean when) {
+    public Joiner<QueryWrapper> crossJoin(QueryWrapper table, boolean when) {
         return joining(Join.TYPE_CROSS, table, when);
     }
 
@@ -333,6 +373,14 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return joining(Join.TYPE_JOIN, new QueryTable(table), when);
     }
 
+    public Joiner<QueryWrapper> join(Class<?> entityClass) {
+        return joining(Join.TYPE_JOIN, entityClass, true);
+    }
+
+    public Joiner<QueryWrapper> join(Class<?> entityClass, boolean when) {
+        return joining(Join.TYPE_JOIN, entityClass, when);
+    }
+
     public Joiner<QueryWrapper> join(TableDef table) {
         return joining(Join.TYPE_JOIN, new QueryTable(table), true);
     }
@@ -383,14 +431,20 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
 //    }
 
 
-    protected Joiner<QueryWrapper> joining(String type, QueryTable table, boolean condition) {
+    protected Joiner<QueryWrapper> joining(String type, QueryTable table, boolean when) {
-        Join join = new Join(type, table, condition);
+        Join join = new Join(type, table, when);
         addJoinTable(join.getQueryTable());
         return new Joiner<>(addJoin(join), join);
     }
 
-    protected Joiner<QueryWrapper> joining(String type, QueryWrapper queryWrapper, boolean condition) {
+    protected Joiner<QueryWrapper> joining(String type, Class<?> entityClass, boolean when) {
-        Join join = new Join(type, queryWrapper, condition);
+        TableInfo tableInfo = TableInfoFactory.ofEntityClass(entityClass);
+        QueryTable queryTable = new QueryTable(tableInfo.getSchema(), tableInfo.getTableName());
+        return joining(type, queryTable, when);
+    }
+
+    protected Joiner<QueryWrapper> joining(String type, QueryWrapper queryWrapper, boolean when) {
+        Join join = new Join(type, queryWrapper, when);
         addJoinTable(join.getQueryTable());
         return new Joiner<>(addJoin(join), join);
     }