调整代码顺序

abel533 · abel533 · commit 902267de9274 · 2015-08-29T13:27:15.000+08:00
diff --git a/src/main/java/tk/mybatis/mapper/mapperhelper/MapperTemplate.java b/src/main/java/tk/mybatis/mapper/mapperhelper/MapperTemplate.java
@@ -102,6 +102,12 @@ public static String getMethodName(String msId) {
         return msId.substring(msId.lastIndexOf(".") + 1);
     }
 
+    /**
+     * 该方法仅仅用来初始化ProviderSqlSource
+     *
+     * @param record
+     * @return
+     */
     public String dynamicSQL(Object record) {
         return "dynamicSQL";
     }
@@ -128,6 +134,10 @@ public boolean getBEFORE() {
         return mapperHelper.getConfig().getBEFORE();
     }
 
+    public boolean isNotEmpty() {
+        return mapperHelper.getConfig().isNotEmpty();
+    }
+
     /**
      * 是否支持该通用方法
      *
@@ -172,15 +182,15 @@ protected void setSqlSource(MappedStatement ms, SqlSource sqlSource) {
     }
 
     /**
-     * check ms cache
+     * 检查是否配置过缓存
      *
      * @param ms
      * @throws Exception
      */
     private void checkCache(MappedStatement ms) throws Exception {
         if (ms.getCache() == null) {
             String nameSpace = ms.getId().substring(0, ms.getId().lastIndexOf("."));
-            Cache cache = null;
+            Cache cache;
             try {
                 //不存在的时候会抛出异常
                 cache = ms.getConfiguration().getCache(nameSpace);
@@ -207,13 +217,18 @@ public void setSqlSource(MappedStatement ms) throws Exception {
         }
         Method method = methodMap.get(getMethodName(ms));
         try {
+            //第一种，直接操作ms，不需要返回值
             if (method.getReturnType() == Void.TYPE) {
                 method.invoke(this, ms);
-            } else if (SqlNode.class.isAssignableFrom(method.getReturnType())) {
+            }
+            //第二种，返回SqlNode
+            else if (SqlNode.class.isAssignableFrom(method.getReturnType())) {
                 SqlNode sqlNode = (SqlNode) method.invoke(this, ms);
                 DynamicSqlSource dynamicSqlSource = new DynamicSqlSource(ms.getConfiguration(), sqlNode);
                 setSqlSource(ms, dynamicSqlSource);
-            } else if (String.class.equals(method.getReturnType())) {
+            }
+            //第三种，返回xml形式的sql字符串
+            else if (String.class.equals(method.getReturnType())) {
                 String xmlSql = (String) method.invoke(this, ms);
                 SqlSource sqlSource = createSqlSource(ms, xmlSql);
                 //替换原有的SqlSource
@@ -230,6 +245,17 @@ public void setSqlSource(MappedStatement ms) throws Exception {
         }
     }
 
+    /**
+     * 通过xmlSql创建sqlSource
+     *
+     * @param ms
+     * @param xmlSql
+     * @return
+     */
+    public SqlSource createSqlSource(MappedStatement ms, String xmlSql) {
+        return languageDriver.createSqlSource(ms.getConfiguration(), "<script>\n\t" + xmlSql + "</script>", null);
+    }
+
     /**
      * 获取返回值类型 - 实体类型
      *
@@ -392,7 +418,7 @@ protected SqlNode getAllIfColumnNode(Class<?> entityClass) {
         boolean first = true;
         //对所有列循环，生成<if test="property!=null">column = #{property}</if>
         for (EntityColumn column : columnList) {
-            ifNodes.add(getIfNotNull(column, getColumnEqualsProperty(column, first), mapperHelper.getConfig().isNotEmpty()));
+            ifNodes.add(getIfNotNull(column, getColumnEqualsProperty(column, first), isNotEmpty()));
             first = false;
         }
         return new MixedSqlNode(ifNodes);
@@ -548,8 +574,4 @@ public WhereSqlNode updateByExampleWhereClause(Configuration configuration) {
         WhereSqlNode whereSqlNode = new WhereSqlNode(configuration, forEachSqlNode);
         return whereSqlNode;
     }
-
-    public SqlSource createSqlSource(MappedStatement ms, String xmlSql) {
-        return languageDriver.createSqlSource(ms.getConfiguration(), "<script>\n\t" + xmlSql + "</script>", null);
-    }
 }
