3.2.0-SNAPSHOT

abel533 · abel533 · commit 6472c8ab5b27 · 2015-08-26T22:21:59.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>tk.mybatis</groupId>
     <artifactId>mapper</artifactId>
-    <version>3.1.3</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>mapper</name>
@@ -42,6 +42,27 @@
             <artifactId>persistence-api</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>1.2.1</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>3.2.12.RELEASE</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>3.2.12.RELEASE</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
 
         <!--可选依赖-->
         <dependency>
diff --git a/src/main/java/tk/mybatis/mapper/mapperhelper/MapperHelper.java b/src/main/java/tk/mybatis/mapper/mapperhelper/MapperHelper.java
@@ -57,10 +57,6 @@ public class MapperHelper {
      * 缓存msid和MapperTemplate
      */
     private Map<String, MapperTemplate> msIdCache = new HashMap<String, MapperTemplate>();
-    /**
-     * 缓存已经处理过的Collection<MappedStatement>
-     */
-    private Set<Collection<MappedStatement>> collectionSet = new HashSet<Collection<MappedStatement>>();
     /**
      * 是否使用的Spring
      */
@@ -570,12 +566,6 @@ public void setProperties(Properties properties) {
      */
     public void processConfiguration(Configuration configuration) {
         Collection<MappedStatement> collection = configuration.getMappedStatements();
-        //防止反复处理一个
-        if (collectionSet.contains(collection)) {
-            return;
-        } else {
-            collectionSet.add(collection);
-        }
         int size = collection.size();
         Iterator<?> iterator = collection.iterator();
         while (iterator.hasNext()) {
diff --git a/src/main/java/tk/mybatis/mapper/mapperhelper/MapperInterceptor.java b/src/main/java/tk/mybatis/mapper/mapperhelper/MapperInterceptor.java
@@ -36,8 +36,10 @@
 /**
  * 通用Mapper拦截器
  *
+ * @deprecated 使用MapperHelper直接配置效果更好
  * @author liuzh
  */
+@Deprecated
 @Intercepts({
         @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}),
         @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})
diff --git a/src/test/java/tk/mybatis/mapper/mapper/MybatisJavaHelper.java b/src/test/java/tk/mybatis/mapper/mapper/MybatisJavaHelper.java
@@ -39,19 +39,19 @@ public class MybatisJavaHelper {
                 // 设置UUID生成策略
                 // 配置UUID生成策略需要使用OGNL表达式
                 // 默认值32位长度:@java.util.UUID@randomUUID().toString().replace("-", "")
-                mapperHelper.setUUID("");
+                //mapperHelper.setUUID("");
                 // 主键自增回写方法,默认值MYSQL,详细说明请看文档
                 mapperHelper.setIDENTITY("HSQLDB");
                 // 序列的获取规则,使用{num}格式化参数，默认值为{0}.nextval，针对Oracle
                 // 可选参数一共3个，对应0,1,2,分别为SequenceName，ColumnName, PropertyName
-                mapperHelper.setSeqFormat("NEXT VALUE FOR {0}");
+                //mapperHelper.setSeqFormat("NEXT VALUE FOR {0}");
                 // 设置全局的catalog,默认为空，如果设置了值，操作表时的sql会是catalog.tablename
-                mapperHelper.setCatalog("");
+                //mapperHelper.setCatalog("");
                 // 设置全局的schema,默认为空，如果设置了值，操作表时的sql会是schema.tablename
                 // 如果同时设置了catalog,优先使用catalog.tablename
-                mapperHelper.setSchema("");
+                //mapperHelper.setSchema("");
                 // 主键自增回写方法执行顺序,默认AFTER,可选值为(BEFORE|AFTER)
-                mapperHelper.setOrder("AFTER");
+                //mapperHelper.setOrder("AFTER");
                 // 注册通用Mapper接口 - 可以自动注册继承的接口
                 mapperHelper.registerMapper(Mapper.class);
                 mapperHelper.registerMapper(HsqldbMapper.class);
