Browse Source

修改优化

jobob 8 năm trước cách đây
mục cha
commit
896dc4b1a9

+ 7 - 10
mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisConfiguration.java

@@ -60,7 +60,7 @@ public class MybatisConfiguration extends Configuration {
 	/*
 	 * Mapper 注册
 	 */
-	public final MybatisPulsMapperRegistry mybatisPulsMapperRegistry = new MybatisPulsMapperRegistry(this);
+	public final MybatisMapperRegistry mybatisMapperRegistry = new MybatisMapperRegistry(this);
 	/**
 	 * 缓存注册标识
 	 */
@@ -121,37 +121,34 @@ public class MybatisConfiguration extends Configuration {
 		super.setDefaultScriptingLanguage(driver);
 	}
 
-	/**
-	 * Mapper注册
-	 */
 	@Override
 	public MapperRegistry getMapperRegistry() {
-		return mybatisPulsMapperRegistry;
+		return mybatisMapperRegistry;
 	}
 
 	@Override
 	public <T> void addMapper(Class<T> type) {
-		mybatisPulsMapperRegistry.addMapper(type);
+		mybatisMapperRegistry.addMapper(type);
 	}
 
 	@Override
 	public void addMappers(String packageName, Class<?> superType) {
-		mybatisPulsMapperRegistry.addMappers(packageName, superType);
+		mybatisMapperRegistry.addMappers(packageName, superType);
 	}
 
 	@Override
 	public void addMappers(String packageName) {
-		mybatisPulsMapperRegistry.addMappers(packageName);
+		mybatisMapperRegistry.addMappers(packageName);
 	}
 
 	@Override
 	public <T> T getMapper(Class<T> type, SqlSession sqlSession) {
-		return mybatisPulsMapperRegistry.getMapper(type, sqlSession);
+		return mybatisMapperRegistry.getMapper(type, sqlSession);
 	}
 
 	@Override
 	public boolean hasMapper(Class<?> type) {
-		return mybatisPulsMapperRegistry.hasMapper(type);
+		return mybatisMapperRegistry.hasMapper(type);
 	}
 
 }

+ 8 - 3
mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisPlusMapperBuilder.java → mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisMapperAnnotationBuilder.java

@@ -90,11 +90,14 @@ import java.util.Map;
 import java.util.Set;
 
 /**
+ * <p>
  * 继承 MapperAnnotationBuilder 没有XML配置文件注入基础CRUD方法
- *
+ * </p>
+ * 
  * @author Caratacus
+ * @Date 2016-09-26
  */
-public class MybatisPlusMapperBuilder extends MapperAnnotationBuilder {
+public class MybatisMapperAnnotationBuilder extends MapperAnnotationBuilder {
 
     private final Set<Class<? extends Annotation>> sqlAnnotationTypes = new HashSet<Class<? extends Annotation>>();
     private final Set<Class<? extends Annotation>> sqlProviderAnnotationTypes = new HashSet<Class<? extends Annotation>>();
@@ -103,7 +106,7 @@ public class MybatisPlusMapperBuilder extends MapperAnnotationBuilder {
     private MapperBuilderAssistant assistant;
     private Class<?> type;
 
-    public MybatisPlusMapperBuilder(Configuration configuration, Class<?> type) {
+    public MybatisMapperAnnotationBuilder(Configuration configuration, Class<?> type) {
         super(configuration, type);
         String resource = type.getName().replace('.', '/') + ".java (best guess)";
         this.assistant = new MapperBuilderAssistant(configuration, resource);
@@ -138,6 +141,7 @@ public class MybatisPlusMapperBuilder extends MapperAnnotationBuilder {
                     configuration.addIncompleteMethod(new MethodResolver(this, method));
                 }
             }
+            //TODO 注入存在 xxMapper.xml CURD
            inspectInject(existXml);
         }
         parsePendingMethods();
@@ -172,6 +176,7 @@ public class MybatisPlusMapperBuilder extends MapperAnnotationBuilder {
      *
      * @return boolean ture存在,flase不存在
      */
+    //TODO 该方法改为返回 boolean 判断是否存在 xxxMapper.xml
     private boolean loadXmlResource() {
         boolean flag = true;
         // Spring may not know the real resource name so we check a flag

+ 14 - 12
mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisPulsMapperRegistry.java → mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisMapperRegistry.java

@@ -15,30 +15,31 @@
  */
 package com.baomidou.mybatisplus;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.ibatis.binding.BindingException;
 import org.apache.ibatis.binding.MapperProxyFactory;
 import org.apache.ibatis.binding.MapperRegistry;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
+ * <p>
  * 继承至MapperRegistry
+ * </p>
  * 
- * @author Clinton Begin
- * @author Eduardo Macarron
- * @author Lasse Voss
+ * @author Caratacus
+ * @Date 2016-09-26
  */
-public class MybatisPulsMapperRegistry extends MapperRegistry {
+public class MybatisMapperRegistry extends MapperRegistry {
 
 	private final Configuration config;
 	private final Map<Class<?>, MapperProxyFactory<?>> knownMappers = new HashMap<Class<?>, MapperProxyFactory<?>>();
 
-	public MybatisPulsMapperRegistry(Configuration config) {
+	public MybatisMapperRegistry(Configuration config) {
 		super(config);
 		this.config = config;
 	}
@@ -63,7 +64,7 @@ public class MybatisPulsMapperRegistry extends MapperRegistry {
 	public <T> void addMapper(Class<T> type) {
 		if (type.isInterface()) {
 			if (hasMapper(type)) {
-				// 如果之前注入 直接返回
+				//TODO 如果之前注入 直接返回
 				return;
 				// throw new BindingException("Type " + type +
 				// " is already known to the MybatisPlusMapperRegistry.");
@@ -76,7 +77,8 @@ public class MybatisPulsMapperRegistry extends MapperRegistry {
 				// otherwise the binding may automatically be attempted by the
 				// mapper parser. If the type is already known, it won't try.
 
-				MybatisPlusMapperBuilder parser = new MybatisPlusMapperBuilder(config, type);
+				//TODO 自定义无 XML 注入
+				MybatisMapperAnnotationBuilder parser = new MybatisMapperAnnotationBuilder(config, type);
 				parser.parse();
 				loadCompleted = true;
 			} finally {

+ 1 - 1
mybatis-plus/src/test/resources/mysql-config.xml

@@ -82,7 +82,7 @@
 				<property name="driver" value="com.mysql.jdbc.Driver" />
 				<property name="url" value="jdbc:mysql://localhost:3306/mybatis-plus" />
 				<property name="username" value="root" />
-				<property name="password" value="521" />
+				<property name="password" value="123456" />
 			<!-- 
 				<property name="driver" value="${jdbc.driver}" />
 				<property name="url" value="${jdbc.url}" />