Merge pull request #294 from kazuki43zoo/gh-258_backport-to-1.3.x

Change a method for preventing package based mapper scan

Author: kazuki43zoo

mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2015-2018 the original author or authors.
+ *    Copyright 2015-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -188,28 +188,28 @@ public static class AutoConfiguredMapperScannerRegistrar
     @Override
     public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 
-      logger.debug("Searching for mappers annotated with @Mapper");
-
-      ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry);
+      if (!AutoConfigurationPackages.has(this.beanFactory)) {
+        logger.debug("Could not determine auto-configuration package, automatic mapper scanning disabled.");
+        return;
+      }
 
-      try {
-        if (this.resourceLoader != null) {
-          scanner.setResourceLoader(this.resourceLoader);
-        }
+      logger.debug("Searching for mappers annotated with @Mapper");
 
-        List<String> packages = AutoConfigurationPackages.get(this.beanFactory);
-        if (logger.isDebugEnabled()) {
-          for (String pkg : packages) {
-            logger.debug("Using auto-configuration base package '{}'", pkg);
-          }
+      List<String> packages = AutoConfigurationPackages.get(this.beanFactory);
+      if (logger.isDebugEnabled()) {
+        for (String pkg : packages) {
+          logger.debug("Using auto-configuration base package '{}'", pkg);
         }
+      }
 
-        scanner.setAnnotationClass(Mapper.class);
-        scanner.registerFilters();
-        scanner.doScan(StringUtils.toStringArray(packages));
-      } catch (IllegalStateException ex) {
-        logger.debug("Could not determine auto-configuration package, automatic mapper scanning disabled.", ex);
+      ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry);
+      if (this.resourceLoader != null) {
+        scanner.setResourceLoader(this.resourceLoader);
       }
+      scanner.setAnnotationClass(Mapper.class);
+      scanner.registerFilters();
+      scanner.doScan(StringUtils.toStringArray(packages));
+
     }
 
     @Override