通过 addExcludeFilter 排除带有 @RegisterMapper 注解的接口

abel533 · abel533 · commit 10e828595471 · 2018-12-16T21:12:03.000+08:00
diff --git a/spring/src/main/java/tk/mybatis/spring/mapper/ClassPathMapperScanner.java b/spring/src/main/java/tk/mybatis/spring/mapper/ClassPathMapperScanner.java
@@ -34,7 +34,6 @@
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.MapperException;
-import tk.mybatis.mapper.annotation.RegisterMapper;
 import tk.mybatis.mapper.entity.Config;
 import tk.mybatis.mapper.mapperhelper.MapperHelper;
 
@@ -125,7 +124,11 @@ public boolean match(MetadataReader metadataReader, MetadataReaderFactory metada
             @Override
             public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
                 String className = metadataReader.getClassMetadata().getClassName();
-                return className.endsWith("package-info");
+                if(className.endsWith("package-info")){
+                    return true;
+                }
+                return metadataReader.getAnnotationMetadata()
+                    .hasAnnotation("tk.mybatis.mapper.annotation.RegisterMapper");
             }
         });
     }
@@ -221,14 +224,6 @@ protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
     @Override
     protected boolean checkCandidate(String beanName, BeanDefinition beanDefinition) {
         if (super.checkCandidate(beanName, beanDefinition)) {
-            String beanClassName = beanDefinition.getBeanClassName();
-            if(beanClassName != null && !beanClassName.isEmpty()){
-                try {
-                    return Class.forName(beanClassName).getAnnotation(RegisterMapper.class) == null;
-                } catch (Throwable t){
-                    logger.warn("Check XXXMapper Annotation error <[" + beanClassName + "]>", t);
-                }
-            }
             return true;
         } else {
             logger.warn("Skipping MapperFactoryBean with name '" + beanName
