支持REPLACE & 优化SPI扩展

veasion · Oct 22, 2022 · 41a7cf3 · 41a7cf3
1 parent 6bcce3a
commit 41a7cf3
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ veasion-db 是一个轻量级持久层db框架，除slf4j-api外不依赖任何
 <dependency>
     <groupId>cn.veasion</groupId>
     <artifactId>veasion-db</artifactId>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
 </dependency>
 ```
 支持sql解析生成veasion-db代码

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>cn.veasion</groupId>
     <artifactId>veasion-db</artifactId>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
 
     <name>veasion-db</name>
     <url>https://github.com/veasion/veasion-db</url>

diff --git a/src/main/java/cn/veasion/db/jdbc/AbstractSQL.java b/src/main/java/cn/veasion/db/jdbc/AbstractSQL.java
@@ -31,11 +31,7 @@ public abstract class AbstractSQL<T> {
     protected List<Object> values = new ArrayList<>();
     protected DynamicTableExt dynamicTableExt = ServiceLoaderUtils.dynamicTableExt();
 
-    static TypeConvert typeConvert;
-
-    static {
-        typeConvert = ServiceLoaderUtils.loadOne(TypeConvert.class);
-    }
+    static TypeConvert typeConvert = ServiceLoaderUtils.typeConvert();
 
     public String getSQL() {
         return sql.toString();

diff --git a/src/main/java/cn/veasion/db/jdbc/DynamicTableExt.java b/src/main/java/cn/veasion/db/jdbc/DynamicTableExt.java
@@ -12,4 +12,8 @@ public interface DynamicTableExt {
 
     String getTableName(String tableName, Class<?> entityClazz, AbstractFilter<?> filter, Object source);
 
+    default int sort() {
+        return 0;
+    }
+
 }
diff --git a/src/main/java/cn/veasion/db/jdbc/InsertSQL.java b/src/main/java/cn/veasion/db/jdbc/InsertSQL.java
@@ -63,7 +63,11 @@ private void insert(Class<?> entityClazz, List<Map<String, Object>> fieldValueMa
         Map<String, String> fieldColumns = FieldUtils.entityFieldColumns(entityClazz);
         Set<String> fields = fieldValueMapList.get(0).keySet();
 
-        sql.append("INSERT INTO ");
+        if (source instanceof EntityInsert && ((EntityInsert) source).isReplace()) {
+            sql.append("REPLACE INTO ");
+        } else {
+            sql.append("INSERT INTO ");
+        }
         sql.append(getTableName(entityClazz, null, source)).append(" (");
         for (String field : fields) {
             appendInsertColumn(fieldColumns.get(field));

diff --git a/src/main/java/cn/veasion/db/query/AbstractQuery.java b/src/main/java/cn/veasion/db/query/AbstractQuery.java
@@ -160,7 +160,7 @@ public T page(PageParam pageParam) {
     }
 
     public T page(int page, int size) {
-        PageParam pageParam = ServiceLoaderUtils.loadOne(PageParam.class);
+        PageParam pageParam = ServiceLoaderUtils.pageParam();
         if (pageParam != null) {
             this.pageParam = pageParam;
             this.pageParam.setPage(page);

diff --git a/src/main/java/cn/veasion/db/query/PageParam.java b/src/main/java/cn/veasion/db/query/PageParam.java
@@ -38,4 +38,9 @@ public int getSize() {
     public void setSize(int size) {
         this.size = size;
     }
+
+    public int sort() {
+        return 0;
+    }
+
 }
diff --git a/src/main/java/cn/veasion/db/update/EntityInsert.java b/src/main/java/cn/veasion/db/update/EntityInsert.java
@@ -23,6 +23,7 @@ public class EntityInsert {
     private Set<String> skipFields;
     private boolean useGeneratedKeys = true;
     private Map<String, Object> fieldValueMap;
+    private boolean replace;
 
     public EntityInsert(Object entity) {
         this.entity = Objects.requireNonNull(entity);
@@ -60,6 +61,15 @@ public void setEntityClass(Class<?> entityClass) {
         this.entityClass = entityClass;
     }
 
+    public EntityInsert withReplace() {
+        this.replace = true;
+        return this;
+    }
+
+    public boolean isReplace() {
+        return replace;
+    }
+
     public void check(Class<?> mainEntityClass) {
         if (entityClass == null) {
             setEntityClass(mainEntityClass);

diff --git a/src/main/java/cn/veasion/db/utils/FieldUtils.java b/src/main/java/cn/veasion/db/utils/FieldUtils.java
@@ -162,7 +162,7 @@ public static boolean setValue(Object object, String field, Object value, boolea
                 return f != null;
             }
         } catch (Exception e) {
-            throw new DbException("字段赋值异常: " + field, e);
+            throw new DbException("字段赋值异常: " + field + " [" + (value == null ? null : value.getClass().getName()) + "]", e);
         }
     }
 

diff --git a/src/main/java/cn/veasion/db/utils/ServiceLoaderUtils.java b/src/main/java/cn/veasion/db/utils/ServiceLoaderUtils.java
@@ -2,6 +2,7 @@
 
 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;
 
@@ -21,6 +22,8 @@ public class ServiceLoaderUtils {
 
     private static DataSourceProvider dataSourceProvider;
     private static DynamicTableExt dynamicTableExt;
+    private static TypeConvert typeConvert;
+    private static PageParam pageParam;
 
     public synchronized static DataSourceProvider dataSourceProvider() {
         if (dataSourceProvider != null) {
@@ -39,13 +42,64 @@ public synchronized static DataSourceProvider dataSourceProvider() {
         return dataSourceProvider;
     }
 
-    public synchronized static DynamicTableExt dynamicTableExt() {
+    public static DynamicTableExt dynamicTableExt() {
         if (dynamicTableExt != null) {
             return dynamicTableExt;
         }
-        return dynamicTableExt = loadOne(DynamicTableExt.class);
+        synchronized (ServiceLoaderUtils.class) {
+            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;
+        }
+    }
+
+    public static TypeConvert typeConvert() {
+        if (typeConvert != null) {
+            return typeConvert;
+        }
+        synchronized (ServiceLoaderUtils.class) {
+            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;
+        }
+    }
+
+    public static PageParam pageParam() {
+        if (pageParam != null) {
+            return pageParam;
+        }
+        synchronized (ServiceLoaderUtils.class) {
+            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;
+        }
     }
 
+    @Deprecated
     public static <T> T loadOne(Class<T> clazz) {
         List<T> list = loadList(clazz);
         return list.size() > 0 ? list.get(0) : null;

diff --git a/src/main/java/cn/veasion/db/utils/TypeConvert.java b/src/main/java/cn/veasion/db/utils/TypeConvert.java
@@ -14,4 +14,8 @@ default Object convertValue(Object value) {
         return value;
     }
 
+    default int sort() {
+        return 0;
+    }
+
 }
diff --git a/src/main/java/cn/veasion/db/utils/TypeUtils.java b/src/main/java/cn/veasion/db/utils/TypeUtils.java
@@ -22,11 +22,7 @@
 @SuppressWarnings("unchecked")
 public class TypeUtils {
 
-    static TypeConvert typeConvert;
-
-    static {
-        typeConvert = ServiceLoaderUtils.loadOne(TypeConvert.class);
-    }
+    static TypeConvert typeConvert = ServiceLoaderUtils.typeConvert();
 
     public static String getTableName(Class<?> entityClazz) {
         Table annotation = entityClazz.getAnnotation(Table.class);

diff --git a/src/test/java/cn/veasion/db/update/InsertTest.java b/src/test/java/cn/veasion/db/update/InsertTest.java
@@ -50,6 +50,14 @@ public static void main(String[] args) {
                         .eq("sno", "s001")
                         .notExists(SubQueryParam.build(new Q("1").eq("sno", "copy_s001")))
         )));
+
+        // replace into
+        StudentPO student = getStudent();
+        student.setId(System.currentTimeMillis());
+        student.setDesc("replace: add");
+        studentDao.add(new EntityInsert(student).withReplace());
+        student.setDesc("replace: update");
+        studentDao.add(new EntityInsert(student).withReplace());
     }
 
     private static StudentPO getStudent() {