Browse Source

升级mybatis3.5.0

nieqiuqiu 6 years ago
parent
commit
ae561ad21d

+ 1 - 1
build.gradle

@@ -16,7 +16,7 @@ ext {
 
     libraries = [
         mybatisSpringVersion = '1.3.2',
-        mybatisVersion = '3.4.6',
+        mybatisVersion = '3.5.0',
         springVersion = '5.1.2.RELEASE',
         jsqlparserVersion = '1.3',
     ]

+ 2 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java

@@ -22,6 +22,7 @@ import org.apache.ibatis.binding.MapperRegistry;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.scripting.LanguageDriver;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
 
@@ -103,7 +104,7 @@ public class MybatisConfiguration extends Configuration {
     }
 
     @Override
-    public void setDefaultScriptingLanguage(Class<?> driver) {
+    public void setDefaultScriptingLanguage(Class<? extends LanguageDriver> driver) {
         if (driver == null) {
             /* 设置自定义 driver */
             driver = MybatisXMLLanguageDriver.class;

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisMapperAnnotationBuilder.java

@@ -357,7 +357,7 @@ public class MybatisMapperAnnotationBuilder extends MapperAnnotationBuilder {
 
     private LanguageDriver getLanguageDriver(Method method) {
         Lang lang = method.getAnnotation(Lang.class);
-        Class<?> langClass = null;
+        Class<? extends LanguageDriver> langClass = null;
         if (lang != null) {
             langClass = lang.value();
         }