Optimized process to parse excludeFilters and add 'processPropertyPlaceHolders' turn off test

Author: apdya

src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java

@@ -407,7 +407,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) {
     scanner.setAddToConfig(this.addToConfig);
     scanner.setAnnotationClass(this.annotationClass);
     scanner.setMarkerInterface(this.markerInterface);
-    scanner.setExcludeFilters(this.excludeFilters);
+    scanner.setExcludeFilters(this.excludeFilters = mergeExcludeFilters());
     scanner.setSqlSessionFactory(this.sqlSessionFactory);
     scanner.setSqlSessionTemplate(this.sqlSessionTemplate);
     scanner.setSqlSessionFactoryBeanName(this.sqlSessionFactoryBeanName);
@@ -467,7 +467,6 @@ private void processPropertyPlaceHolders() {
     this.lazyInitialization = Optional.ofNullable(this.lazyInitialization).map(getEnvironment()::resolvePlaceholders)
         .orElse(null);
     this.defaultScope = Optional.ofNullable(this.defaultScope).map(getEnvironment()::resolvePlaceholders).orElse(null);
-    this.excludeFilters = mergeExcludeFilters();
   }
 
   private Environment getEnvironment() {
@@ -528,7 +527,9 @@ private List<TypeFilter> mergeExcludeFilters() {
   private TypeFilter createTypeFilter(String filterType, String expression, @Nullable ClassLoader classLoader)
       throws ClassNotFoundException {
 
-    expression = this.getEnvironment().resolvePlaceholders(expression);
+    if (this.processPropertyPlaceHolders) {
+      expression = this.getEnvironment().resolvePlaceholders(expression);
+    }
 
     switch (filterType) {
       case "annotation":

src/test/java/org/mybatis/spring/filter/ScanFilterTest.java

@@ -20,6 +20,8 @@
 
 import com.mockrunner.mock.jdbc.MockDataSource;
 
+import java.util.regex.PatternSyntaxException;
+
 import org.junit.jupiter.api.Test;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.filter.config.AppConfig;
@@ -189,6 +191,19 @@ void invalidPropertyClasses() {
         () -> startContext(AppConfig.RegexTypeWithClassesPropertyConfig.class));
   }
 
+  @Test
+  void processPropertyPlaceHoldersSwitchTest() {
+    // if processPropertyPlaceHolders turn off regex compile will fail
+    assertThrows(PatternSyntaxException.class,
+        () -> startContext(AppConfig.ProcessPropertyPlaceHoldersOffConfig.class));
+  }
+
+  @Test
+  void processPropertyPlaceHoldersSwitchTest1() {
+    // processPropertyPlaceHolders turn off has no effect to FilterType which don't use pattern property
+    startContext(AppConfig.AnnoFilterWithProcessPlaceHolderOffConfig.class);
+  }
+
   private void startContext(Class<?> config) {
     applicationContext = new AnnotationConfigApplicationContext();
     // use @MapperScan with excludeFilters in AppConfig.class

src/test/java/org/mybatis/spring/filter/config/AppConfig.java

@@ -121,4 +121,21 @@ static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer
     }
 
   }
+
+  @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", processPropertyPlaceHolders = false, excludeFilters = {
+      @ComponentScan.Filter(type = FilterType.REGEX, pattern = "${exclude-filters.regex}") })
+  public static class ProcessPropertyPlaceHoldersOffConfig {
+    @Bean
+    static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+      PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer();
+      configurer.setLocation(new ClassPathResource("/org/mybatis/spring/filter/config/application.properties"));
+      return configurer;
+    }
+  }
+
+  @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", processPropertyPlaceHolders = false, excludeFilters = {
+      @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class) })
+  public static class AnnoFilterWithProcessPlaceHolderOffConfig {
+
+  }
 }

src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java

@@ -18,6 +18,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.regex.PatternSyntaxException;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -138,6 +140,14 @@ void warpedClassNotFoundException() {
     closeContext();
   }
 
+  @Test
+  void processPropertyPlaceHoldersSwitchTest() {
+    // if processPropertyPlaceHolders turn off regex compile will fail
+    assertThrows(PatternSyntaxException.class,
+        () -> startContext("org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml"));
+    closeContext();
+  }
+
   private void startContext(String config) {
     applicationContext = new ClassPathXmlApplicationContext(config);
     applicationContext.refresh();

src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2010-2023 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.
+    You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!--
+    <mybatis:scan> with new property exclude-filter
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+     http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
+
+  <!-- in-memory database and a datasource -->
+  <jdbc:embedded-database id="dataSource">
+    <jdbc:script location="classpath:org/mybatis/spring/batch/db/database-schema.sql"/>
+    <jdbc:script location="classpath:org/mybatis/spring/batch/db/database-test-data.sql"/>
+  </jdbc:embedded-database>
+
+
+  <!-- simplest possible SqlSessionFactory configuration -->
+  <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+    <property name="dataSource" ref="dataSource"/>
+  </bean>
+
+  <context:property-placeholder location="classpath:/org/mybatis/spring/filter/xml/default.properties"/>
+
+  <mybatis:scan base-package="org.mybatis.spring.filter.datasource" process-property-placeholders="false">
+    <mybatis:exclude-filter type="regex"
+                            expression="${filter.regex}"/>
+  </mybatis:scan>
+
+</beans>

src/test/java/org/mybatis/spring/filter/xml/default.properties

@@ -15,4 +15,5 @@
 #
 
 filter.custom=org.mybatis.spring.filter.customfilter.CustomTypeFilter
-filter.aspectj=*..CommonDataSourceMapper
+filter.aspectj=*..CommonDataSourceMapper
+filter.regex=org\.mybatis\.spring\.filter\.datasource\.datasource1\..*