modify

Author: veasion

README.md

@@ -3,7 +3,7 @@
 veasion-db 是一个轻量级持久层ORM框架，除slf4j-api外不依赖任何第三方jar，该框架提供丰富灵活的数据库操作，
 单元测试 query/update 目录下有大量示例及demo。
 
-框架无需写任何SQL，基本支持sql能实现的任意查询或更新，如多表关联查询、多表关联更新、子查询、with、window、insert select、replace、不同数据库分页等。
+框架无需写SQL，基本支持任意查询或更新，如多表关联查询、多表关联更新、子查询、union、with、window、insert select、replace、不同数据库分页等。
 
 框架支持自定义拦截器，内置逻辑删除、数据隔离拦截器，可通过SPI或调用InterceptorUtils.addInterceptor方法加入扩展。
 ## maven 依赖

src/main/java/cn/veasion/db/interceptor/EntityDaoInterceptor.java

@@ -11,6 +11,9 @@ public interface EntityDaoInterceptor {
 
     <R> R intercept(EntityDaoInvocation<R> invocation);
 
+    /**
+     * 拦截器执行排序，sortIndex值越大越先执行
+     */
     default int sortIndex() {
         return 0;
     }

src/main/java/cn/veasion/db/jdbc/DataSourceProvider.java

@@ -1,6 +1,7 @@
 package cn.veasion.db.jdbc;
 
 import cn.veasion.db.base.JdbcTypeEnum;
+import cn.veasion.db.utils.ISort;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -12,7 +13,7 @@
  * @author luozhuowei
  * @date 2021/12/5
  */
-public interface DataSourceProvider {
+public interface DataSourceProvider extends ISort {
 
     /**
      * 获取数据源

src/main/java/cn/veasion/db/jdbc/DynamicTableExt.java

@@ -1,19 +1,16 @@
 package cn.veasion.db.jdbc;
 
 import cn.veasion.db.AbstractFilter;
+import cn.veasion.db.utils.ISort;
 
 /**
  * DynamicTableExt
  *
  * @author luozhuowei
  * @date 2022/1/30
  */
-public interface DynamicTableExt {
+public interface DynamicTableExt extends ISort {
 
     String getTableName(String tableName, Class<?> entityClazz, AbstractFilter<?> filter, Object source);
 
-    default int sort() {
-        return 0;
-    }
-
 }

src/main/java/cn/veasion/db/query/PageParam.java

@@ -1,5 +1,7 @@
 package cn.veasion.db.query;
 
+import cn.veasion.db.utils.ISort;
+
 import java.util.List;
 
 /**
@@ -8,7 +10,7 @@
  * @author luozhuowei
  * @date 2021/12/8
  */
-public abstract class PageParam {
+public abstract class PageParam implements ISort {
 
     protected int page = 1;
     protected int size = 10;
@@ -39,8 +41,4 @@ public void setSize(int size) {
         this.size = size;
     }
 
-    public int sort() {
-        return 0;
-    }
-
 }

src/main/java/cn/veasion/db/utils/ISort.java

@@ -0,0 +1,18 @@
+package cn.veasion.db.utils;
+
+/**
+ * ISort
+ *
+ * @author luozhuowei
+ * @date 2022/11/9
+ */
+public interface ISort {
+
+    /**
+     * 排序，值越大越优先
+     */
+    default int sort() {
+        return 0;
+    }
+
+}

src/main/java/cn/veasion/db/utils/ServiceLoaderUtils.java

@@ -3,8 +3,6 @@
 import cn.veasion.db.jdbc.DataSourceProvider;
 import cn.veasion.db.jdbc.DynamicTableExt;
 import cn.veasion.db.query.PageParam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,28 +16,21 @@
  */
 public class ServiceLoaderUtils {
 
-    private static Logger logger = LoggerFactory.getLogger(ServiceLoaderUtils.class);
-
     private static DataSourceProvider dataSourceProvider;
     private static DynamicTableExt dynamicTableExt;
     private static TypeConvert typeConvert;
     private static PageParam pageParam;
 
-    public synchronized static DataSourceProvider dataSourceProvider() {
+    public static DataSourceProvider dataSourceProvider() {
         if (dataSourceProvider != null) {
             return dataSourceProvider;
         }
-        List<DataSourceProvider> list = loadList(DataSourceProvider.class);
-        if (list.size() > 0) {
-            dataSourceProvider = list.get(0);
-        }
-        if (list.size() > 1) {
-            logger.warn("发现多个dataSourceProvider");
-        }
-        if (dataSourceProvider == null) {
-            logger.warn("dataSourceProvider未获取到实例");
+        synchronized (ServiceLoaderUtils.class) {
+            if (dataSourceProvider != null) {
+                return dataSourceProvider;
+            }
+            return (dataSourceProvider = loadOne(DataSourceProvider.class));
         }
-        return dataSourceProvider;
     }
 
     public static DynamicTableExt dynamicTableExt() {
@@ -50,14 +41,7 @@ public static DynamicTableExt dynamicTableExt() {
             if (dynamicTableExt != null) {
                 return dynamicTableExt;
             }
-            List<DynamicTableExt> list = loadList(DynamicTableExt.class);
-            if (list.size() > 0) {
-                if (list.size() > 1) {
-                    list.sort((a, b) -> -Integer.compare(a.sort(), b.sort()));
-                }
-                dynamicTableExt = list.get(0);
-            }
-            return dynamicTableExt;
+            return (dynamicTableExt = loadOne(DynamicTableExt.class));
         }
     }
 
@@ -69,14 +53,7 @@ public static TypeConvert typeConvert() {
             if (typeConvert != null) {
                 return typeConvert;
             }
-            List<TypeConvert> list = loadList(TypeConvert.class);
-            if (list.size() > 0) {
-                if (list.size() > 1) {
-                    list.sort((a, b) -> -Integer.compare(a.sort(), b.sort()));
-                }
-                typeConvert = list.get(0);
-            }
-            return typeConvert;
+            return (typeConvert = loadOne(TypeConvert.class));
         }
     }
 
@@ -88,26 +65,22 @@ public static PageParam pageParam() {
             if (pageParam != null) {
                 return pageParam;
             }
-            List<PageParam> list = loadList(PageParam.class);
-            if (list.size() > 0) {
-                if (list.size() > 1) {
-                    list.sort((a, b) -> -Integer.compare(a.sort(), b.sort()));
-                }
-                pageParam = list.get(0);
-            }
-            return pageParam;
+            return (pageParam = loadOne(PageParam.class));
         }
     }
 
-    @Deprecated
     public static <T> T loadOne(Class<T> clazz) {
         List<T> list = loadList(clazz);
         return list.size() > 0 ? list.get(0) : null;
     }
 
+    @SuppressWarnings("unchecked")
     public static <T> List<T> loadList(Class<T> clazz) {
         List<T> list = new ArrayList<>();
         ServiceLoader.load(clazz).forEach(list::add);
+        if (list.size() > 1 && ISort.class.isAssignableFrom(clazz)) {
+            ((List<ISort>) list).sort((a, b) -> -Integer.compare(a.sort(), b.sort()));
+        }
         return list;
     }
 

src/main/java/cn/veasion/db/utils/TypeConvert.java

@@ -6,16 +6,12 @@
  * @author luozhuowei
  * @date 2021/12/8
  */
-public interface TypeConvert {
+public interface TypeConvert extends ISort {
 
     <T> T convert(Object object, Class<T> clazz);
 
     default Object convertValue(Object value) {
         return value;
     }
 
-    default int sort() {
-        return 0;
-    }
-
 }