Merge branch 'main' of https://gitee.com/mybatis-flex/mybatis-flex

mybatis-flex-core/pom.xml

@@ -91,6 +91,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.vertical-blank</groupId>
+            <artifactId>sql-formatter</artifactId>
+            <version>2.0.4</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/AbstractMessageCollector.java

@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.core.audit;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+/**
+ * 抽象消息收集器。
+ *
+ * @author 王帅
+ * @since 2023-09-28
+ */
+public abstract class AbstractMessageCollector implements MessageCollector {
+
+    private final MessageReporter messageSender;
+    private final List<AuditMessage> messages = Collections.synchronizedList(new ArrayList<>());
+    private final ReentrantReadWriteLock rrwLock = new ReentrantReadWriteLock();
+
+    protected AbstractMessageCollector(MessageReporter messageSender) {
+        this.messageSender = messageSender;
+    }
+
+    @Override
+    public void collect(AuditMessage message) {
+        try {
+            rrwLock.readLock().lock();
+            messages.add(message);
+        } finally {
+            rrwLock.readLock().unlock();
+        }
+    }
+
+    protected void doSendMessages() {
+        if (messages.isEmpty()) {
+            return;
+        }
+        List<AuditMessage> sendMessages;
+        try {
+            rrwLock.writeLock().lock();
+            sendMessages = new ArrayList<>(messages);
+            messages.clear();
+        } finally {
+            rrwLock.writeLock().unlock();
+        }
+        messageSender.sendMessages(sendMessages);
+    }
+
+    public void release() {
+        doSendMessages();
+    }
+
+    protected List<AuditMessage> getMessages() {
+        return messages;
+    }
+
+    protected MessageReporter getMessageSender() {
+        return messageSender;
+    }
+
+}

mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/CountableMessageCollector.java

@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.mybatisflex.core.audit;
+
+/**
+ * 计数消息收集器，当消息达到指定数量时发送消息。
+ *
+ * @author 王帅
+ * @since 2023-09-28
+ */
+public class CountableMessageCollector extends AbstractMessageCollector {
+
+    private final int count;
+
+    public CountableMessageCollector() {
+        this(1000, new ConsoleMessageReporter());
+    }
+
+    public CountableMessageCollector(int count, MessageReporter messageSender) {
+        super(messageSender);
+        this.count = count;
+    }
+
+    @Override
+    public void collect(AuditMessage message) {
+        super.collect(message);
+        if (getMessages().size() >= count) {
+            new Thread(this::doSendMessages).start();
+        }
+    }
+
+}

mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/ScheduledMessageCollector.java

@@ -15,24 +15,16 @@
  */
 package com.mybatisflex.core.audit;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * 默认的审计消息收集器，其收集消息后，定时通过消息发送器{@link MessageReporter}把消息发送过去
  */
