BaseMapper 判断优化

Author: wangliang

src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java

@@ -44,7 +44,7 @@ public String createQuery(Query query) {
 
     public String createUpdateSql() {
         if (tableInfo.getIdColumnFiled().getValue() == null) {
-            throw new RuntimeException("no Id value,do't create update sql.");
+            throw new RuntimeException("no Id value,don't create update sql.");
         }
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("update ");

src/main/java/com/codingapi/simplemybatis/parser/TableParser.java

@@ -1,7 +1,7 @@
 package com.codingapi.simplemybatis.parser;
 
-import com.codingapi.simplemybatis.properties.DbProperties.ColumnNameStyle;
-import com.codingapi.simplemybatis.properties.GlabelProperties;
+import com.codingapi.simplemybatis.properties.SimpleMybatisProperties.ColumnNameStyle;
+import com.codingapi.simplemybatis.properties.SimpleMybatisPropertiesContext;
 import com.codingapi.simplemybatis.utils.StringCharacterUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,15 +36,16 @@ public class TableParser {
 
     public TableParser(Class<?> clazz) {
         this.clazz = clazz;
-        columnNameStyle = GlabelProperties.getInstance().getColumnNameStyle();
+        columnNameStyle = SimpleMybatisPropertiesContext.getInstance().getColumnNameStyle();
         propertyDescriptors = PropertyUtils.getPropertyDescriptors(clazz);
         columns = new ArrayList<>();
         loadTableName();
     }
 
 
-    public void parser(Object obj) throws IllegalAccessException, InvocationTargetException {
+    public TableInfo parser(Object obj) throws IllegalAccessException, InvocationTargetException {
         loadColumnNames(obj);
+        return new TableInfo(tableName, idColumn, columns);
     }
 
     private void loadColumnNames(Object obj) throws IllegalAccessException, InvocationTargetException {
@@ -138,9 +139,6 @@ private String getColumnStyleName(String name) {
         }
     }
 
-    public TableInfo getTableInfo() {
-        return new TableInfo(tableName, idColumn, columns);
-    }
 
 
     public static class ColumnFiled {

src/main/java/com/codingapi/simplemybatis/properties/GlabelProperties.java

@@ -1,7 +1,7 @@
 package com.codingapi.simplemybatis.properties;
 
 
-public class DbProperties {
+public class SimpleMybatisProperties {
 
     private ColumnNameStyle columnNameStyle = ColumnNameStyle.UNDERLINE;
 
@@ -12,4 +12,8 @@ public enum ColumnNameStyle {
     public ColumnNameStyle getColumnNameStyle() {
         return columnNameStyle;
     }
+
+    public void setColumnNameStyle(ColumnNameStyle columnNameStyle) {
+        this.columnNameStyle = columnNameStyle;
+    }
 }

src/main/java/com/codingapi/simplemybatis/properties/DbProperties.java renamed to src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisProperties.java

@@ -0,0 +1,34 @@
+package com.codingapi.simplemybatis.properties;
+
+
+import com.codingapi.simplemybatis.properties.SimpleMybatisProperties.ColumnNameStyle;
+
+public class SimpleMybatisPropertiesContext {
+
+    private static SimpleMybatisPropertiesContext instance;
+
+    public static SimpleMybatisPropertiesContext getInstance() {
+        if(instance==null){
+            synchronized (SimpleMybatisPropertiesContext.class){
+                instance = new SimpleMybatisPropertiesContext();
+            }
+        }
+        return instance;
+    }
+
+    private final SimpleMybatisProperties simpleMybatisProperties;
+
+    private SimpleMybatisPropertiesContext() {
+        simpleMybatisProperties = new SimpleMybatisProperties();
+    }
+
+    public void setColumnNameStyle(ColumnNameStyle columnNameStyle) {
+        simpleMybatisProperties.setColumnNameStyle(columnNameStyle);
+    }
+
+    public ColumnNameStyle getColumnNameStyle() {
+        return simpleMybatisProperties.getColumnNameStyle();
+    }
+
+
+}

src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisPropertiesContext.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.simplemybatis.mapper.*;
 import com.codingapi.simplemybatis.parser.SqlParser;
+import com.codingapi.simplemybatis.parser.TableInfo;
 import com.codingapi.simplemybatis.parser.TableParser;
 import org.apache.ibatis.builder.annotation.ProviderContext;
 
@@ -16,12 +17,9 @@ protected Class<?> entityType(ProviderContext context) {
         return Stream.of(context.getMapperType().getGenericInterfaces())
                 .filter(ParameterizedType.class::isInstance)
                 .map(ParameterizedType.class::cast)
-                .filter(type -> (type.getRawType() == BaseMapper.class
-                        || type.getRawType() == CommonMapper.class
-                        || type.getRawType() == QueryMapper.class
-                        || type.getRawType() == SimpleMapper.class
-                        || type.getRawType() == TreeMapper.class
-                        || type.getRawType() == PageMapper.class)
+                .filter(
+                        (type) ->
+                                type.getRawType().getClass().isInstance(BaseMapper.class)
                 )
                 .findFirst()
                 .map(type -> type.getActualTypeArguments()[0])
@@ -34,8 +32,8 @@ protected SqlParser createParser(Object obj, ProviderContext context)
             throws IllegalAccessException, InvocationTargetException {
         Class clazz = entityType(context);
         TableParser tableParser = new TableParser(clazz);
-        tableParser.parser(obj);
-        return new SqlParser(tableParser.getTableInfo());
+        TableInfo tableInfo = tableParser.parser(obj);
+        return new SqlParser(tableInfo);
     }
 
 }

src/main/java/com/codingapi/simplemybatis/provider/BaseProvider.java

@@ -22,8 +22,8 @@ private Demo createDemo(){
     private SqlParser createSqlParser() throws InvocationTargetException, IllegalAccessException {
         Demo demo = createDemo();
         TableParser tableParser = new TableParser(demo.getClass());
-        tableParser.parser(demo);
-        return new SqlParser(tableParser.getTableInfo());
+        TableInfo tableInfo =  tableParser.parser(demo);
+        return new SqlParser(tableInfo);
     }
 
     @Test
@@ -88,4 +88,4 @@ void createGetByIdSql() throws InvocationTargetException, IllegalAccessException
         String sql = sqlParser.createGetByIdSql();
         System.out.println(sql);
     }
-}
+}

src/test/java/com/codingapi/simplemybatis/parser/SqlParserTest.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.simplemybatis.entity.Demo;
 import com.codingapi.simplemybatis.parser.SqlParser;
+import com.codingapi.simplemybatis.parser.TableInfo;
 import com.codingapi.simplemybatis.parser.TableParser;
 import org.junit.jupiter.api.Test;
 
@@ -24,8 +25,8 @@ private Demo createDemo(){
     private SqlParser createSqlParser() throws InvocationTargetException, IllegalAccessException {
         Demo demo = createDemo();
         TableParser tableParser = new TableParser(demo.getClass());
-        tableParser.parser(demo);
-        return new SqlParser(tableParser.getTableInfo());
+        TableInfo tableInfo  = tableParser.parser(demo);
+        return new SqlParser(tableInfo);
     }
 
 
@@ -114,4 +115,4 @@ void queryNotNullView() throws InvocationTargetException, IllegalAccessException
     }
 
 
-}
+}