-public class ScheduledMessageCollector implements MessageCollector, Runnable {
+public class ScheduledMessageCollector extends AbstractMessageCollector {
 
     private final ScheduledExecutorService scheduler;
-    private final MessageReporter messageSender;
-
-    private final List<AuditMessage> messages = Collections.synchronizedList(new ArrayList<>());
-    private final ReentrantReadWriteLock rrwLock = new ReentrantReadWriteLock();
 
     public ScheduledMessageCollector() {
         this(10, new ConsoleMessageReporter());
@@ -40,45 +32,17 @@ public class ScheduledMessageCollector implements MessageCollector, Runnable {
 
 
     public ScheduledMessageCollector(long period, MessageReporter messageSender) {
-        this.messageSender = messageSender;
+        super(messageSender);
         this.scheduler = Executors.newSingleThreadScheduledExecutor(runnable -> {
             Thread thread = new Thread(runnable, "ScheduledMessageCollector");
             thread.setDaemon(true);
             return thread;
         });
-        this.scheduler.scheduleAtFixedRate(this, period, period, TimeUnit.SECONDS);
-    }
-
-
-    @Override
-    public void collect(AuditMessage message) {
-        try {
-            rrwLock.readLock().lock();
-            messages.add(message);
-        } finally {
-            rrwLock.readLock().unlock();
-        }
-    }
-
-
-    @Override
-    public void run() {
-        if (messages.isEmpty()) {
-            return;
-        }
-        List<AuditMessage> sendMessages;
-        try {
-            rrwLock.writeLock().lock();
-            sendMessages = new ArrayList<>(messages);
-            messages.clear();
-        } finally {
-            rrwLock.writeLock().unlock();
-        }
-        messageSender.sendMessages(sendMessages);
+        this.scheduler.scheduleAtFixedRate(this::doSendMessages, period, period, TimeUnit.SECONDS);
     }
 
     public void release() {
-        run(); //clear the messages
+        doSendMessages(); //clear the messages
         scheduler.shutdown();
     }
 

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

@@ -15,10 +15,15 @@
  */
 package com.mybatisflex.core.query;
 
+import com.mybatisflex.core.table.TableInfo;
+import com.mybatisflex.core.table.TableInfoFactory;
 import com.mybatisflex.core.util.ArrayUtil;
 import com.mybatisflex.core.util.LambdaGetter;
 import com.mybatisflex.core.util.LambdaUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.mybatisflex.core.constant.FuncName.*;
 
 /**
@@ -2439,10 +2444,35 @@ public class QueryMethods {
     }
 
     /**
-     * 构建所有列
+     * 构建所有列。
      */
-    public static QueryColumn allColumns(){
-        return  column("*");
+    public static QueryColumn allColumns() {
+        return column("*");
+    }
+
+    /**
+     * 构建所有列。
+     */
+    public static Iterable<QueryColumn> allColumns(Class<?>... classes) {
+        List<QueryColumn> queryColumns = new ArrayList<>(classes.length);
+        for (Class<?> aClass : classes) {
+            TableInfo tableInfo = TableInfoFactory.ofEntityClass(aClass);
+            QueryTable queryTable = new QueryTable(tableInfo.getSchema(), tableInfo.getTableName());
+            queryColumns.add(new QueryColumn(queryTable, "*"));
+        }
+        return queryColumns;
+    }
+
+    /**
+     * 构建默认列。
+     */
+    public static Iterable<QueryColumn> defaultColumns(Class<?>... classes) {
+        List<QueryColumn> queryColumns = new ArrayList<>();
+        for (Class<?> aClass : classes) {
+            TableInfo tableInfo = TableInfoFactory.ofEntityClass(aClass);
+            queryColumns.addAll(tableInfo.getDefaultQueryColumn());
+        }
+        return queryColumns;
     }
 
     // === IF 函数 ===
@@ -2584,7 +2614,7 @@ public class QueryMethods {
      * 分组值拼接
      */
     public static QueryColumn groupConcat(QueryColumn columnX) {
-        return new FunctionQueryColumn(GROUP_CONCAT,columnX);
+        return new FunctionQueryColumn(GROUP_CONCAT, columnX);
     }
 
 }

mybatis-flex-core/src/test/java/com/mybatisflex/coretest/LambdaSqlTest.java

@@ -0,0 +1,96 @@
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.coretest;
+
+import com.github.vertical_blank.sqlformatter.SqlFormatter;
+import com.mybatisflex.core.query.QueryWrapper;
+import org.junit.Test;
+
+import static com.mybatisflex.core.query.QueryMethods.allColumns;
+import static com.mybatisflex.core.query.QueryMethods.defaultColumns;
+
+/**
+ * Lambda 构建 SQL 测试。
+ *
+ * @author 王帅
+ * @since 2023-10-01
+ */
+public class LambdaSqlTest {
+
+    public static void printSQL(QueryWrapper queryWrapper) {
+        System.out.println(SqlFormatter.format(queryWrapper.toSQL()));
+    }
+
+    @Test
+    public void test01() {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .select()
+            .from(Account.class)
+            .join(Article.class).on(wrapper -> wrapper.where(Article::getAccountId).eq(Account::getId))
+            .where(Account::getAge).ge(18);
+
+        printSQL(queryWrapper);
+    }
+
+    @Test
+    public void test02() {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .select(allColumns(Account.class, Article.class))
+            .from(Account.class)
+            .join(Article.class).on(wrapper -> wrapper.where(Article::getAccountId).eq(Account::getId))
+            .where(Account::getAge).ge(18);
+
+        printSQL(queryWrapper);
+    }
+
+    @Test
+    public void test03() {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .select(allColumns(Account.class, Article.class))
+            .from(Account.class).as("ac")
+            .join(Article.class).as("ar").on(wrapper -> wrapper.where(Article::getAccountId).eq(Account::getId))
+            .where(Account::getAge).ge(18);
+
+        printSQL(queryWrapper);
+    }
+
+    @Test
+    public void test04() {
+        @SuppressWarnings("unchecked")
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .select(defaultColumns(Account.class))
+            .select(Article::getTitle, Article::getContent)
+            .from(Account.class).as("ac")
+            .join(Article.class).as("ar").on(wrapper -> wrapper.where(Article::getAccountId).eq(Account::getId))
+            .where(Account::getAge).ge(18);
+
+        printSQL(queryWrapper);
+    }
+
+    @Test
+    public void test05() {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .select(defaultColumns(Account.class))
+            .select(allColumns(Article.class))
+            .from(Account.class).as("ac")
+            .join(Article.class).as("ar").on(wrapper -> wrapper.where(Article::getAccountId).eq(Account::getId))
+            .where(Account::getAge).ge(18);
+
+        printSQL(queryWrapper);
+    }
+
+}